mirror of https://github.com/perkeep/perkeep.git
auth: add auth.Handler, remove some leftover debug logs
Change-Id: I424984acc33e9eaff36a6b5e1e9e490ed79d71b8
This commit is contained in:
parent
03a90299e8
commit
b16d440543
|
@ -106,7 +106,6 @@ type UserPass struct {
|
||||||
func (up *UserPass) IsAuthorized(req *http.Request) bool {
|
func (up *UserPass) IsAuthorized(req *http.Request) bool {
|
||||||
user, pass, err := basicAuth(req)
|
user, pass, err := basicAuth(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("basic auth: %q", err)
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return user == up.Username && pass == up.Password
|
return user == up.Username && pass == up.Password
|
||||||
|
@ -125,7 +124,6 @@ type DevAuth struct {
|
||||||
func (da *DevAuth) IsAuthorized(req *http.Request) bool {
|
func (da *DevAuth) IsAuthorized(req *http.Request) bool {
|
||||||
_, pass, err := basicAuth(req)
|
_, pass, err := basicAuth(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("basic auth: %q", err)
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return pass == da.Password
|
return pass == da.Password
|
||||||
|
@ -155,6 +153,18 @@ func SendUnauthorized(conn http.ResponseWriter) {
|
||||||
fmt.Fprintf(conn, "<h1>Unauthorized</h1>")
|
fmt.Fprintf(conn, "<h1>Unauthorized</h1>")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Handler struct {
|
||||||
|
http.Handler
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if mode.IsAuthorized(r) {
|
||||||
|
h.Handler.ServeHTTP(w, r)
|
||||||
|
} else {
|
||||||
|
SendUnauthorized(w)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// requireAuth wraps a function with another function that enforces
|
// requireAuth wraps a function with another function that enforces
|
||||||
// HTTP Basic Auth.
|
// HTTP Basic Auth.
|
||||||
func RequireAuth(handler func(conn http.ResponseWriter, req *http.Request)) func(conn http.ResponseWriter, req *http.Request) {
|
func RequireAuth(handler func(conn http.ResponseWriter, req *http.Request)) func(conn http.ResponseWriter, req *http.Request) {
|
||||||
|
|
Loading…
Reference in New Issue