X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=a11e03f04d0a398efd1c1d24f9437ea0142def0a;hb=099686a6455463aa6ccba141da1481c82fdb0cec;hp=6ca3ad53e036236ea7dc3310e74d55641f715bbb;hpb=5ccea4614d3d499a0b183998230778e4adfc6127;p=gocheese.git diff --git a/gocheese.go b/gocheese.go index 6ca3ad5..a11e03f 100644 --- a/gocheese.go +++ b/gocheese.go @@ -1,6 +1,7 @@ /* GoCheese -- Python private package repository and caching proxy Copyright (C) 2019 Sergey Matveev + 2019 Elena Balakhonova 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 @@ -20,21 +21,27 @@ package main import ( "bytes" + "context" "crypto/sha256" "encoding/hex" - "errors" "flag" "fmt" "io" "io/ioutil" "log" + "net" "net/http" "net/url" "os" + "os/signal" "path/filepath" "regexp" "runtime" "strings" + "syscall" + "time" + + "golang.org/x/net/netutil" ) const ( @@ -59,31 +66,30 @@ along with this program. If not, see .` ) var ( + pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`) + Version string = "UNKNOWN" + root = flag.String("root", "./packages", "Path to packages directory") bind = flag.String("bind", "[::]:8080", "Address to bind to") + tlsCert = flag.String("tls-cert", "", "Path to TLS X.509 certificate") + tlsKey = flag.String("tls-key", "", "Path to TLS X.509 private key") 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") + maxClients = flag.Int("maxclients", 128, "Maximal amount of simultaneous clients") version = flag.Bool("version", false, "Print version information") warranty = flag.Bool("warranty", false, "Print warranty information") - pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`) - Version string = "UNKNOWN" - - passwords map[string]Auther = make(map[string]Auther) + killed bool ) -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) { - if err = os.Mkdir(path, 0700); err != nil { + if err = os.Mkdir(path, os.FileMode(0777)); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return false } @@ -94,17 +100,15 @@ func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool { func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) bool { if _, err := os.Stat(filepath.Join(*root, dir, InternalFlag)); err == nil { - log.Println(r.RemoteAddr, "pypi refresh skip, internal package", dir) return true } - log.Println(r.RemoteAddr, "pypi refresh", dir) resp, err := http.Get(*pypiURL + dir + "/") if err != nil { http.Error(w, err.Error(), http.StatusBadGateway) return false } - defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) + resp.Body.Close() if err != nil { http.Error(w, err.Error(), http.StatusBadGateway) return false @@ -135,6 +139,11 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) return false } if filename == filenameGet { + if killed { + // Skip heavy remote call, when shutting down + http.Error(w, "shutting down", http.StatusInternalServerError) + return false + } log.Println(r.RemoteAddr, "pypi download", filename) path = filepath.Join(*root, dir, filename) resp, err = http.Get(uri) @@ -144,7 +153,7 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) } defer resp.Body.Close() hasher := sha256.New() - dst, err := ioutil.TempFile(filepath.Join(*root, dir), "") + dst, err := TempFile(filepath.Join(*root, dir)) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return false @@ -179,14 +188,13 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) _, err = os.Stat(path) if err == nil { continue - } else { - if !os.IsNotExist(err) { - http.Error(w, err.Error(), http.StatusInternalServerError) - return false - } + } + if !os.IsNotExist(err) { + http.Error(w, err.Error(), http.StatusInternalServerError) + return false } log.Println(r.RemoteAddr, "pypi touch", filename) - if err = ioutil.WriteFile(path, digest, os.FileMode(0600)); err != nil { + if err = ioutil.WriteFile(path, digest, os.FileMode(0666)); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return false } @@ -195,27 +203,27 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) } func listRoot(w http.ResponseWriter, r *http.Request) { - log.Println(r.RemoteAddr, "root") files, err := ioutil.ReadDir(*root) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - w.Write([]byte(fmt.Sprintf(HTMLBegin, "root", "root"))) + var result bytes.Buffer + result.WriteString(fmt.Sprintf(HTMLBegin, "root", "root")) for _, file := range files { if file.Mode().IsDir() { - w.Write([]byte(fmt.Sprintf( + result.WriteString(fmt.Sprintf( HTMLElement, *refreshURLPath+file.Name()+"/", file.Name(), - ))) + )) } } - w.Write([]byte(HTMLEnd)) + result.WriteString(HTMLEnd) + w.Write(result.Bytes()) } func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh bool) { - log.Println(r.RemoteAddr, "dir", dir) dirPath := filepath.Join(*root, dir) if autorefresh { if !refreshDir(w, r, dir, "") { @@ -229,33 +237,40 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo http.Error(w, err.Error(), http.StatusInternalServerError) return } - w.Write([]byte(fmt.Sprintf(HTMLBegin, dir, dir))) + var result bytes.Buffer + result.WriteString(fmt.Sprintf(HTMLBegin, dir, dir)) var data []byte var filenameClean string for _, file := range files { if !strings.HasSuffix(file.Name(), SHA256Ext) { continue } + if killed { + // Skip expensive I/O when shutting down + http.Error(w, "shutting down", http.StatusInternalServerError) + return + } data, err = ioutil.ReadFile(filepath.Join(dirPath, file.Name())) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } filenameClean = strings.TrimSuffix(file.Name(), SHA256Ext) - w.Write([]byte(fmt.Sprintf( + result.WriteString(fmt.Sprintf( HTMLElement, strings.Join([]string{ *refreshURLPath, dir, "/", - filenameClean, "#", SHA256Prefix, string(data), + filenameClean, "#", SHA256Prefix, hex.EncodeToString(data), }, ""), filenameClean, - ))) + )) } - w.Write([]byte(HTMLEnd)) + result.WriteString(HTMLEnd) + w.Write(result.Bytes()) } func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) { - log.Println(r.RemoteAddr, "pkg", filename) + log.Println(r.RemoteAddr, "get", filename) path := filepath.Join(*root, dir, filename) if _, err := os.Stat(path); os.IsNotExist(err) { if !refreshDir(w, r, dir, filename) { @@ -265,25 +280,6 @@ 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 { @@ -304,7 +300,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { } for _, file := range r.MultipartForm.File["content"] { filename := file.Filename - log.Println(r.RemoteAddr, "upload", filename, "by", username) + log.Println(r.RemoteAddr, "put", filename, "by", username) dir := filename[:strings.LastIndex(filename, "-")] dirPath := filepath.Join(*root, dir) path := filepath.Join(dirPath, filename) @@ -331,7 +327,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } - dst, err = ioutil.TempFile(dirPath, "") + dst, err = TempFile(dirPath) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return @@ -355,11 +351,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } - if err = ioutil.WriteFile( - path+SHA256Ext, - hasher.Sum(nil), - os.FileMode(0600), - ); err != nil { + if err = ioutil.WriteFile(path+SHA256Ext, hasher.Sum(nil), os.FileMode(0666)); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -367,7 +359,8 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { } func handler(w http.ResponseWriter, r *http.Request) { - if r.Method == "GET" { + switch r.Method { + case "GET": var path string var autorefresh bool if strings.HasPrefix(r.URL.Path, *norefreshURLPath) { @@ -391,8 +384,10 @@ func handler(w http.ResponseWriter, r *http.Request) { } else { servePkg(w, r, parts[0], parts[1]) } - } else if r.Method == "POST" { + case "POST": serveUpload(w, r) + default: + http.Error(w, "unknown action", http.StatusBadRequest) } } @@ -460,9 +455,53 @@ func main() { refreshPasswd() return } + if (*tlsCert != "" && *tlsKey == "") || (*tlsCert == "" && *tlsKey != "") { + log.Fatalln("Both -tls-cert and -tls-key are required") + } refreshPasswd() log.Println("root:", *root, "bind:", *bind) + + ln, err := net.Listen("tcp", *bind) + if err != nil { + log.Fatal(err) + } + ln = netutil.LimitListener(ln, *maxClients) + server := &http.Server{ + ReadTimeout: time.Minute, + WriteTimeout: time.Minute, + } http.HandleFunc(*norefreshURLPath, handler) http.HandleFunc(*refreshURLPath, handler) - log.Fatal(http.ListenAndServe(*bind, nil)) + + needsRefreshPasswd := make(chan os.Signal, 0) + needsShutdown := make(chan os.Signal, 0) + exitErr := make(chan error, 0) + signal.Notify(needsRefreshPasswd, syscall.SIGHUP) + signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT) + go func() { + for range needsRefreshPasswd { + log.Println("Refreshing passwords") + refreshPasswd() + } + }() + go func(s *http.Server) { + <-needsShutdown + killed = true + log.Println("Shutting down") + ctx, cancel := context.WithTimeout(context.TODO(), time.Minute) + exitErr <- s.Shutdown(ctx) + cancel() + }(server) + + if *tlsCert == "" { + err = server.Serve(ln) + } else { + err = server.ServeTLS(ln, *tlsCert, *tlsKey) + } + if err != http.ErrServerClosed { + log.Fatal(err) + } + if err := <-exitErr; err != nil { + log.Fatal(err) + } }