From 5293240b89b14a911e222b6cab44295934f3de98 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Wed, 22 Feb 2023 18:19:26 -0700
Subject: [PATCH] Trying to optimize

---
 README.md              |  4 ++++
 cmd/simpleauth/main.go | 41 ++++++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 478b2aa..66b51c8 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,10 @@ WebDAV client code to work with anything else I found.
 * Keycloak - Didn't try it, looked way too complicated.
 
 
+# Todo
+
+* [ ] Performance testing: somehow this takes more CPU than caddy?
+
 # Project Home
 
 The canonical home for this project is
diff --git a/cmd/simpleauth/main.go b/cmd/simpleauth/main.go
index e9c5070..99a2e2f 100644
--- a/cmd/simpleauth/main.go
+++ b/cmd/simpleauth/main.go
@@ -56,10 +56,10 @@ func usernameIfAuthenticated(req *http.Request) string {
 			return authUsername
 		}
 	} else {
-    debugf("no basic auth")
-  }
+		debugf("no basic auth")
+	}
 
-  ncookies := 0
+	ncookies := 0
 	for i, cookie := range req.Cookies() {
 		if cookie.Name != CookieName {
 			continue
@@ -70,11 +70,11 @@ func usernameIfAuthenticated(req *http.Request) string {
 		if valid {
 			return t.Username
 		}
-    ncookies += 1
+		ncookies += 1
+	}
+	if ncookies == 0 {
+		debugf("no cookies")
 	}
-  if ncookies == 0 {
-    debugf("no cookies")
-  }
 
 	return ""
 }
@@ -91,16 +91,17 @@ func rootHandler(w http.ResponseWriter, req *http.Request) {
 		status = "succeeded"
 		w.Header().Set("X-Simpleauth-Username", username)
 
-		if !login {
+		if login {
+			// Send back a token; this will turn into a cookie
+			t := token.New(secret, username, time.Now().Add(lifespan))
+			w.Header().Set("X-Simpleauth-Cookie", fmt.Sprintf("%s=%s", CookieName, t.String()))
+			w.Header().Set("X-Simpleauth-Token", t.String())
+		} else {
 			// This is the only time simpleauth returns 200
 			// That will cause Caddy to proceed with the original request
 			http.Error(w, "Success", http.StatusOK)
 			return
 		}
-		// Send back a token; this will turn into a cookie
-		t := token.New(secret, username, time.Now().Add(lifespan))
-		w.Header().Set("X-Simpleauth-Cookie", fmt.Sprintf("%s=%s", CookieName, t.String()))
-		w.Header().Set("X-Simpleauth-Token", t.String())
 		// Fall through to the 401 response, though,
 		// so that Caddy will send our response back to the client,
 		// which needs these headers to set the cookie and try again.
@@ -113,16 +114,18 @@ func rootHandler(w http.ResponseWriter, req *http.Request) {
 	forwardedMethod := req.Header.Get("X-Forwarded-Method")
 	forwardedURL := url.URL{
 		Scheme: req.Header.Get("X-Forwarded-Proto"),
-		Host:  req.Header.Get("X-Forwarded-Host"),
-		Path:  req.Header.Get("X-Forwarded-Uri"),
-		User:  url.UserPassword(username, ""),
+		Host:   req.Header.Get("X-Forwarded-Host"),
+		Path:   req.Header.Get("X-Forwarded-Uri"),
+		User:   url.UserPassword(username, ""),
 	}
 
 	// Log the request
-	log.Printf("%s %s %s login:%v %s",
-		clientIP, forwardedMethod, forwardedURL.String(),
-		login, status,
-	)
+	if false {
+		log.Printf("%s %s %s login:%v %s",
+			clientIP, forwardedMethod, forwardedURL.String(),
+			login, status,
+		)
+	}
 
 	w.Header().Set("Content-Type", "text/html")
 	w.Header().Set("X-Simpleauth-Authentication", status)