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

Merge branch 'master' into new-ui-with-sync-image

Browse Source
This commit is contained in:
kunw 2016-05-27 18:48:03 +08:00
commit a204215870
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/repository.go
View File

@ -30,6 +30,7 @@ import (
svc_utils "github.com/vmware/harbor/service/utils" svc_utils "github.com/vmware/harbor/service/utils"
"github.com/vmware/harbor/utils/log" "github.com/vmware/harbor/utils/log"
"github.com/vmware/harbor/utils/registry" "github.com/vmware/harbor/utils/registry"
"github.com/vmware/harbor/utils/registry/auth"
"github.com/vmware/harbor/utils/registry/errors" "github.com/vmware/harbor/utils/registry/errors"
) )
@ -241,27 +242,27 @@ func (ra *RepositoryAPI) GetManifests() {
} }
func (ra *RepositoryAPI) initRepositoryClient(repoName string) (r *registry.Repository, err error) { func (ra *RepositoryAPI) initRepositoryClient(repoName string) (r *registry.Repository, err error) {
username, err := ra.getUsername() endpoint := os.Getenv("REGISTRY_URL")
username, password, ok := ra.Ctx.Request.BasicAuth()
if ok {
credential := auth.NewBasicAuthCredential(username, password)
return registry.NewRepositoryWithCredential(repoName, endpoint, credential)
}
username, err = ra.getUsername()
if err != nil { if err != nil {
return nil, err return nil, err
} }
endpoint := os.Getenv("REGISTRY_URL")
return registry.NewRepositoryWithUsername(repoName, endpoint, username) return registry.NewRepositoryWithUsername(repoName, endpoint, username)
} }
func (ra *RepositoryAPI) getUsername() (string, error) { func (ra *RepositoryAPI) getUsername() (string, error) {
// get username from basic auth
username, _, ok := ra.Ctx.Request.BasicAuth()
if ok {
return username, nil
}
// get username from session // get username from session
sessionUsername := ra.GetSession("username") sessionUsername := ra.GetSession("username")
if sessionUsername != nil { if sessionUsername != nil {
username, ok = sessionUsername.(string) username, ok := sessionUsername.(string)
if ok { if ok {
return username, nil return username, nil
} }