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

fix potential index out of range error

Browse Source
This commit is contained in:
Tan Jiang 2016-03-29 19:37:04 +08:00
parent 99e277471a
commit 93803ac3aa
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/utils/registryutils.go
View File

@ -46,6 +46,8 @@ func BuildRegistryURL(segments ...string) string {
// RegistryAPIGet triggers GET request to the URL which is the endpoint of registry and returns the response body. // RegistryAPIGet triggers GET request to the URL which is the endpoint of registry and returns the response body.
// It will attach a valid jwt token to the request if registry requires. // It will attach a valid jwt token to the request if registry requires.
func RegistryAPIGet(url, username string) ([]byte, error) { func RegistryAPIGet(url, username string) ([]byte, error) {
log.Debugf("Registry API url: %s", url)
response, err := http.Get(url) response, err := http.Get(url)
if err != nil { if err != nil {
return nil, err return nil, err
@ -59,8 +61,8 @@ func RegistryAPIGet(url, username string) ([]byte, error) {
return result, nil return result, nil
} else if response.StatusCode == http.StatusUnauthorized { } else if response.StatusCode == http.StatusUnauthorized {
authenticate := response.Header.Get("WWW-Authenticate") authenticate := response.Header.Get("WWW-Authenticate")
log.Debugf("authenticate header: %s", authenticate)
str := strings.Split(authenticate, " ")[1] str := strings.Split(authenticate, " ")[1]
log.Debugf("url: %s", url)
var service string var service string
var scope string var scope string
strs := strings.Split(str, ",") strs := strings.Split(str, ",")
@ -71,8 +73,12 @@ func RegistryAPIGet(url, username string) ([]byte, error) {
scope = s scope = s
} }
} }
service = strings.Split(service, "\"")[1] if arr := strings.Split(service, "\""); len(arr) > 1 {
scope = strings.Split(scope, "\"")[1] service = arr[1]
}
if arr := strings.Split(scope, "\""); len(arr) > 1 {
scope = arr[1]
}
token, err := GenTokenForUI(username, service, scope) token, err := GenTokenForUI(username, service, scope)
if err != nil { if err != nil {
return nil, err return nil, err