X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=blobdiff_plain;f=gocheese.go;h=c1f13f6b193a4ddfe185ef95a3bb7636836fddda;hp=cdbb1358d70789ecd211e0097b6c9e5080775a5e;hb=b036ee436eb9bd8889734232a22d3f24be5c9ee2;hpb=c4dc8234e8d219cf784ee604bf9bc53f8af4dd12
diff --git a/gocheese.go b/gocheese.go
index cdbb135..c1f13f6 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -22,11 +22,9 @@ package main
import (
"bytes"
"context"
- "crypto/sha256"
"encoding/hex"
"flag"
"fmt"
- "io"
"io/ioutil"
"log"
"net"
@@ -45,12 +43,17 @@ import (
)
const (
- HTMLBegin = "Links for %sLinks for %s
\n"
- HTMLEnd = ""
- HTMLElement = "%s
\n"
- SHA256Prefix = "sha256="
- SHA256Ext = ".sha256"
+ HTMLBegin = `
+
+
+ Links for %s
+
+
+`
+ HTMLEnd = " \n\n"
+ HTMLElement = " %s
\n"
InternalFlag = ".internal"
+ GPGSigExt = ".asc"
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
@@ -66,8 +69,19 @@ along with this program. If not, see .`
)
var (
- pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`)
- Version string = "UNKNOWN"
+ pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`)
+ normalizationRe = regexp.MustCompilePOSIX("[-_.]+")
+
+ HashAlgoSHA256 = "sha256"
+ HashAlgoBLAKE2b256 = "blake2_256"
+ HashAlgoSHA512 = "sha512"
+ HashAlgoMD5 = "md5"
+ knownHashAlgos []string = []string{
+ HashAlgoSHA256,
+ HashAlgoBLAKE2b256,
+ HashAlgoSHA512,
+ HashAlgoMD5,
+ }
root = flag.String("root", "./packages", "Path to packages directory")
bind = flag.String("bind", "[::]:8080", "Address to bind to")
@@ -75,6 +89,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")
@@ -83,7 +98,9 @@ var (
version = flag.Bool("version", false, "Print version information")
warranty = flag.Bool("warranty", false, "Print warranty information")
- killed bool
+ Version string = "UNKNOWN"
+ killed bool
+ pypiURLParsed *url.URL
)
func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
@@ -98,110 +115,6 @@ 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 {
- if _, err := os.Stat(filepath.Join(*root, dir, InternalFlag)); err == nil {
- return true
- }
- resp, err := http.Get(*pypiURL + dir + "/")
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadGateway)
- return false
- }
- body, err := ioutil.ReadAll(resp.Body)
- resp.Body.Close()
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadGateway)
- return false
- }
- if !mkdirForPkg(w, r, dir) {
- return false
- }
- var submatches []string
- var uri string
- var filename string
- var path string
- var pkgURL *url.URL
- var digest []byte
- for _, lineRaw := range bytes.Split(body, []byte("\n")) {
- submatches = pkgPyPI.FindStringSubmatch(string(lineRaw))
- if len(submatches) == 0 {
- continue
- }
- uri = submatches[1]
- filename = submatches[2]
- if pkgURL, err = url.Parse(uri); err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return false
- }
- digest, err = hex.DecodeString(strings.TrimPrefix(pkgURL.Fragment, SHA256Prefix))
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadGateway)
- 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)
- 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))
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return false
- }
- wr := io.MultiWriter(hasher, dst)
- if _, err = io.Copy(wr, resp.Body); err != nil {
- os.Remove(dst.Name())
- dst.Close()
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return false
- }
- if bytes.Compare(hasher.Sum(nil), digest) != 0 {
- log.Println(r.RemoteAddr, "pypi", filename, "digest mismatch")
- os.Remove(dst.Name())
- dst.Close()
- http.Error(w, err.Error(), http.StatusBadGateway)
- return false
- }
- if err = dst.Sync(); err != nil {
- os.Remove(dst.Name())
- dst.Close()
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return false
- }
- dst.Close()
- if err = os.Rename(dst.Name(), path); err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return false
- }
- }
- path = filepath.Join(*root, dir, filename+SHA256Ext)
- _, err = os.Stat(path)
- if err == nil {
- continue
- }
- 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 {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return false
- }
- }
- return true
-}
-
func listRoot(w http.ResponseWriter, r *http.Request) {
files, err := ioutil.ReadDir(*root)
if err != nil {
@@ -209,7 +122,7 @@ func listRoot(w http.ResponseWriter, r *http.Request) {
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(
@@ -223,47 +136,65 @@ func listRoot(w http.ResponseWriter, r *http.Request) {
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)
+ fis, err := ioutil.ReadDir(dirPath)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
+ files := make(map[string]struct{}, len(fis)/2)
+ for _, fi := range fis {
+ files[fi.Name()] = struct{}{}
+ }
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
+ result.WriteString(fmt.Sprintf(HTMLBegin, dir))
+ for _, algo := range knownHashAlgos {
+ for fn, _ := range files {
+ if killed {
+ // Skip expensive I/O when shutting down
+ http.Error(w, "shutting down", http.StatusInternalServerError)
+ return
+ }
+ if !strings.HasSuffix(fn, "."+algo) {
+ continue
+ }
+ delete(files, fn)
+ digest, err := ioutil.ReadFile(filepath.Join(dirPath, fn))
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+ fnClean := strings.TrimSuffix(fn, "."+algo)
+ delete(files, fnClean)
+ gpgSigAttr := ""
+ if _, err = os.Stat(filepath.Join(dirPath, fnClean+GPGSigExt)); err == nil {
+ gpgSigAttr = " data-gpg-sig=true"
+ delete(files, fnClean+GPGSigExt)
+ }
+ result.WriteString(fmt.Sprintf(
+ HTMLElement,
+ strings.Join([]string{
+ *refreshURLPath, dir, "/", fnClean,
+ "#", algo, "=", hex.EncodeToString(digest),
+ }, ""),
+ gpgSigAttr,
+ fnClean,
+ ))
}
- filenameClean = strings.TrimSuffix(file.Name(), SHA256Ext)
- result.WriteString(fmt.Sprintf(
- HTMLElement,
- strings.Join([]string{
- *refreshURLPath, dir, "/",
- filenameClean, "#", SHA256Prefix, hex.EncodeToString(data),
- }, ""),
- filenameClean,
- ))
}
result.WriteString(HTMLEnd)
w.Write(result.Bytes())
@@ -273,121 +204,31 @@ func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
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
}
}
http.ServeFile(w, r, path)
}
-func serveUpload(w http.ResponseWriter, r *http.Request) {
- username, password, ok := r.BasicAuth()
- if !ok {
- log.Println(r.RemoteAddr, "unauthenticated", username)
- http.Error(w, "unauthenticated", http.StatusUnauthorized)
- return
- }
- auther, ok := passwords[username]
- if !ok || !auther.Auth(password) {
- log.Println(r.RemoteAddr, "unauthenticated", username)
- http.Error(w, "unauthenticated", http.StatusUnauthorized)
- return
- }
- var err error
- if err = r.ParseMultipartForm(1 << 20); err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- 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
- }
- }
- for _, file := range r.MultipartForm.File["content"] {
- filename := file.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
- }
- 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)
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- hasher := sha256.New()
- wr := io.MultiWriter(hasher, dst)
- if _, err = io.Copy(wr, src); err != nil {
- os.Remove(dst.Name())
- dst.Close()
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- if err = dst.Sync(); err != nil {
- os.Remove(dst.Name())
- dst.Close()
- http.Error(w, err.Error(), http.StatusInternalServerError)
- 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, digest, os.FileMode(0666)); err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- }
-}
-
func handler(w http.ResponseWriter, r *http.Request) {
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 {
@@ -398,7 +239,7 @@ 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])
@@ -410,50 +251,6 @@ func handler(w http.ResponseWriter, r *http.Request) {
}
}
-func goodIntegrity() bool {
- dirs, err := ioutil.ReadDir(*root)
- if err != nil {
- log.Fatal(err)
- }
- hasher := sha256.New()
- digest := make([]byte, sha256.Size)
- isGood := true
- var data []byte
- var pkgName string
- for _, dir := range dirs {
- files, err := ioutil.ReadDir(filepath.Join(*root, dir.Name()))
- if err != nil {
- log.Fatal(err)
- }
- for _, file := range files {
- if !strings.HasSuffix(file.Name(), SHA256Ext) {
- continue
- }
- pkgName = strings.TrimSuffix(file.Name(), SHA256Ext)
- data, err = ioutil.ReadFile(filepath.Join(*root, dir.Name(), pkgName))
- if err != nil {
- if os.IsNotExist(err) {
- continue
- }
- log.Fatal(err)
- }
- hasher.Write(data)
- data, err = ioutil.ReadFile(filepath.Join(*root, dir.Name(), file.Name()))
- if err != nil {
- log.Fatal(err)
- }
- if bytes.Compare(hasher.Sum(digest[:0]), data) == 0 {
- log.Println(pkgName, "GOOD")
- } else {
- isGood = false
- log.Println(pkgName, "BAD")
- }
- hasher.Reset()
- }
- }
- return isGood
-}
-
func main() {
flag.Parse()
if *warranty {
@@ -477,6 +274,11 @@ func main() {
if (*tlsCert != "" && *tlsKey == "") || (*tlsCert == "" && *tlsKey != "") {
log.Fatalln("Both -tls-cert and -tls-key are required")
}
+ var err error
+ pypiURLParsed, err = url.Parse(*pypiURL)
+ if err != nil {
+ log.Fatalln(err)
+ }
refreshPasswd()
log.Println("root:", *root, "bind:", *bind)
@@ -491,6 +293,9 @@ func main() {
}
http.HandleFunc(*norefreshURLPath, handler)
http.HandleFunc(*refreshURLPath, handler)
+ if *gpgUpdateURLPath != "" {
+ http.HandleFunc(*gpgUpdateURLPath, handler)
+ }
needsRefreshPasswd := make(chan os.Signal, 0)
needsShutdown := make(chan os.Signal, 0)