Unnecessary else

[gocheese.git] / gocheese.go

diff --git a/gocheese.go b/gocheese.go
index 835e8c5b392a2f66ab0c2a7e0500c0a976445477..7a36129746ab96d1254564d69385323639531d1d 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -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,6 +29,7 @@ import (
        "io"
        "io/ioutil"
        "log"
+       "net"
        "net/http"
        "net/url"
        "os"
@@ -36,6 +39,9 @@ import (
        "runtime"
        "strings"
        "syscall"
+       "time"
+
+       "golang.org/x/net/netutil"
 )
 
 const (
@@ -60,27 +66,24 @@ 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 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]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) {
@@ -145,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
@@ -180,11 +183,10 @@ 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(0666)); err != nil {
@@ -313,7 +315,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
@@ -438,17 +440,52 @@ 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)
+
        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()
                }
        }()
-       http.HandleFunc(*norefreshURLPath, handler)
-       http.HandleFunc(*refreshURLPath, handler)
-       log.Fatal(http.ListenAndServe(*bind, nil))
+       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)
+       }
 }