optional http basic authentication using env vars gianarb#33

Author: Manuel Bovo

.gitignore

@@ -1,2 +1,2 @@
 bin/
-.idea/
+.idea/

api/basicauth.go

@@ -0,0 +1,48 @@
+package api
+
+import (
+	"github.com/Sirupsen/logrus"
+	"github.com/kelseyhightower/envconfig"
+	"net/http"
+)
+
+type AuthConfig struct {
+	Enabled bool   `default:"false"`
+	User    string `envconfig:"AUTH_USER" default:"orbiter"`
+	Pass    string `envconfig:"AUTH_PASS" default:"orbiter"`
+	Realm   string `envconfig:"AUTH_REALM" default:"Restricted"`
+}
+
+func wrap(h http.HandlerFunc, funx ...func(http.HandlerFunc) http.HandlerFunc) http.HandlerFunc {
+	for _, f := range funx {
+		h = f(h)
+	}
+	return h
+}
+
+func basicAuth(h http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var ac AuthConfig
+		e := envconfig.Process("ORBITER", &ac)
+		if e != nil {
+			logrus.Fatal(e.Error())
+		}
+
+		w.Header().Set("WWW-Authenticate", `Basic realm="`+ac.Realm+`"`)
+
+		u, p, ok := r.BasicAuth()
+		if ok == false {
+			w.WriteHeader(401)
+			w.Write([]byte("Not Authorized"))
+		}
+
+		if ac.User != u || ac.Pass != p {
+			w.WriteHeader(401)
+			w.Write([]byte("Invalid username or password"))
+		}
+
+		h.ServeHTTP(w, r)
+	}
+
+}

api/router.go

@@ -1,53 +1,45 @@
 package api
 
 import (
-	"net/http"
-	"os"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/gianarb/orbiter/core"
 	"github.com/gorilla/mux"
+	"github.com/kelseyhightower/envconfig"
 )
 
-func wrap(h http.HandlerFunc, funx ...func(http.HandlerFunc) http.HandlerFunc) http.HandlerFunc {
-	for _, f := range funx {
-		h = f(h)
+func GetRouter(core *core.Core, eventChannel chan *logrus.Entry) *mux.Router {
+	r := mux.NewRouter()
+
+	var ac AuthConfig
+	e := envconfig.Process("ORBITER", &ac)
+	if e != nil {
+		logrus.Fatal(e.Error())
 	}
-	return h
-}
 
-func basicAuth(h http.HandlerFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
-		user := os.Getenv("ORBITER_AUTH_USER")
-		pass := os.Getenv("ORBITER_AUTH_PASS")
-
-		u, p, ok := r.BasicAuth()
-		if ok == false {
-			w.WriteHeader(401)
-			w.Write([]byte("Not Authorized"))
-			return
-		}
-
-		if user != u || pass != p {
-			w.WriteHeader(401)
-			w.Write([]byte("Not Authorized"))
-			return
-		}
-
-		h.ServeHTTP(w, r)
+	if ac.Enabled {
+		logrus.Info("Enabling Authentication")
+		r.HandleFunc("/v1/orbiter/handle/{autoscaler_name}/{service_name}", wrap(Handle(&core.Autoscalers), basicAuth)).Methods("POST")
+		r.HandleFunc("/v1/orbiter/handle/{autoscaler_name}/{service_name}/{direction}", wrap(Handle(&core.Autoscalers), basicAuth)).Methods("POST")
+		r.HandleFunc("/v1/orbiter/autoscaler", AutoscalerList(core.Autoscalers)).Methods("GET")
+		r.HandleFunc("/v1/orbiter/health", Health()).Methods("GET")
+		r.HandleFunc("/v1/orbiter/events", Events(eventChannel)).Methods("GET")
+
+	} else {
+
+		r.HandleFunc("/v1/orbiter/handle/{autoscaler_name}/{service_name}", Handle(&core.Autoscalers)).Methods("POST")
+		r.HandleFunc("/v1/orbiter/handle/{autoscaler_name}/{service_name}/{direction}", Handle(&core.Autoscalers)).Methods("POST")
+		r.HandleFunc("/v1/orbiter/autoscaler", AutoscalerList(core.Autoscalers)).Methods("GET")
+		r.HandleFunc("/v1/orbiter/health", Health()).Methods("GET")
+		r.HandleFunc("/v1/orbiter/events", Events(eventChannel)).Methods("GET")
 	}
-}
 
-func GetRouter(core *core.Core, eventChannel chan *logrus.Entry) *mux.Router {
-	r := mux.NewRouter()
-	r.HandleFunc("/handle/{autoscaler_name}/{service_name}",
-		wrap(Handle(&core.Autoscalers), basicAuth)).Methods("POST")
-	r.HandleFunc("/handle/{autoscaler_name}/{service_name}/{direction}",
-		wrap(Handle(&core.Autoscalers), basicAuth)).Methods("POST")
+	// This lines will be removed October 2017. They are here to offer a soft migation path.
+	r.HandleFunc("/handle/{autoscaler_name}/{service_name}", Handle(&core.Autoscalers)).Methods("POST")
+	r.HandleFunc("/handle/{autoscaler_name}/{service_name}/{direction}", Handle(&core.Autoscalers)).Methods("POST")
 	r.HandleFunc("/autoscaler", AutoscalerList(core.Autoscalers)).Methods("GET")
 	r.HandleFunc("/health", Health()).Methods("GET")
 	r.HandleFunc("/events", Events(eventChannel)).Methods("GET")
+
 	r.NotFoundHandler = NotFound{}
 	return r
 }