Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-29 13:57:33 +02:00
Code Issues Projects Releases Wiki Activity

modify credential interface

Browse Source
This commit is contained in:
Wenkai Yin 2016-04-19 10:31:33 +08:00
parent 0b6e620f86
commit a34e290afe
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/registry/auth/handler.go
View File

@ -45,10 +45,8 @@ type Handler interface {
// Credential ...
type Credential interface {
// Type returns the type of the credential: basic_auth, secret_key
Type() string
// Parameters returns a map, which contains parameters needed
Parameters() map[string]string
// AddAuthorization adds authorization information to request
AddAuthorization(req *http.Request)
}
type basicAuthCredential struct {
@ -64,15 +62,8 @@ func NewBasicAuthCredential(username, password string) Credential {
}
}
func (b *basicAuthCredential) Type() string {
return basicAuth
}
func (b *basicAuthCredential) Parameters() map[string]string {
params := make(map[string]string)
params["username"] = b.username
params["password"] = b.password
return params
func (b *basicAuthCredential) AddAuthorization(req *http.Request) {
req.SetBasicAuth(b.username, b.password)
}
type token struct {
@ -131,10 +122,7 @@ func (t *standardTokenHandler) AuthorizeRequest(req *http.Request, params map[st
return err
}
if t.credential.Type() == basicAuth {
params := t.credential.Parameters()
r.SetBasicAuth(params["username"], params["password"])
}
t.credential.AddAuthorization(r)
resp, err := t.client.Do(r)
if err != nil {