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

fix(keystone): allow filter identity_providers with name of ssoDomain

Browse Source 
allow filter identity_providers with name of ssoDomain
This commit is contained in:
Qiu Jian
2021-01-20 00:53:15 +08:00
parent 1ab8ce581a
commit 0886e60928
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/identity_provider.go
+18 -3
View File
@@ -1152,13 +1152,21 @@ func (manager *SIdentityProviderManager) ListItemFilter(
if strings.EqualFold(query.SsoDomain, "all") {
q = q.IsNullOrEmpty("domain_id")
} else if len(query.SsoDomain) > 0 {
ssoDomain, err := DomainManager.FetchDomainByIdOrName(query.SsoDomain)
if err != nil {
if errors.Cause(err) == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(DomainManager.Keyword(), query.SsoDomain)
} else {
return nil, errors.Wrap(err, "FetchDomainByIdOrName")
}
}
q = q.Filter(sqlchemy.OR(
sqlchemy.IsNullOrEmpty(q.Field("domain_id")),
sqlchemy.Equals(q.Field("domain_id"), query.SsoDomain),
sqlchemy.Equals(q.Field("domain_id"), ssoDomain.Id),
))
q = q.Filter(sqlchemy.OR(
sqlchemy.IsNullOrEmpty(q.Field("target_domain_id")),
sqlchemy.Equals(q.Field("target_domain_id"), query.SsoDomain),
sqlchemy.Equals(q.Field("target_domain_id"), ssoDomain.Id),
))
}
}
@@ -1550,8 +1558,15 @@ func (idp *SIdentityProvider) PerformDefaultSso(
if input.Enable != nil {
if *input.Enable {
// enable
// first disable any other idp
// first disable any other idp in the same domain
q := IdentityProviderManager.Query().IsTrue("is_sso").IsTrue("is_default").NotEquals("id", idp.Id)
if len(idp.DomainId) > 0 {
// a domain specific IDP
q = q.Equals("domain_id", idp.DomainId)
} else {
// a system IDP
q = q.IsNullOrEmpty("domain_id")
}
idps := make([]SIdentityProvider, 0)
err := db.FetchModelObjects(IdentityProviderManager, q, &idps)
if err != nil && errors.Cause(err) != sql.ErrNoRows {