Adding logs, and usage gianarb#33

Author: Manuel Bovo

api/basicauth.go

@@ -7,10 +7,10 @@ import (
 )
 
 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"`
+	AuthEnabled bool   `split_words:"true" default:"false"`
+	AuthUser    string `split_words:"true" default:"orbiter"`
+	AuthPass    string `split_words:"true" default:"orbiter"`
+	AuthRealm   string `split_words:"true" default:"Restricted"`
 }
 
 func wrap(h http.HandlerFunc, funx ...func(http.HandlerFunc) http.HandlerFunc) http.HandlerFunc {
@@ -24,24 +24,30 @@ func basicAuth(h http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		var ac AuthConfig
-		e := envconfig.Process("ORBITER", &ac)
+		e := envconfig.Process("orbiter", &ac)
 		if e != nil {
 			logrus.Fatal(e.Error())
 		}
 
-		w.Header().Set("WWW-Authenticate", `Basic realm="`+ac.Realm+`"`)
+		w.Header().Set("WWW-Authenticate", `Basic realm="`+ac.AuthRealm+`"`)
 
 		u, p, ok := r.BasicAuth()
 		if ok == false {
+			logrus.Error("No Authentication supplied")
 			w.WriteHeader(401)
 			w.Write([]byte("Not Authorized"))
+			return
 		}
 
-		if ac.User != u || ac.Pass != p {
+		if ac.AuthUser != u || ac.AuthPass != p {
+			logrus.Warnf("Invalid username or password for user %s", u)
 			w.WriteHeader(401)
 			w.Write([]byte("Invalid username or password"))
+			return
 		}
 
+		logrus.Infof("Succesfully authenticated with user: %s", u)
+
 		h.ServeHTTP(w, r)
 	}
 

api/router.go

@@ -11,12 +11,16 @@ func GetRouter(core *core.Core, eventChannel chan *logrus.Entry) *mux.Router {
 	r := mux.NewRouter()
 
 	var ac AuthConfig
-	e := envconfig.Process("ORBITER", &ac)
+	envconfig.Usage("orbiter", &ac)
+
+	e := envconfig.Process("orbiter", &ac)
 	if e != nil {
 		logrus.Fatal(e.Error())
 	}
 
-	if ac.Enabled {
+	logrus.Infof("Env: %v", ac)
+
+	if ac.AuthEnabled {
 		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")