)
const (
- HTMLBegin = "<!DOCTYPE html><html><head><title>Links for %s</title></head><body><h1>Links for %s</h1>\n"
- HTMLEnd = "</body></html>"
- HTMLElement = "<a href='%s'>%s</a><br/>\n"
+ HTMLBegin = `<!DOCTYPE html>
+<html>
+ <head>
+ <title>Links for %s</title>
+ </head>
+ <body>
+`
+ HTMLEnd = " </body>\n</html>\n"
+ HTMLElement = " <a href=\"%s\"%s>%s</a><br/>\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
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")
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 {
return true
}
if !mkdirForPkg(w, r, dir) {
return false
}
+ dirPath := filepath.Join(*root, dir)
var submatches []string
var uri string
var filename 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
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
return false
}
}
- path = filepath.Join(*root, dir, filename+SHA256Ext)
+ if filename == filenameGet || gpgUpdate {
+ if _, err = os.Stat(path); err == nil {
+ if resp, err := http.Get(pkgURL.String() + GPGSigExt); err == nil {
+ sig, err := ioutil.ReadAll(resp.Body)
+ resp.Body.Close()
+ if err == nil {
+ 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 = path + SHA256Ext
_, err = os.Stat(path)
if err == nil {
continue
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
}
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(
w.Write(result.Bytes())
}
-func listDir(w http.ResponseWriter, r *http.Request, dir string, autorefresh bool) {
+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)
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) {
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,
))
}
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
}
}
return
}
}
+ gpgSigsExpected := make(map[string]struct{})
for _, file := range r.MultipartForm.File["content"] {
filename := file.Filename
+ gpgSigsExpected[filename+GPGSigExt] = struct{}{}
log.Println(r.RemoteAddr, "put", filename, "by", username)
dir := filename[:strings.LastIndex(filename, "-")]
dirPath := filepath.Join(*root, dir)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- if err = ioutil.WriteFile(path+SHA256Ext, digest, os.FileMode(0666)); err != nil {
+ 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)
+ dir := filename[:strings.LastIndex(filename, "-")]
+ dirPath := filepath.Join(*root, dir)
+ 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
}
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 {
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])
}
http.HandleFunc(*norefreshURLPath, handler)
http.HandleFunc(*refreshURLPath, handler)
+ http.HandleFunc(*gpgUpdateURLPath, handler)
needsRefreshPasswd := make(chan os.Signal, 0)
needsShutdown := make(chan os.Signal, 0)