mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-24 16:03:43 +08:00
Merge pull request #15968 from zexi/automated-cherry-pick-of-#15966-upstream-master
Automated cherry pick of #15966: feat(mcclient): allow set default authenticate source
This commit is contained in:
@@ -181,12 +181,24 @@ func (a *authManager) verify(ctx context.Context, token string) (mcclient.TokenC
|
||||
return cred, nil
|
||||
}
|
||||
|
||||
var (
|
||||
defaultAuthSource = mcclient.AuthSourceSrv
|
||||
)
|
||||
|
||||
func SetDefaultAuthSource(src string) {
|
||||
defaultAuthSource = src
|
||||
}
|
||||
|
||||
func GetDefaultAuthSource() string {
|
||||
return defaultAuthSource
|
||||
}
|
||||
|
||||
func (a *authManager) authAdmin() error {
|
||||
var token mcclient.TokenCredential
|
||||
var err error
|
||||
token, err = a.client.AuthenticateWithSource(
|
||||
a.info.Username, a.info.Passwd, a.info.Domain,
|
||||
a.info.Project, a.info.ProjectDomain, mcclient.AuthSourceSrv)
|
||||
a.info.Project, a.info.ProjectDomain, GetDefaultAuthSource())
|
||||
if err != nil {
|
||||
log.Errorf("Admin auth failed: %s", err)
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user