Skip to content

GitLab

Unverified Commit 14220d98 authored by Patrick Devine's avatar Patrick Devine Committed by GitHub
Browse files

set the scopes correctly (#368)

parent 8ca50f24
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
server/auth.go
View file @ 14220d98
...@@ -48,7 +48,12 @@ func (r AuthRedirect) URL() (string, error) { ...@@ -48,7 +48,12 @@ func (r AuthRedirect) URL() (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
return fmt.Sprintf("%s?service=%s&scope=%s&ts=%d&nonce=%s", r.Realm, r.Service, r.Scope, time.Now().Unix(), nonce), nil scopes := []string{}
for _, s := range strings.Split(r.Scope, " ") {
scopes = append(scopes, fmt.Sprintf("scope=%s", s))
}
scopeStr := strings.Join(scopes, "&")
return fmt.Sprintf("%s?service=%s&%s&ts=%d&nonce=%s", r.Realm, r.Service, scopeStr, time.Now().Unix(), nonce), nil
} }
func getAuthToken(ctx context.Context, redirData AuthRedirect, regOpts *RegistryOptions) (string, error) { func getAuthToken(ctx context.Context, redirData AuthRedirect, regOpts *RegistryOptions) (string, error) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment