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:
Zexi Li
2023-02-16 14:53:24 +08:00
committed by GitHub
+13 -1
View File
@@ -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