From 4fdac0116fc6d87923070080f08c7d41783129a3 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 9 Dec 2021 05:16:00 -0700
Subject: [PATCH] Store our handlers in a slice and lock them when they are
 being used.

Hopefully this helps with #3 (at least the HTTP 423 errors).
---
 main.go | 62 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/main.go b/main.go
index 8727c7e..aeab934 100644
--- a/main.go
+++ b/main.go
@@ -15,6 +15,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"
 	"text/template"
 	"time"
 
@@ -52,9 +53,22 @@ var (
 	templ  *template.Template
 )
 
-type userHandlers struct {
-	dav *webdav.Handler
-	fs  http.Handler
+type userHandler struct {
+	mu   sync.Mutex
+	dav  *webdav.Handler
+	fs   http.Handler
+	name string
+}
+
+type userHandlers []userHandler
+
+func (u userHandlers) find(name string) *userHandler {
+	for _, usr := range u {
+		if usr.name == name {
+			return &usr
+		}
+	}
+	return nil
 }
 
 var (
@@ -62,7 +76,7 @@ var (
 	davDir     string
 	fullListen string
 	genHtpass  bool
-	handlers   map[string]userHandlers
+	handlers   userHandlers
 	listen     string
 	passPath   string
 	tlsCert    string
@@ -74,7 +88,6 @@ var pledges = "stdio wpath rpath cpath tty inet dns unveil"
 
 func init() {
 	users = make(map[string]string)
-	handlers = make(map[string]userHandlers)
 	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 	if err != nil {
 		log.Fatalln(err)
@@ -153,7 +166,10 @@ func prompt(prompt string, secure bool) (string, error) {
 		}
 		input = string(b)
 	} else {
-		fmt.Scanln(&input)
+		_, err := fmt.Scanln(&input)
+		if err != nil {
+			return "", err
+		}
 	}
 	return input, nil
 }
@@ -182,12 +198,15 @@ func main() {
 			log.Fatalln(err)
 		}
 
-		defer f.Close()
-
 		if _, err := f.WriteString(fmt.Sprintf("%s:%s\n", user, hash)); err != nil {
 			log.Fatalln(err)
 		}
 
+		err = f.Close()
+		if err != nil {
+			log.Fatalln(err)
+		}
+
 		fmt.Printf("Added %q to %q\n", user, passPath)
 
 		os.Exit(0)
@@ -209,13 +228,17 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		defer p.Close()
 
 		ht := csv.NewReader(p)
 		ht.Comma = ':'
 		ht.Comment = '#'
 		ht.TrimLeadingSpace = true
 
+		err = p.Close()
+		if err != nil {
+			log.Fatal(err)
+		}
+
 		entries, err := ht.ReadAll()
 		if err != nil {
 			log.Fatal(err)
@@ -229,22 +252,24 @@ func main() {
 	if auth {
 		for u := range users {
 			uPath := path.Join(davDir, u)
-			handlers[u] = userHandlers{
+			handlers = append(handlers, userHandler{
+				name: u,
 				dav: &webdav.Handler{
 					LockSystem: webdav.NewMemLS(),
 					FileSystem: webdav.Dir(uPath),
 				},
 				fs: http.FileServer(http.Dir(uPath)),
-			}
+			})
 		}
 	} else {
-		handlers[""] = userHandlers{
+		handlers = append(handlers, userHandler{
+			name: "",
 			dav: &webdav.Handler{
 				LockSystem: webdav.NewMemLS(),
 				FileSystem: webdav.Dir(davDir),
 			},
 			fs: http.FileServer(http.Dir(davDir)),
-		}
+		})
 	}
 
 	mux := http.NewServeMux()
@@ -272,7 +297,16 @@ func main() {
 			}
 		}
 
-		handler := handlers[user]
+		handler := handlers.find(user)
+		if handler == nil {
+			http.NotFound(w, r)
+			return
+		}
+
+		handler.mu.Lock()
+
+		defer handler.mu.Unlock()
+
 		userPath := path.Join(davDir, user)
 		fullPath := path.Join(davDir, user, r.URL.Path)