X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=a11e03f04d0a398efd1c1d24f9437ea0142def0a;hb=099686a6455463aa6ccba141da1481c82fdb0cec;hp=26c2c27ba74673cda10e03eb6b44e31ee924920f;hpb=0659f26ad2020eb9339fb4e276a44c01d897d709;p=gocheese.git

diff --git a/gocheese.go b/gocheese.go
index 26c2c27..a11e03f 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -66,8 +66,13 @@ 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")
@@ -78,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) {
@@ -102,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
@@ -143,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)
@@ -152,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
@@ -187,11 +188,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 {
@@ -203,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, "") {
@@ -237,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) {
@@ -293,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)
@@ -320,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
@@ -352,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) {
@@ -376,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)
 	}
 }
 
@@ -445,21 +455,27 @@ 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)
-	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)
+
 	ln, err := net.Listen("tcp", *bind)
 	if err != nil {
 		log.Fatal(err)
 	}
-	s := &http.Server{
+	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)
+	exitErr := make(chan error, 0)
 	signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
 	signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT)
 	go func() {
@@ -470,15 +486,22 @@ 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()
-	}(s)
-	if err := s.Serve(netutil.LimitListener(ln, *maxClients)); err != http.ErrServerClosed {
+	}(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 {
+	if err := <-exitErr; err != nil {
 		log.Fatal(err)
 	}
 }