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

merge code change in branch 1.1.0 to fix 2411

Browse Source
This commit is contained in:
Tan Jiang 2017-06-06 13:57:48 +08:00
commit 6e25fb69c2
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/service/token/creator.go
View File

@ -17,6 +17,7 @@ package token
import (
"fmt"
"net/http"
"net/url"
"strings"
"github.com/docker/distribution/registry/auth/token"
@ -179,11 +180,7 @@ func (e *unauthorizedError) Error() string {
func (g generalCreator) Create(r *http.Request) (*tokenJSON, error) {
var err error
var scopes []string
scopeParm := r.URL.Query()["scope"]
if len(scopeParm) > 0 {
scopes = strings.Split(r.URL.Query()["scope"][0], " ")
}
scopes := parseScopes(r.URL)
log.Debugf("scopes: %v", scopes)
ctx, err := filter.GetSecurityContext(r)
@ -204,3 +201,12 @@ func (g generalCreator) Create(r *http.Request) (*tokenJSON, error) {
}
return makeToken(ctx.GetUsername(), g.service, access)
}
func parseScopes(u *url.URL) []string {
var sector string
var result []string
for _, sector = range u.Query()["scope"] {
result = append(result, strings.Split(sector, " ")...)
}
return result
}

9
src/ui/service/token/token_test.go
View File

@ -23,6 +23,7 @@ import (
"encoding/pem"
"fmt"
"io/ioutil"
"net/url"
"os"
"path"
"runtime"
@ -261,3 +262,11 @@ func TestFilterAccess(t *testing.T) {
assert.Nil(t, err, "Unexpected error: %v", err)
assert.Equal(t, ra2, *a3[0], "Mismatch after registry filter Map")
}
func TestParseScopes(t *testing.T) {
assert := assert.New(t)
u1 := "/service/token?account=admin&scope=repository%3Alibrary%2Fregistry%3Apush%2Cpull&scope=repository%3Ahello-world%2Fregistry%3Apull&service=harbor-registry"
r1, _ := url.Parse(u1)
l1 := parseScopes(r1)
assert.Equal([]string{"repository:library/registry:push,pull", "repository:hello-world/registry:pull"}, l1)
}