twine's argument typo

[gocheese.git] / gocheese.go

diff --git a/gocheese.go b/gocheese.go
index 2245d5cafc5743f6b1a6a73d9464497437c0c5cb..f5a3918bc57e6bd1499f592d4afe834a09800dcb 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -66,6 +66,9 @@ 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")
@@ -80,16 +83,9 @@ var (
        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)
+       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) {
@@ -113,8 +109,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
@@ -145,6 +141,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)
@@ -154,7 +155,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
@@ -189,11 +190,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 {
@@ -211,17 +211,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) {
@@ -239,29 +241,36 @@ 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) {
@@ -322,7 +331,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
@@ -467,7 +476,7 @@ func main() {
 
        needsRefreshPasswd := make(chan os.Signal, 0)
        needsShutdown := make(chan os.Signal, 0)
-       killed := make(chan error, 0)
+       exitErr := make(chan error, 0)
        signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
        signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT)
        go func() {
@@ -478,9 +487,10 @@ func main() {
        }()
        go func(s *http.Server) {
                <-needsShutdown
+               killed = true
                log.Println("Shutting down")
                ctx, cancel := context.WithTimeout(context.TODO(), time.Minute)
-               killed <- s.Shutdown(ctx)
+               exitErr <- s.Shutdown(ctx)
                cancel()
        }(server)
 
@@ -492,7 +502,7 @@ func main() {
        if err != http.ErrServerClosed {
                log.Fatal(err)
        }
-       if err := <-killed; err != nil {
+       if err := <-exitErr; err != nil {
                log.Fatal(err)
        }
 }