X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=blobdiff_plain;f=gocheese.go;h=5ecd959bc61e6f1a5881f8dc0d6b8c6b97b43de6;hp=712783a854ca7983503ba0e4904edcea90206d1f;hb=5d0340e435f90599a8072ad8cd67ef8ef4be116a;hpb=f0a93d1e3b9b088b0598921ff7f8306f9567b641
diff --git a/gocheese.go b/gocheese.go
index 712783a..5ecd959 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -45,12 +45,20 @@ import (
)
const (
- HTMLBegin = "Links for %sLinks for %s
\n"
- HTMLEnd = ""
- HTMLElement = "%s
\n"
+ HTMLBegin = `
+
+
+ Links for %s
+
+
+`
+ HTMLEnd = " \n\n"
+ HTMLElement = " %s
\n"
SHA256Prefix = "sha256="
SHA256Ext = ".sha256"
InternalFlag = ".internal"
+ GPGSigExt = ".asc"
+ GPGSigAttr = " data-gpg-sig=true"
Warranty = `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
@@ -75,6 +83,7 @@ var (
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")
+ gpgUpdateURLPath = flag.String("gpgupdate", "/gpgupdate/", "GPG forceful 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")
@@ -82,6 +91,10 @@ 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")
+
+ killed bool
+
+ normalizationRe *regexp.Regexp = regexp.MustCompilePOSIX("[-_.]+")
)
func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
@@ -96,12 +109,16 @@ func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
return true
}
-func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string) bool {
+func refreshDir(
+ w http.ResponseWriter,
+ r *http.Request,
+ dir,
+ filenameGet string,
+ gpgUpdate bool,
+) 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)
@@ -116,6 +133,7 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
if !mkdirForPkg(w, r, dir) {
return false
}
+ dirPath := filepath.Join(*root, dir)
var submatches []string
var uri string
var filename string
@@ -138,17 +156,23 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
http.Error(w, err.Error(), http.StatusBadGateway)
return false
}
+ pkgURL.Fragment = ""
+ path = filepath.Join(dirPath, filename)
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)
+ resp, err = http.Get(pkgURL.String())
if err != nil {
http.Error(w, err.Error(), http.StatusBadGateway)
return false
}
defer resp.Body.Close()
hasher := sha256.New()
- dst, err := TempFile(filepath.Join(*root, dir))
+ dst, err := TempFile(dirPath)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return false
@@ -178,8 +202,36 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
http.Error(w, err.Error(), http.StatusInternalServerError)
return false
}
+ if err = DirSync(dirPath); err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return false
+ }
+ }
+ if filename == filenameGet || gpgUpdate {
+ if _, err = os.Stat(path); err != nil {
+ goto GPGSigSkip
+ }
+ resp, err := http.Get(pkgURL.String() + GPGSigExt)
+ if err != nil {
+ goto GPGSigSkip
+ }
+ if resp.StatusCode != http.StatusOK {
+ resp.Body.Close()
+ goto GPGSigSkip
+ }
+ sig, err := ioutil.ReadAll(resp.Body)
+ resp.Body.Close()
+ if err != nil {
+ goto GPGSigSkip
+ }
+ if err = WriteFileSync(dirPath, path+GPGSigExt, sig); err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return false
+ }
+ log.Println(r.RemoteAddr, "pypi downloaded signature", filename)
}
- path = filepath.Join(*root, dir, filename+SHA256Ext)
+ GPGSigSkip:
+ path = path + SHA256Ext
_, err = os.Stat(path)
if err == nil {
continue
@@ -189,7 +241,7 @@ func refreshDir(w http.ResponseWriter, r *http.Request, dir, filenameGet string)
return false
}
log.Println(r.RemoteAddr, "pypi touch", filename)
- if err = ioutil.WriteFile(path, digest, os.FileMode(0666)); err != nil {
+ if err = WriteFileSync(dirPath, path, digest); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return false
}
@@ -198,14 +250,13 @@ 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
}
var result bytes.Buffer
- result.WriteString(fmt.Sprintf(HTMLBegin, "root", "root"))
+ result.WriteString(fmt.Sprintf(HTMLBegin, "root"))
for _, file := range files {
if file.Mode().IsDir() {
result.WriteString(fmt.Sprintf(
@@ -219,14 +270,19 @@ func listRoot(w http.ResponseWriter, r *http.Request) {
w.Write(result.Bytes())
}
-func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh bool) {
- log.Println(r.RemoteAddr, "dir", dir)
+func listDir(
+ w http.ResponseWriter,
+ r *http.Request,
+ dir string,
+ autorefresh,
+ gpgUpdate bool,
+) {
dirPath := filepath.Join(*root, dir)
if autorefresh {
- if !refreshDir(w, r, dir, "") {
+ if !refreshDir(w, r, dir, "", gpgUpdate) {
return
}
- } else if _, err := os.Stat(dirPath); os.IsNotExist(err) && !refreshDir(w, r, dir, "") {
+ } else if _, err := os.Stat(dirPath); os.IsNotExist(err) && !refreshDir(w, r, dir, "", false) {
return
}
files, err := ioutil.ReadDir(dirPath)
@@ -235,25 +291,37 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo
return
}
var result bytes.Buffer
- result.WriteString(fmt.Sprintf(HTMLBegin, dir, dir))
+ result.WriteString(fmt.Sprintf(HTMLBegin, dir))
var data []byte
+ var gpgSigAttr string
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)
+ if _, err = os.Stat(filepath.Join(dirPath, filenameClean+GPGSigExt)); os.IsNotExist(err) {
+ gpgSigAttr = ""
+ } else {
+ gpgSigAttr = GPGSigAttr
+ }
result.WriteString(fmt.Sprintf(
HTMLElement,
strings.Join([]string{
*refreshURLPath, dir, "/",
filenameClean, "#", SHA256Prefix, hex.EncodeToString(data),
}, ""),
+ gpgSigAttr,
filenameClean,
))
}
@@ -262,10 +330,10 @@ func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh boo
}
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) {
+ if !refreshDir(w, r, dir, filename, false) {
return
}
}
@@ -273,6 +341,7 @@ func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
}
func serveUpload(w http.ResponseWriter, r *http.Request) {
+ // Authentication
username, password, ok := r.BasicAuth()
if !ok {
log.Println(r.RemoteAddr, "unauthenticated", username)
@@ -285,41 +354,57 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
http.Error(w, "unauthenticated", http.StatusUnauthorized)
return
}
+
+ // Form parsing
var err error
if err = r.ParseMultipartForm(1 << 20); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
+ pkgNames, exists := r.MultipartForm.Value["name"]
+ if !exists || len(pkgNames) != 1 {
+ http.Error(w, "single name is expected in request", http.StatusBadRequest)
+ return
+ }
+ dir := normalizationRe.ReplaceAllString(pkgNames[0], "-")
+ dirPath := filepath.Join(*root, dir)
+ var digestExpected []byte
+ if digestExpectedHex, exists := r.MultipartForm.Value["sha256_digest"]; exists {
+ digestExpected, err = hex.DecodeString(digestExpectedHex[0])
+ if err != nil {
+ http.Error(w, "bad sha256_digest: "+err.Error(), http.StatusBadRequest)
+ return
+ }
+ }
+ gpgSigsExpected := make(map[string]struct{})
+
+ // Checking is it internal package
+ if _, err = os.Stat(filepath.Join(dirPath, InternalFlag)); err != nil {
+ log.Println(r.RemoteAddr, "non-internal package", dir)
+ http.Error(w, "unknown internal package", http.StatusUnauthorized)
+ return
+ }
+
for _, file := range r.MultipartForm.File["content"] {
filename := file.Filename
- log.Println(r.RemoteAddr, "upload", filename, "by", username)
- dir := filename[:strings.LastIndex(filename, "-")]
- dirPath := filepath.Join(*root, dir)
+ gpgSigsExpected[filename+GPGSigExt] = struct{}{}
+ log.Println(r.RemoteAddr, "put", filename, "by", username)
path := filepath.Join(dirPath, filename)
if _, err = os.Stat(path); err == nil {
log.Println(r.RemoteAddr, "already exists", filename)
- http.Error(w, "Already exists", http.StatusBadRequest)
+ http.Error(w, "already exists", http.StatusBadRequest)
return
}
if !mkdirForPkg(w, r, dir) {
return
}
- internalPath := filepath.Join(dirPath, InternalFlag)
- var dst *os.File
- if _, err = os.Stat(internalPath); os.IsNotExist(err) {
- if dst, err = os.Create(internalPath); err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- dst.Close()
- }
src, err := file.Open()
defer src.Close()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- dst, err = TempFile(dirPath)
+ dst, err := TempFile(dirPath)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@@ -339,11 +424,56 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
return
}
dst.Close()
+ digest := hasher.Sum(nil)
+ if digestExpected != nil {
+ if bytes.Compare(digestExpected, digest) == 0 {
+ log.Println(r.RemoteAddr, filename, "good checksum received")
+ } else {
+ log.Println(r.RemoteAddr, filename, "bad checksum received")
+ http.Error(w, "bad checksum", http.StatusBadRequest)
+ os.Remove(dst.Name())
+ return
+ }
+ }
if err = os.Rename(dst.Name(), path); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- if err = ioutil.WriteFile(path+SHA256Ext, hasher.Sum(nil), os.FileMode(0666)); err != nil {
+ if err = DirSync(dirPath); err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+ if err = WriteFileSync(dirPath, path+SHA256Ext, digest); err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+ }
+ for _, file := range r.MultipartForm.File["gpg_signature"] {
+ filename := file.Filename
+ if _, exists := gpgSigsExpected[filename]; !exists {
+ http.Error(w, "unexpected GPG signature filename", http.StatusBadRequest)
+ return
+ }
+ delete(gpgSigsExpected, filename)
+ log.Println(r.RemoteAddr, "put", filename, "by", username)
+ path := filepath.Join(dirPath, filename)
+ if _, err = os.Stat(path); err == nil {
+ log.Println(r.RemoteAddr, "already exists", filename)
+ http.Error(w, "already exists", http.StatusBadRequest)
+ return
+ }
+ src, err := file.Open()
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+ sig, err := ioutil.ReadAll(src)
+ src.Close()
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+ if err = WriteFileSync(dirPath, path, sig); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -351,15 +481,23 @@ 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
+ var gpgUpdate bool
if strings.HasPrefix(r.URL.Path, *norefreshURLPath) {
path = strings.TrimPrefix(r.URL.Path, *norefreshURLPath)
- autorefresh = false
- } else {
+ } else if strings.HasPrefix(r.URL.Path, *refreshURLPath) {
path = strings.TrimPrefix(r.URL.Path, *refreshURLPath)
autorefresh = true
+ } else if strings.HasPrefix(r.URL.Path, *gpgUpdateURLPath) {
+ path = strings.TrimPrefix(r.URL.Path, *gpgUpdateURLPath)
+ autorefresh = true
+ gpgUpdate = true
+ } else {
+ http.Error(w, "unknown action", http.StatusBadRequest)
+ return
}
parts := strings.Split(strings.TrimSuffix(path, "/"), "/")
if len(parts) > 2 {
@@ -370,13 +508,15 @@ func handler(w http.ResponseWriter, r *http.Request) {
if parts[0] == "" {
listRoot(w, r)
} else {
- listDir(w, r, parts[0], autorefresh)
+ listDir(w, r, parts[0], autorefresh, gpgUpdate)
}
} 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)
}
}
@@ -461,10 +601,11 @@ func main() {
}
http.HandleFunc(*norefreshURLPath, handler)
http.HandleFunc(*refreshURLPath, handler)
+ http.HandleFunc(*gpgUpdateURLPath, handler)
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() {
@@ -475,9 +616,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)
@@ -489,7 +631,7 @@ func main() {
if err != http.ErrServerClosed {
log.Fatal(err)
}
- if err := <-killed; err != nil {
+ if err := <-exitErr; err != nil {
log.Fatal(err)
}
}