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

Automatic merge from release/2.5.0 -> release/2.6.0

Browse Source 
* commit '695ed4cbd3f3b1c4b5ccd603c23668ae2acd55ad':
  fix: temporay auth failure may invalidate valid admintoken
This commit is contained in:
李泽玺
2019-02-21 12:10:30 +08:00
parent 1a66c84d9f 695ed4cbd3
commit 2a3f9596ba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/auth/auth.go
+3 -1
View File
@@ -136,14 +136,16 @@ func (a *authManager) verify(token string) (mcclient.TokenCredential, error) {
}
func (a *authManager) authAdmin() error {
var token mcclient.TokenCredential
var err error
a.adminCredential, err = a.client.Authenticate(
token, err = a.client.Authenticate(
a.info.Username, a.info.Passwd,
a.info.Domain, a.info.Project)
if err != nil {
log.Errorf("Admin auth failed: %s", err)
return err
}
a.adminCredential = token
return nil
}