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

fix: fail to delete cas idp due to readonly domain (#23218)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2025-09-03 05:49:06 +08:00
committed by GitHub
co-authored by Qiu Jian
parent c3e9090c71
commit 6d55de51f0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/domains.go
+6 -2
View File
@@ -320,8 +320,12 @@ func (domain *SDomain) GetIdpCount() (int, error) {
}
func (domain *SDomain) ValidateDeleteCondition(ctx context.Context, info *api.DomainDetails) error {
return domain.validateDeleteConditionInternal(ctx, info, false)
}
func (domain *SDomain) validateDeleteConditionInternal(ctx context.Context, info *api.DomainDetails, skipIdpCheck bool) error {
if gotypes.IsNil(info) {
info := &api.DomainDetails{}
info = &api.DomainDetails{}
if usage, _ := DomainManager.TotalResourceCount([]string{domain.Id}); usage != nil {
info.DomainUsage, _ = usage[domain.Id]
}
@@ -330,7 +334,7 @@ func (domain *SDomain) ValidateDeleteCondition(ctx context.Context, info *api.Do
info.IdpResourceInfo = idpInfo[0]
}
}
if len(info.IdpId) > 0 {
if !skipIdpCheck && len(info.IdpId) > 0 {
return httperrors.NewForbiddenError("readonly")
}
if domain.Id == api.DEFAULT_DOMAIN_ID {
pkg/keystone/models/identity_provider.go
+1 -1
View File
@@ -913,7 +913,7 @@ func (self *SIdentityProvider) Purge(ctx context.Context, userCred mcclient.Toke
return errors.Wrap(err, "domains[i].UnlinkIdp")
}
} else {
err = domains[i].ValidateDeleteCondition(ctx, nil)
err = domains[i].validateDeleteConditionInternal(ctx, nil, true)
if err != nil {
db.OpsLog.LogEvent(&domains[i], db.ACT_DELETE_FAIL, err, userCred)
return errors.Wrap(err, "domain.ValidateDeleteCondition")