http.Error(w, err.Error(), http.StatusInternalServerError)
return false
}
+ if !strings.HasPrefix(pkgURL.Fragment, SHA256Prefix) {
+ log.Println(r.RemoteAddr, "pypi", filename, "no SHA256 digest provided")
+ http.Error(w, "no SHA256 digest provided", http.StatusBadGateway)
+ return false
+ }
digest, err = hex.DecodeString(strings.TrimPrefix(pkgURL.Fragment, SHA256Prefix))
if err != nil {
http.Error(w, err.Error(), http.StatusBadGateway)
return false
}
pkgURL.Fragment = ""
+ uri = pkgURL.String()
+ if pkgURL.Host == "" {
+ uri = *pypiURL + strings.TrimPrefix(uri, "/")
+ }
path = filepath.Join(dirPath, filename)
if filename == filenameGet {
if killed {
return false
}
log.Println(r.RemoteAddr, "pypi download", filename)
- resp, err = http.Get(pkgURL.String())
+ resp, err = http.Get(uri)
if err != nil {
+ log.Println(r.RemoteAddr, "pypi download error:", err.Error())
http.Error(w, err.Error(), http.StatusBadGateway)
return false
}
log.Println(r.RemoteAddr, "pypi", filename, "digest mismatch")
os.Remove(dst.Name())
dst.Close()
- http.Error(w, err.Error(), http.StatusBadGateway)
+ http.Error(w, "digest mismatch", http.StatusBadGateway)
return false
}
if err = dst.Sync(); err != nil {
if _, err = os.Stat(path); err != nil {
goto GPGSigSkip
}
- resp, err := http.Get(pkgURL.String() + GPGSigExt)
+ resp, err := http.Get(uri + GPGSigExt)
if err != nil {
goto GPGSigSkip
}