Support setting username of username and password (#21)

* Support setting username of username and password

Sometimes when using basic auth only the username will be set
while at other times botht the username and password is set.
The proxy should use the username as the token only when
the password component is not set. Otherwise it should
use the password to authenticate.

Update to Golang 1.16

* Bump chart version

Author: phillebaba

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.15 as builder
+FROM golang:1.16 as builder
 RUN mkdir /build
 ADD . /build/
 WORKDIR /build

charts/azdo-proxy/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: azdo-proxy
 description: A Helm chart for azdo-proxy
 type: application
-version: v0.3.5
-appVersion: v0.3.5
+version: v0.3.6
+appVersion: v0.3.6

go.mod

@@ -1,6 +1,6 @@
 module github.com/xenitab/azdo-proxy
 
-go 1.14
+go 1.16
 
 require (
 	github.com/go-logr/logr v0.2.0

main.go

@@ -150,15 +150,20 @@ func livenessHandler(log logr.Logger) func(http.ResponseWriter, *http.Request) {
 func proxyHandler(p *httputil.ReverseProxy, log logr.Logger, a *auth.Authorization, domain string, pat string) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		// If basic auth is missing return error to force client to retry
-		username, _, ok := r.BasicAuth()
+		username, password, ok := r.BasicAuth()
 		if !ok {
 			w.Header().Set("WWW-Authenticate", "Basic realm=\"Restricted\"")
 			http.Error(w, "Missing basic authentication", http.StatusUnauthorized)
 			return
 		}
 
+		t := username
+		if len(password) > 0 {
+			t = password
+		}
+
 		// Check basic auth with local auth configuration
-		err := auth.IsPermitted(a, r.URL.EscapedPath(), username)
+		err := auth.IsPermitted(a, r.URL.EscapedPath(), t)
 		if err != nil {
 			log.Error(err, "Received unauthorized request")
 			http.Error(w, "User not permitted", http.StatusForbidden)