From 09b1449cb3408bee88358e4d868534ea664f3638 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Thu, 4 May 2023 22:50:58 +0100
Subject: [PATCH] Fix flags, add http basic auth

---
 cmd/main.go | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index 28e7664..dda66cc 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -38,8 +38,10 @@ func logMiddleware(h http.HandlerFunc) http.HandlerFunc {
 }
 
 func main() {
-	listenAddr := *flag.String("listen", ":1612", "HTTP listen address")
-	debPath := *flag.String("debpath", "debs", "Path to directory containing deb files.")
+	listenAddr := flag.String("listen", ":1612", "HTTP listen address")
+	debPath := flag.String("debpath", "debs", "Path to directory containing deb files.")
+	httpUser := flag.String("httpuser", "debanator", "Username for HTTP basic auth")
+	httpPass := flag.String("httppass", "", "Enable HTTP basic auth with this password")
 	flag.Parse()
 	log.Info("Starting...")
 	var ecKey *crypto.Key
@@ -60,15 +62,23 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	be := debanator.NewFileBackend(debPath)
+	be := debanator.NewFileBackend(*debPath)
 	repo := debanator.NewRepoFromBackend(be, "/dists/stable")
 	debanator.Md(repo.Populate())
 	if err := repo.GenerateFiles(); err != nil {
 		log.Fatal(err)
 	}
-	log.Infof("Listening on %s", listenAddr)
+	log.Infof("Listening on %s", *listenAddr)
 	r := chi.NewRouter()
 	r.Use(middleware.Logger)
+	if *httpPass != "" {
+		log.Infof("HTTP basic auth enabled")
+		// We're using auth
+		authMap := map[string]string{
+			*httpUser: *httpPass,
+		}
+		r.Use(middleware.BasicAuth("", authMap))
+	}
 	r.Get("/", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Content-Type", "application/json")
 		enc := json.NewEncoder(w)
@@ -84,5 +94,5 @@ func main() {
 		io.WriteString(w, pub)
 	})
 	r.Mount("/dists/stable", repo.GetHandler(signingKeyRing))
-	http.ListenAndServe(listenAddr, r)
+	http.ListenAndServe(*listenAddr, r)
 }