Merge branch 'master' of github.com:jchenry/x

go.mod

@@ -1,9 +1,3 @@
 module github.com/jchenry/x
 
 go 1.13
-
-require (
-	github.com/julienschmidt/httprouter v1.2.0
-	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
-	rsc.io/dbstore v0.1.1
-)

net/http/auth.go

@@ -5,7 +5,7 @@ import (
 	"os"
 )
 
-func BasicAuth(fn http.HandlerFunc) http.HandlerFunc {
+func BasicAuth(h http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		user, pass, _ := r.BasicAuth()
 		if !(user == os.Getenv("WIKI_USERNAME") && pass == os.Getenv("WIKI_PASSWORD")) {
@@ -13,6 +13,7 @@ func BasicAuth(fn http.HandlerFunc) http.HandlerFunc {
 			http.Error(w, "Unauthorized.", 401)
 			return
 		}
-		fn(w, r)
+
+		h.ServeHTTP(w, r)
 	}
 }