]> Cypherpunks.ru repositories - gocheese.git/blobdiff - gocheese.go
Send whole buffered response, preventing chunked encoding
[gocheese.git] / gocheese.go
index 9035e99ccca883e1422520f8c3ee580606c06ae3..712783a854ca7983503ba0e4904edcea90206d1f 100644 (file)
@@ -1,6 +1,7 @@
 /*
 GoCheese -- Python private package repository and caching proxy
 Copyright (C) 2019 Sergey Matveev <stargrave@stargrave.org>
+              2019 Elena Balakhonova <balakhonova_e@riseup.net>
 
 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,6 +21,7 @@ package main
 
 import (
        "bytes"
+       "context"
        "crypto/sha256"
        "encoding/hex"
        "flag"
@@ -27,13 +29,19 @@ import (
        "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 (
@@ -58,26 +66,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 )
 
 var (
+       pkgPyPI        = regexp.MustCompile(`^.*<a href="([^"]+)"[^>]*>(.+)</a><br/>.*$`)
+       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 login:password lines")
+       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(`^.*<a href="([^"]+)"[^>]*>(.+)</a><br/>.*$`)
-       Version string = "UNKNOWN"
-
-       passwords map[string]string = make(map[string]string)
 )
 
 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
                }
@@ -97,8 +107,8 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
                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
@@ -138,7 +148,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
@@ -173,14 +183,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,17 +204,19 @@ func listRoot(w http.ResponseWriter, r *http.Request) {
                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) {
@@ -223,7 +234,8 @@ 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 {
@@ -236,16 +248,17 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo
                        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) {
@@ -261,7 +274,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
@@ -300,7 +319,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
@@ -324,11 +343,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
                }
@@ -425,19 +440,56 @@ func main() {
                }
                return
        }
-       passwd, err := ioutil.ReadFile(*passwdPath)
+       if *passwdCheck {
+               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)
        }
-       for _, credentials := range strings.Split(strings.TrimRight(string(passwd), "\n"), "\n") {
-               splitted := strings.Split(credentials, ":")
-               if len(splitted) != 2 {
-                       log.Fatal("Wrong login:password format")
-               }
-               passwords[splitted[0]] = splitted[1]
+       ln = netutil.LimitListener(ln, *maxClients)
+       server := &http.Server{
+               ReadTimeout:  time.Minute,
+               WriteTimeout: time.Minute,
        }
-       log.Println("root:", *root, "bind:", *bind)
        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)
+       killed := 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
+               log.Println("Shutting down")
+               ctx, cancel := context.WithTimeout(context.TODO(), time.Minute)
+               killed <- 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 := <-killed; err != nil {
+               log.Fatal(err)
+       }
 }