Merge pull request #6463 from Junnplus/empty-scope
Fix empty scopes return
This commit is contained in:
commit
ab8d99cf4b
@ -74,7 +74,7 @@ func ContextWithAppendPullRepositoryScope(ctx context.Context, repo string) cont
|
||||
|
||||
// GetTokenScopes returns deduplicated and sorted scopes from ctx.Value(tokenScopesKey{}) and common scopes.
|
||||
func GetTokenScopes(ctx context.Context, common []string) []string {
|
||||
var scopes []string
|
||||
scopes := []string{}
|
||||
if x := ctx.Value(tokenScopesKey{}); x != nil {
|
||||
scopes = append(scopes, x.([]string)...)
|
||||
}
|
||||
@ -82,6 +82,10 @@ func GetTokenScopes(ctx context.Context, common []string) []string {
|
||||
scopes = append(scopes, common...)
|
||||
sort.Strings(scopes)
|
||||
|
||||
if len(scopes) == 0 {
|
||||
return scopes
|
||||
}
|
||||
|
||||
l := 0
|
||||
for idx := 1; idx < len(scopes); idx++ {
|
||||
// Note: this comparison is unaware of the scope grammar (https://docs.docker.com/registry/spec/auth/scope/)
|
||||
|
@ -63,6 +63,11 @@ func TestGetTokenScopes(t *testing.T) {
|
||||
commonScopes []string
|
||||
expected []string
|
||||
}{
|
||||
{
|
||||
scopesInCtx: []string{},
|
||||
commonScopes: []string{},
|
||||
expected: []string{},
|
||||
},
|
||||
{
|
||||
scopesInCtx: []string{},
|
||||
commonScopes: []string{"repository:foo/bar:pull"},
|
||||
|
Loading…
Reference in New Issue
Block a user