opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7330 from swordqiu/hotfix/qj-check-accessibility-when-dissociate-eip

Browse Source 
fix: do accessibility check when dissociate eip from resource
This commit is contained in:
Zexi Li
2020-07-27 15:22:18 +08:00
committed by GitHub
parent 360b48703d 8451954400
commit 06f2da22f5
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/elasticips.go
+9 -2
View File
@@ -33,6 +33,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/quotas"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/cloudcommon/policy"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
@@ -1078,10 +1079,16 @@ func (self *SElasticip) PerformDissociate(ctx context.Context, userCred mcclient
}
// associate with an invalid vm
if !self.IsAssociated() {
res := self.GetAssociateResource()
if res == nil {
return nil, self.Dissociate(ctx, userCred)
}
err := db.IsObjectRbacAllowed(res, userCred, policy.PolicyActionGet)
if err != nil {
return nil, errors.Wrap(err, "associated resource is not accessible")
}
if self.Status != api.EIP_STATUS_READY {
return nil, httperrors.NewInvalidStatusError("eip cannot dissociate in status %s", self.Status)
}
@@ -1120,7 +1127,7 @@ func (self *SElasticip) PerformDissociate(ctx context.Context, userCred mcclient
autoDelete := jsonutils.QueryBoolean(data, "auto_delete", false)
err := self.StartEipDissociateTask(ctx, userCred, autoDelete, "")
err = self.StartEipDissociateTask(ctx, userCred, autoDelete, "")
return nil, err
}
pkg/compute/models/guest_actions.go
+6
View File
@@ -46,6 +46,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/db/quotas"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/cloudcommon/notifyclient"
"yunion.io/x/onecloud/pkg/cloudcommon/policy"
"yunion.io/x/onecloud/pkg/cloudcommon/userdata"
"yunion.io/x/onecloud/pkg/cloudcommon/validators"
"yunion.io/x/onecloud/pkg/compute/options"
@@ -2903,6 +2904,11 @@ func (self *SGuest) PerformDissociateEip(ctx context.Context, userCred mcclient.
return nil, httperrors.NewInvalidStatusError("No eip to dissociate")
}
err = db.IsObjectRbacAllowed(eip, userCred, policy.PolicyActionGet)
if err != nil {
return nil, errors.Wrap(err, "eip is not accessible")
}
self.SetStatus(userCred, api.VM_DISSOCIATE_EIP, "associate eip")
autoDelete := jsonutils.QueryBoolean(data, "auto_delete", false)