toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missed one call to setTokenAuth

Browse Source 
Upstream-commit: 3b5010e90bd51ba3630f48091ed70111d26dd31a
Component: engine
This commit is contained in:
shin-
2013-12-03 16:32:13 +01:00
parent c52437abda
commit 14f5d29204
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/registry/registry.go
+2 -4
View File
@@ -153,7 +153,7 @@ func doWithCookies(c *http.Client, req *http.Request) (*http.Response, error) {
return res, err
}
func setTokenAuth(req *http.Request, token []string) (*http.Request) {
func setTokenAuth(req *http.Request, token []string) *http.Request {
if req.Header.Get("Authorization") == "" { // Don't override
req.Header.Set("Authorization", "Token "+strings.Join(token, ","))
}
@@ -269,9 +269,7 @@ func (r *Registry) GetRemoteTags(registries []string, repository string, token [
if err != nil {
return nil, err
}
if req.Header.Get("Authorization") == "" { // Don't override
req.Header.Set("Authorization", "Token "+strings.Join(token, ","))
}
req = setTokenAuth(req, token)
res, err := doWithCookies(r.client, req)
if err != nil {
return nil, err