X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=blobdiff_plain;f=gocheese.go;h=d6a1a70ba708b63911e02b5bfc55f5d79290aa84;hp=40f172bc9eedb50d5c337572d5da5036f760ac15;hb=11d218004e3a2668985a6d9b2628cb4b3fdc0051;hpb=984e32455cd547f697b93fea7d88b5adb160513b
diff --git a/gocheese.go b/gocheese.go
index 40f172b..d6a1a70 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -45,6 +45,7 @@ import (
"syscall"
"time"
+ "golang.org/x/crypto/blake2b"
"golang.org/x/net/netutil"
)
@@ -60,7 +61,6 @@ const (
HTMLElement = " %s
\n"
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
@@ -76,8 +76,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")
@@ -94,10 +105,9 @@ var (
version = flag.Bool("version", false, "Print version information")
warranty = flag.Bool("warranty", false, "Print warranty information")
- killed bool
-
- pypiURLParsed *url.URL
- normalizationRe *regexp.Regexp = regexp.MustCompilePOSIX("[-_.]+")
+ Version string = "UNKNOWN"
+ killed bool
+ pypiURLParsed *url.URL
)
func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
@@ -112,6 +122,14 @@ func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
return true
}
+func blake2b256New() hash.Hash {
+ h, err := blake2b.New256(nil)
+ if err != nil {
+ panic(err)
+ }
+ return h
+}
+
func refreshDir(
w http.ResponseWriter,
r *http.Request,
@@ -137,20 +155,15 @@ func refreshDir(
return false
}
dirPath := filepath.Join(*root, dir)
- 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))
+ submatches := pkgPyPI.FindStringSubmatch(string(lineRaw))
if len(submatches) == 0 {
continue
}
- uri = submatches[1]
- filename = submatches[2]
- if pkgURL, err = url.Parse(uri); err != nil {
+ uri := submatches[1]
+ filename := submatches[2]
+ pkgURL, err := url.Parse(uri)
+ if err != nil {
http.Error(w, err.Error(), http.StatusBadGateway)
return false
}
@@ -169,31 +182,31 @@ func refreshDir(
http.Error(w, "invalid digest provided", http.StatusBadGateway)
return false
}
- digest, err = hex.DecodeString(digestInfo[1])
+ digest, err := hex.DecodeString(digestInfo[1])
if err != nil {
http.Error(w, err.Error(), http.StatusBadGateway)
return false
}
+ hashAlgo := digestInfo[0]
var hasherNew func() hash.Hash
- var hashExt string
var hashSize int
- switch digestInfo[0] {
- case "md5":
- hashExt = ".md5"
+ switch hashAlgo {
+ case HashAlgoMD5:
hasherNew = md5.New
hashSize = md5.Size
- case "sha256":
- hashExt = ".sha256"
+ case HashAlgoSHA256:
hasherNew = sha256.New
hashSize = sha256.Size
- case "sha512":
- hashExt = ".sha512"
+ case HashAlgoSHA512:
hasherNew = sha512.New
hashSize = sha512.Size
+ case HashAlgoBLAKE2b256:
+ hasherNew = blake2b256New
+ hashSize = blake2b.Size256
default:
log.Println(
r.RemoteAddr, "pypi", filename,
- "unknown digest algorithm", digestInfo[0],
+ "unknown digest algorithm", hashAlgo,
)
http.Error(w, "unknown digest algorithm", http.StatusBadGateway)
return false
@@ -210,7 +223,8 @@ func refreshDir(
} else {
uri = pkgURL.String()
}
- path = filepath.Join(dirPath, filename)
+
+ path := filepath.Join(dirPath, filename)
if filename == filenameGet {
if killed {
// Skip heavy remote call, when shutting down
@@ -226,7 +240,7 @@ func refreshDir(
}
defer resp.Body.Close()
hasher := hasherNew()
- hasherOur := sha256.New()
+ hasherSHA256 := sha256.New()
dst, err := TempFile(dirPath)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -234,8 +248,8 @@ func refreshDir(
}
dstBuf := bufio.NewWriter(dst)
wrs := []io.Writer{hasher, dstBuf}
- if hashExt != ".sha256" {
- wrs = append(wrs, hasherOur)
+ if hashAlgo != HashAlgoSHA256 {
+ wrs = append(wrs, hasherSHA256)
}
wr := io.MultiWriter(wrs...)
if _, err = io.Copy(wr, resp.Body); err != nil {
@@ -275,9 +289,12 @@ func refreshDir(
http.Error(w, err.Error(), http.StatusInternalServerError)
return false
}
- if hashExt != ".sha256" {
- hashExt = ".sha256"
- digest = hasherOur.Sum(nil)
+ if hashAlgo != HashAlgoSHA256 {
+ hashAlgo = HashAlgoSHA256
+ digest = hasherSHA256.Sum(nil)
+ for _, algo := range knownHashAlgos[1:] {
+ os.Remove(path + "." + algo)
+ }
}
}
if filename == filenameGet || gpgUpdate {
@@ -297,6 +314,10 @@ func refreshDir(
if err != nil {
goto GPGSigSkip
}
+ if !bytes.HasPrefix(sig, []byte("-----BEGIN PGP SIGNATURE-----")) {
+ log.Println(r.RemoteAddr, "pypi non PGP signature", filename)
+ goto GPGSigSkip
+ }
if err = WriteFileSync(dirPath, path+GPGSigExt, sig); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return false
@@ -304,7 +325,7 @@ func refreshDir(
log.Println(r.RemoteAddr, "pypi downloaded signature", filename)
}
GPGSigSkip:
- path = path + hashExt
+ path = path + "." + hashAlgo
_, err = os.Stat(path)
if err == nil {
continue
@@ -363,54 +384,44 @@ func listDir(
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- var result bytes.Buffer
- result.WriteString(fmt.Sprintf(HTMLBegin, dir))
- var digest []byte
- var gpgSigAttr string
- var fnClean string
files := make(map[string]struct{}, len(fis)/2)
for _, fi := range fis {
files[fi.Name()] = struct{}{}
}
- for _, algoExt := range []string{".sha256", ".sha512", ".md5"} {
+ var result bytes.Buffer
+ 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, algoExt) {
+ if !strings.HasSuffix(fn, "."+algo) {
continue
}
- digest, err = ioutil.ReadFile(filepath.Join(dirPath, fn))
+ 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, algoExt)
- if _, err = os.Stat(filepath.Join(dirPath, fnClean+GPGSigExt)); os.IsNotExist(err) {
- gpgSigAttr = ""
- } else {
- gpgSigAttr = GPGSigAttr
+ 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,
- "#", algoExt[1:], "=", hex.EncodeToString(digest),
+ "#", algo, "=", hex.EncodeToString(digest),
}, ""),
gpgSigAttr,
fnClean,
))
- for _, n := range []string{
- fnClean,
- fnClean + GPGSigExt,
- fnClean + ".sha256",
- fnClean + ".sha512",
- fnClean + ".md5",
- } {
- delete(files, n)
- }
}
}
result.WriteString(HTMLEnd)
@@ -454,8 +465,8 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
http.Error(w, "single name is expected in request", http.StatusBadRequest)
return
}
- dir := normalizationRe.ReplaceAllString(pkgNames[0], "-")
- dirPath := filepath.Join(*root, dir)
+ pkgName := normalizationRe.ReplaceAllString(pkgNames[0], "-")
+ dirPath := filepath.Join(*root, pkgName)
var digestExpected []byte
if digestExpectedHex, exists := r.MultipartForm.Value["sha256_digest"]; exists {
digestExpected, err = hex.DecodeString(digestExpectedHex[0])
@@ -468,7 +479,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
// Checking is it internal package
if _, err = os.Stat(filepath.Join(dirPath, InternalFlag)); err != nil {
- log.Println(r.RemoteAddr, "non-internal package", dir)
+ log.Println(r.RemoteAddr, "non-internal package", pkgName)
http.Error(w, "unknown internal package", http.StatusUnauthorized)
return
}
@@ -483,7 +494,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
http.Error(w, "already exists", http.StatusBadRequest)
return
}
- if !mkdirForPkg(w, r, dir) {
+ if !mkdirForPkg(w, r, pkgName) {
return
}
src, err := file.Open()
@@ -538,7 +549,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- if err = WriteFileSync(dirPath, path+".sha256", digest); err != nil {
+ if err = WriteFileSync(dirPath, path+"."+HashAlgoSHA256, digest); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -615,50 +626,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(), ".sha256") {
- continue
- }
- pkgName = strings.TrimSuffix(file.Name(), ".sha256")
- 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 {
- fmt.Println(pkgName, "GOOD")
- } else {
- isGood = false
- fmt.Println(pkgName, "BAD")
- }
- hasher.Reset()
- }
- }
- return isGood
-}
-
func main() {
flag.Parse()
if *warranty {