Move strToAuther out for clarity

[gocheese.git] / gocheese.go

diff --git a/gocheese.go b/gocheese.go
index 155bf1a98b7aac482c4a3b83ddd6250a908516fe..bdb6ead659d35082a32eb7f52fb8b07ff8395ec2 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -4,8 +4,7 @@ Copyright (C) 2019 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,10 +30,12 @@ import (
        "net/http"
        "net/url"
        "os"
+       "os/signal"
        "path/filepath"
        "regexp"
        "runtime"
        "strings"
+       "syscall"
 )
 
 const (
@@ -47,8 +48,7 @@ const (
 
        Warranty = `This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -65,7 +65,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")
-       auth             = flag.String("auth", "spam:foo", "login:password,...")
+       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")
@@ -73,9 +74,13 @@ var (
        pkgPyPI        = regexp.MustCompile(`^.*<a href="([^"]+)"[^>]*>(.+)</a><br/>.*$`)
        Version string = "UNKNOWN"
 
-       passwords map[string]string = make(map[string]string)
+       passwords map[string]Auther = make(map[string]Auther)
 )
 
+type Auther interface {
+       Auth(password string) bool
+}
+
 func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
        path := filepath.Join(*root, dir)
        if _, err := os.Stat(path); os.IsNotExist(err) {
@@ -263,7 +268,13 @@ func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
 
 func serveUpload(w http.ResponseWriter, r *http.Request) {
        username, password, ok := r.BasicAuth()
-       if !ok || passwords[username] != password {
+       if !ok {
+               log.Println(r.RemoteAddr, "unauthenticated", username)
+               http.Error(w, "unauthenticated", http.StatusUnauthorized)
+               return
+       }
+       auther, ok := passwords[username]
+       if !ok || !auther.Auth(password) {
                log.Println(r.RemoteAddr, "unauthenticated", username)
                http.Error(w, "unauthenticated", http.StatusUnauthorized)
                return
@@ -427,14 +438,20 @@ func main() {
                }
                return
        }
-       for _, credentials := range strings.Split(*auth, ",") {
-               splitted := strings.Split(credentials, ":")
-               if len(splitted) != 2 {
-                       log.Fatal("Wrong auth format")
-               }
-               passwords[splitted[0]] = splitted[1]
+       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))