Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdhttp/auth: BasicAuth method in standard pkg

Browse Source 
I created a new PR from https://github.com/coreos/etcd/pull/3598.
This is for `TODO: use the standard lib BasicAuth method when we move to
Go 1.4.` [1]. `BasicAuth` method got into Go standard package a year ago. [2]

---
1. https://github.com/coreos/etcd/blob/master/pkg/netutil/netutil.go#L126-L138
2. https://codereview.appspot.com/76540043/
This commit is contained in:
Gyu-Ho Lee 2015-09-28 14:02:55 -07:00
parent 89acdd6245
commit e16f81838b
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/etcdhttp/client_auth.go
View File

@ -23,7 +23,6 @@ import (
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/auth" "github.com/coreos/etcd/etcdserver/auth"
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" "github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
"github.com/coreos/etcd/pkg/netutil"
) )
type authHandler struct { type authHandler struct {
@ -46,7 +45,7 @@ func hasRootAccess(sec auth.Store, r *http.Request) bool {
if !sec.AuthEnabled() { if !sec.AuthEnabled() {
return true return true
} }
username, password, ok := netutil.BasicAuth(r) username, password, ok := r.BasicAuth()
if !ok { if !ok {
return false return false
} }
@ -80,7 +79,7 @@ func hasKeyPrefixAccess(sec auth.Store, r *http.Request, key string, recursive b
plog.Warningf("auth: no authorization provided, checking guest access") plog.Warningf("auth: no authorization provided, checking guest access")
return hasGuestAccess(sec, r, key) return hasGuestAccess(sec, r, key)
} }
username, password, ok := netutil.BasicAuth(r) username, password, ok := r.BasicAuth()
if !ok { if !ok {
plog.Warningf("auth: malformed basic auth encoding") plog.Warningf("auth: malformed basic auth encoding")
return false return false

36
pkg/netutil/netutil.go
View File

@ -15,13 +15,10 @@
package netutil package netutil
import ( import (
"encoding/base64"
"net" "net"
"net/http"
"net/url" "net/url"
"reflect" "reflect"
"sort" "sort"
"strings"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
@ -118,36 +115,3 @@ func URLStringsEqual(a []string, b []string) bool {
return urlsEqual(urlsA, urlsB) return urlsEqual(urlsA, urlsB)
} }
// BasicAuth returns the username and password provided in the request's
// Authorization header, if the request uses HTTP Basic Authentication.
// See RFC 2617, Section 2.
// Based on the BasicAuth method from the Golang standard lib.
// TODO: use the standard lib BasicAuth method when we move to Go 1.4.
func BasicAuth(r *http.Request) (username, password string, ok bool) {
auth := r.Header.Get("Authorization")
if auth == "" {
return
}
return parseBasicAuth(auth)
}
// parseBasicAuth parses an HTTP Basic Authentication string.
// "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" returns ("Aladdin", "open sesame", true).
// Taken from the Golang standard lib.
// TODO: use the standard lib BasicAuth method when we move to Go 1.4.
func parseBasicAuth(auth string) (username, password string, ok bool) {
if !strings.HasPrefix(auth, "Basic ") {
return
}
c, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(auth, "Basic "))
if err != nil {
return
}
cs := string(c)
s := strings.IndexByte(cs, ':')
if s < 0 {
return
}
return cs[:s], cs[s+1:], true
}