X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=1d8d0b5425b6541b2f9906ef822e7a856c9288fb;hb=58cc9588d92ab293d301e7267851bd9c4167e508;hp=b27df8c02f80cba03bb636a2a76f6865815be25c;hpb=1f1b1e25e9bc99c5df5ce04a71e8a530df337bb4;p=gocheese.git
diff --git a/gocheese.go b/gocheese.go
index b27df8c..1d8d0b5 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -22,6 +22,7 @@ import (
"bytes"
"crypto/sha256"
"encoding/hex"
+ "errors"
"flag"
"fmt"
"io"
@@ -63,7 +64,7 @@ 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 login:password lines")
+ passwdPath = flag.String("passwd", "passwd", "Path to file with authenticators")
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 +72,13 @@ var (
pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`)
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 +264,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,17 +455,7 @@ 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 auth format")
- }
- passwords[splitted[0]] = splitted[1]
- }
+ refreshPasswd()
log.Println("root:", *root, "bind:", *bind)
http.HandleFunc(*norefreshURLPath, handler)
http.HandleFunc(*refreshURLPath, handler)