Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-24 03:05:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix replication bugs #11974, #11939

Browse Source 
Fix replication bugs: fix #11974, fix #11939

Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
Wenkai Yin 2020-05-20 14:53:15 +08:00 committed by Ziming
parent 69fe9e9bf7
commit a31315aa36
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/registry/auth/authorizer.go
View File

@ -54,9 +54,9 @@ type authorizer struct {
} }
func (a *authorizer) Modify(req *http.Request) error { func (a *authorizer) Modify(req *http.Request) error {
// Nil URL means this is the first time the authorizer is called // Nil underlying authorizer means this is the first time the authorizer is called
// Try to connect to the registry and determine the auth scheme // Try to connect to the registry and determine the auth scheme
if a.url == nil { if a.authorizer == nil {
// to avoid concurrent issue // to avoid concurrent issue
a.Lock() a.Lock()
defer a.Unlock() defer a.Unlock()
@ -74,7 +74,7 @@ func (a *authorizer) Modify(req *http.Request) error {
} }
func (a *authorizer) initialize(u *url.URL) error { func (a *authorizer) initialize(u *url.URL) error {
if a.url != nil { if a.authorizer != nil {
return nil return nil
} }
url, err := url.Parse(u.Scheme + "://" + u.Host + "/v2/") url, err := url.Parse(u.Scheme + "://" + u.Host + "/v2/")

3
src/pkg/registry/auth/bearer/authorizer.go
View File

@ -142,5 +142,8 @@ func (a *authorizer) fetchToken(scopes []*scope) (*token, error) {
if err = json.Unmarshal(body, token); err != nil { if err = json.Unmarshal(body, token); err != nil {
return nil, err return nil, err
} }
if len(token.Token) == 0 && len(token.AccessToken) > 0 {
token.Token = token.AccessToken
}
return token, nil return token, nil
} }