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

Fix bug: Failed to get repository tags

Browse Source 
Listing repository tags will fail if the repository name contains string
'service'

Fixed in registryutils.go. Use regrexp instead of splitting strings by
'service'.
This commit is contained in:
Ben Ji 2016-03-31 10:20:13 +08:00
parent 3ebb2dea0f
commit 0d7f109e42
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
service/utils/registryutils.go
View File

@ -21,7 +21,7 @@ import (
"io/ioutil"
"net/http"
"os"
"strings"
"regexp"
"github.com/vmware/harbor/utils/log"
)
@ -62,22 +62,13 @@ func RegistryAPIGet(url, username string) ([]byte, error) {
} else if response.StatusCode == http.StatusUnauthorized {
authenticate := response.Header.Get("WWW-Authenticate")
log.Debugf("authenticate header: %s", authenticate)
str := strings.Split(authenticate, " ")[1]
var service string
var scope string
strs := strings.Split(str, ",")
for _, s := range strs {
if strings.Contains(s, "service") {
service = s
} else if strings.Contains(s, "scope") {
scope = s
}
}
if arr := strings.Split(service, "\""); len(arr) > 1 {
service = arr[1]
}
if arr := strings.Split(scope, "\""); len(arr) > 1 {
scope = arr[1]
re := regexp.MustCompile(`service=\"(.*?)\".*scope=\"(.*?)\"`)
res := re.FindStringSubmatch(authenticate)
if len(res) > 2 {
service = res[1]
scope = res[2]
}
token, err := GenTokenForUI(username, service, scope)
if err != nil {