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

Merge pull request #7811 from swordqiu/hotfix/qj-prevent-user-in-disabled-idp-login

Browse Source 
fix: prevent users in disabled idp from login
This commit is contained in:
yunion-ci-robot
2020-09-07 20:57:46 +08:00
committed by GitHub
parent 8ce14d97c1 9e1ff88195
commit aefcb1e3c2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/tokens/auth.go
+5 -2
View File
@@ -17,7 +17,6 @@ package tokens
import (
"context"
"database/sql"
"fmt"
"time"
"yunion.io/x/jsonutils"
@@ -152,8 +151,12 @@ func authUserByIdentity(ctx context.Context, ident mcclient.SAuthenticationIdent
idp := idpObj.(*models.SIdentityProvider)
if idp.Enabled.IsFalse() {
return nil, errors.Wrap(httperrors.ErrInvalidStatus, "idp disabled")
}
if idp.Status != api.IdentityDriverStatusConnected && idp.Status != api.IdentityDriverStatusDisconnected {
return nil, errors.Error(fmt.Sprintf("invalid idp status %s", idp.Status))
return nil, errors.Wrapf(httperrors.ErrInvalidStatus, "invalid idp status %s", idp.Status)
}
conf, err := models.GetConfigs(idp, true, nil, nil)