X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=7a36129746ab96d1254564d69385323639531d1d;hb=902150e27fa1530823817eb3227f9100b27d9410;hp=26c2c27ba74673cda10e03eb6b44e31ee924920f;hpb=0659f26ad2020eb9339fb4e276a44c01d897d709;p=gocheese.git
diff --git a/gocheese.go b/gocheese.go
index 26c2c27..7a36129 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -66,8 +66,13 @@ along with this program. If not, see .`
)
var (
+ pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`)
+ 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")
@@ -77,17 +82,8 @@ var (
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(`^.*]*>(.+)
.*$`)
- 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) {
@@ -152,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
@@ -187,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 {
@@ -320,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
@@ -445,21 +440,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)
+ killed := make(chan error, 0)
signal.Notify(needsRefreshPasswd, syscall.SIGHUP)
signal.Notify(needsShutdown, syscall.SIGTERM, syscall.SIGINT)
go func() {
@@ -474,8 +475,14 @@ func main() {
ctx, cancel := context.WithTimeout(context.TODO(), time.Minute)
killed <- 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 {