Move strToAuther out for clarity

[gocheese.git] / gocheese.go

diff --git a/gocheese.go b/gocheese.go
index 1d8d0b5425b6541b2f9906ef822e7a856c9288fb..bdb6ead659d35082a32eb7f52fb8b07ff8395ec2 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -22,7 +22,6 @@ import (
        "bytes"
        "crypto/sha256"
        "encoding/hex"
-       "errors"
        "flag"
        "fmt"
        "io"
@@ -31,10 +30,12 @@ import (
        "net/http"
        "net/url"
        "os"
+       "os/signal"
        "path/filepath"
        "regexp"
        "runtime"
        "strings"
+       "syscall"
 )
 
 const (
@@ -65,6 +66,7 @@ var (
        refreshURLPath   = flag.String("refresh", "/simple/", "Auto-refreshing URL path")
        pypiURL          = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL")
        passwdPath       = flag.String("passwd", "passwd", "Path to file with authenticators")
+       passwdCheck      = flag.Bool("passwd-check", false, "Test the -passwd file for syntax errors and exit")
        fsck             = flag.Bool("fsck", false, "Check integrity of all packages")
        version          = flag.Bool("version", false, "Print version information")
        warranty         = flag.Bool("warranty", false, "Print warranty information")
@@ -264,25 +266,6 @@ func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
        http.ServeFile(w, r, path)
 }
 
-func strToAuther(verifier string) (string, Auther, error) {
-       st := strings.SplitN(verifier, "$", 3)
-       if len(st) != 3 || st[0] != "" {
-               return "", nil, errors.New("invalid verifier structure")
-       }
-       algorithm := st[1]
-       var auther Auther
-       var err error
-       switch algorithm {
-       case "argon2i":
-               auther, err = parseArgon2i(st[2])
-       case "sha256":
-               auther, err = parseSHA256(st[2])
-       default:
-               err = errors.New("unknown hashing algorithm")
-       }
-       return algorithm, auther, err
-}
-
 func serveUpload(w http.ResponseWriter, r *http.Request) {
        username, password, ok := r.BasicAuth()
        if !ok {
@@ -455,8 +438,20 @@ func main() {
                }
                return
        }
+       if *passwdCheck {
+               refreshPasswd()
+               return
+       }
        refreshPasswd()
        log.Println("root:", *root, "bind:", *bind)
+       needsRefreshPasswd := make(chan os.Signal, 0)
+       signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
+       go func() {
+               for range needsRefreshPasswd {
+                       log.Println("Refreshing passwords")
+                       refreshPasswd()
+               }
+       }()
        http.HandleFunc(*norefreshURLPath, handler)
        http.HandleFunc(*refreshURLPath, handler)
        log.Fatal(http.ListenAndServe(*bind, nil))