X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=bdb6ead659d35082a32eb7f52fb8b07ff8395ec2;hb=bcfc26f87e27a5d749eeed3194681e8018df4c5b;hp=7e5f79ec0e86fd0ad599035050aa8cf2cdb993a5;hpb=9e662204b6bd8cafdd2bbfe7534573d828eaef2b;p=gocheese.git

diff --git a/gocheese.go b/gocheese.go
index 7e5f79e..bdb6ead 100644
--- 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
@@ -60,22 +60,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 )
 
 var (
-	root           = flag.String("root", "./packages", "Path to packages directory")
-	bind           = flag.String("bind", "[::]:8080", "Address to bind to")
-	simpleURLPath  = flag.String("simple", "/simple/", "/simple/ URL path")
-	refreshURLPath = flag.String("refresh", "/refresh/", "Auto-refreshing URL path")
-	pypiURL        = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL")
-	auth           = flag.String("auth", "spam:foo", "login:password,...")
-	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")
+	root             = flag.String("root", "./packages", "Path to packages directory")
+	bind             = flag.String("bind", "[::]:8080", "Address to bind to")
+	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 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")
 
 	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) {
@@ -202,7 +207,7 @@ func listRoot(w http.ResponseWriter, r *http.Request) {
 		if file.Mode().IsDir() {
 			w.Write([]byte(fmt.Sprintf(
 				HTMLElement,
-				*simpleURLPath+file.Name()+"/",
+				*refreshURLPath+file.Name()+"/",
 				file.Name(),
 			)))
 		}
@@ -241,7 +246,7 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo
 		w.Write([]byte(fmt.Sprintf(
 			HTMLElement,
 			strings.Join([]string{
-				*simpleURLPath, dir, "/",
+				*refreshURLPath, dir, "/",
 				filenameClean, "#", SHA256Prefix, string(data),
 			}, ""),
 			filenameClean,
@@ -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
@@ -341,8 +352,8 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "GET" {
 		var path string
 		var autorefresh bool
-		if strings.HasPrefix(r.URL.Path, *simpleURLPath) {
-			path = strings.TrimPrefix(r.URL.Path, *simpleURLPath)
+		if strings.HasPrefix(r.URL.Path, *norefreshURLPath) {
+			path = strings.TrimPrefix(r.URL.Path, *norefreshURLPath)
 			autorefresh = false
 		} else {
 			path = strings.TrimPrefix(r.URL.Path, *refreshURLPath)
@@ -427,15 +438,21 @@ 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)
-	http.HandleFunc(*simpleURLPath, handler)
+	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))
 }