Refresh -passwd file while working

[gocheese.git] / gocheese.go

diff --git a/gocheese.go b/gocheese.go
index cde862ab49d8ade28c5e1664e2962f8e4b5edae2..fa3b4302f3770b1836be22a26d423ff6144a5d53 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -31,10 +31,12 @@ import (
        "net/http"
        "net/url"
        "os"
+       "os/signal"
        "path/filepath"
        "regexp"
        "runtime"
        "strings"
+       "syscall"
 )
 
 const (
@@ -64,7 +66,8 @@ var (
        norefreshURLPath = flag.String("norefresh", "/norefresh/", "Non-refreshing URL path")
        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 auth")
+       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")
@@ -455,23 +458,19 @@ func main() {
                }
                return
        }
-       passwd, err := ioutil.ReadFile(*passwdPath)
-       if err != nil {
-               log.Fatal(err)
-       }
-       for _, credentials := range strings.Split(strings.TrimRight(string(passwd), "\n"), "\n") {
-               splitted := strings.Split(credentials, ":")
-               if len(splitted) != 2 {
-                       log.Fatal("Wrong login:password format")
-               }
-               _, auther, err := strToAuther(splitted[1])
-               if err != nil {
-                       log.Fatal(err)
-               }
-               passwords[splitted[0]] = auther
-               log.Println("Added password for " + splitted[0])
+       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 {
+                       refreshPasswd()
+               }
+       }()
        http.HandleFunc(*norefreshURLPath, handler)
        http.HandleFunc(*refreshURLPath, handler)
        log.Fatal(http.ListenAndServe(*bind, nil))