Mention about graceful shutdown different from cheeseshop

[gocheese.git] / gocheese.go

diff --git a/gocheese.go b/gocheese.go
index 6ca3ad53e036236ea7dc3310e74d55641f715bbb..7a6d9ffc85ab9e8d54f99386e30e3b2e6304e743 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -20,9 +20,9 @@ package main
 
 import (
        "bytes"
+       "context"
        "crypto/sha256"
        "encoding/hex"
-       "errors"
        "flag"
        "fmt"
        "io"
@@ -31,10 +31,13 @@ import (
        "net/http"
        "net/url"
        "os"
+       "os/signal"
        "path/filepath"
        "regexp"
        "runtime"
        "strings"
+       "syscall"
+       "time"
 )
 
 const (
@@ -83,7 +86,7 @@ type Auther interface {
 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
                }
@@ -186,7 +189,7 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
                        }
                }
                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
                }
@@ -265,25 +268,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 {
@@ -355,11 +339,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
                }
@@ -462,7 +442,35 @@ func main() {
        }
        refreshPasswd()
        log.Println("root:", *root, "bind:", *bind)
+       needsRefreshPasswd := make(chan os.Signal, 0)
+       needsShutdown := make(chan os.Signal, 0)
+       killed := make(chan error, 0)
        http.HandleFunc(*norefreshURLPath, handler)
        http.HandleFunc(*refreshURLPath, handler)
-       log.Fatal(http.ListenAndServe(*bind, nil))
+       s := &http.Server{
+               Addr:           *bind,
+               ReadTimeout:    time.Minute,
+               WriteTimeout:   time.Minute,
+       }
+       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()
+       }(s)
+       if err := s.ListenAndServe(); err != http.ErrServerClosed {
+               log.Fatal(err)
+       }
+       if err := <-killed; err != nil {
+               log.Fatal(err)
+       }
 }