X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=fa3b4302f3770b1836be22a26d423ff6144a5d53;hb=cb667e2472867666fe1d87059e00078797e182f6;hp=8188671af5bf5c18f80689039083738ac9a7afea;hpb=bcbdb2f72f39589ebb4f8c4bddbe009380d9df8d;p=gocheese.git

diff --git a/gocheese.go b/gocheese.go
index 8188671..fa3b430 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -22,6 +22,7 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -30,10 +31,12 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"regexp"
 	"runtime"
 	"strings"
+	"syscall"
 )
 
 const (
@@ -63,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")
-	auth             = flag.String("auth", "passwd", "Path to file with login:passwd")
+	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")
@@ -71,9 +75,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) {
@@ -259,9 +267,34 @@ 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 || 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
@@ -425,18 +458,19 @@ func main() {
 		}
 		return
 	}
-	auth, err := ioutil.ReadFile(*auth)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for _, credentials := range strings.Split(strings.TrimRight(string(auth), "\n"), "\n") {
-		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 {
+			refreshPasswd()
+		}
+	}()
 	http.HandleFunc(*norefreshURLPath, handler)
 	http.HandleFunc(*refreshURLPath, handler)
 	log.Fatal(http.ListenAndServe(*bind, nil))