]> Cypherpunks.ru repositories - gocheese.git/commitdiff
Split pretty huge gocheese.go
authorSergey Matveev <stargrave@stargrave.org>
Sat, 7 Dec 2019 19:17:56 +0000 (22:17 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sat, 7 Dec 2019 19:20:00 +0000 (22:20 +0300)
INSTALL
fileutils.go [moved from tmp.go with 100% similarity]
gocheese.go
refresh.go [new file with mode: 0644]
upload.go [new file with mode: 0644]

diff --git a/INSTALL b/INSTALL
index 74eeccf1556c2cd6b066cf4c0553c95eaaadf8e1..843355afcc9fbf7a88354473b387aab07a58b50b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
     # or use https://git.cypherpunks.ru/git/gocheese.git
     # or use https://git.cypherpunks.ru/git/gocheese.git
-    $ git clone --depth 1 --branch v2.0.0 git://git.cypherpunks.ru/gocheese.git
+    $ git clone --depth 1 --branch v2.1.0 git://git.cypherpunks.ru/gocheese.git
     $ cd gocheese
     $ cd gocheese
-    $ git tag --verify v2.0.0
+    $ git tag --verify v2.1.0
     $ make
 
 gocheese binary and gocheese.info documentation should be built.
     $ make
 
 gocheese binary and gocheese.info documentation should be built.
similarity index 100%
rename from tmp.go
rename to fileutils.go
index d6a1a70ba708b63911e02b5bfc55f5d79290aa84..c1f13f6b193a4ddfe185ef95a3bb7636836fddda 100644 (file)
@@ -20,17 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
 package main
 
 import (
-       "bufio"
        "bytes"
        "context"
        "bytes"
        "context"
-       "crypto/md5"
-       "crypto/sha256"
-       "crypto/sha512"
        "encoding/hex"
        "flag"
        "fmt"
        "encoding/hex"
        "flag"
        "fmt"
-       "hash"
-       "io"
        "io/ioutil"
        "log"
        "net"
        "io/ioutil"
        "log"
        "net"
@@ -45,7 +39,6 @@ import (
        "syscall"
        "time"
 
        "syscall"
        "time"
 
-       "golang.org/x/crypto/blake2b"
        "golang.org/x/net/netutil"
 )
 
        "golang.org/x/net/netutil"
 )
 
@@ -122,227 +115,6 @@ func mkdirForPkg(w http.ResponseWriter, r *http.Request, dir string) bool {
        return true
 }
 
        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,
-       dir,
-       filenameGet string,
-       gpgUpdate bool,
-) 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
-       }
-       dirPath := filepath.Join(*root, dir)
-       for _, lineRaw := range bytes.Split(body, []byte("\n")) {
-               submatches := pkgPyPI.FindStringSubmatch(string(lineRaw))
-               if len(submatches) == 0 {
-                       continue
-               }
-               uri := submatches[1]
-               filename := submatches[2]
-               pkgURL, err := url.Parse(uri)
-               if err != nil {
-                       http.Error(w, err.Error(), http.StatusBadGateway)
-                       return false
-               }
-
-               if pkgURL.Fragment == "" {
-                       log.Println(r.RemoteAddr, "pypi", filename, "no digest provided")
-                       http.Error(w, "no digest provided", http.StatusBadGateway)
-                       return false
-               }
-               digestInfo := strings.Split(pkgURL.Fragment, "=")
-               if len(digestInfo) == 1 {
-                       // Ancient non PEP-0503 PyPIs, assume MD5
-                       digestInfo = []string{"md5", digestInfo[0]}
-               } else if len(digestInfo) != 2 {
-                       log.Println(r.RemoteAddr, "pypi", filename, "invalid digest provided")
-                       http.Error(w, "invalid digest provided", http.StatusBadGateway)
-                       return false
-               }
-               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 hashSize int
-               switch hashAlgo {
-               case HashAlgoMD5:
-                       hasherNew = md5.New
-                       hashSize = md5.Size
-               case HashAlgoSHA256:
-                       hasherNew = sha256.New
-                       hashSize = sha256.Size
-               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", hashAlgo,
-                       )
-                       http.Error(w, "unknown digest algorithm", http.StatusBadGateway)
-                       return false
-               }
-               if len(digest) != hashSize {
-                       log.Println(r.RemoteAddr, "pypi", filename, "invalid digest length")
-                       http.Error(w, "invalid digest length", http.StatusBadGateway)
-                       return false
-               }
-
-               pkgURL.Fragment = ""
-               if pkgURL.Host == "" {
-                       uri = pypiURLParsed.ResolveReference(pkgURL).String()
-               } else {
-                       uri = pkgURL.String()
-               }
-
-               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)
-                       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
-                       }
-                       defer resp.Body.Close()
-                       hasher := hasherNew()
-                       hasherSHA256 := sha256.New()
-                       dst, err := TempFile(dirPath)
-                       if err != nil {
-                               http.Error(w, err.Error(), http.StatusInternalServerError)
-                               return false
-                       }
-                       dstBuf := bufio.NewWriter(dst)
-                       wrs := []io.Writer{hasher, dstBuf}
-                       if hashAlgo != HashAlgoSHA256 {
-                               wrs = append(wrs, hasherSHA256)
-                       }
-                       wr := io.MultiWriter(wrs...)
-                       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 err = dstBuf.Flush(); 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, "digest mismatch", 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
-                       }
-                       if err = dst.Close(); err != nil {
-                               http.Error(w, err.Error(), http.StatusInternalServerError)
-                               return false
-                       }
-                       if err = os.Rename(dst.Name(), path); err != nil {
-                               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 hashAlgo != HashAlgoSHA256 {
-                               hashAlgo = HashAlgoSHA256
-                               digest = hasherSHA256.Sum(nil)
-                               for _, algo := range knownHashAlgos[1:] {
-                                       os.Remove(path + "." + algo)
-                               }
-                       }
-               }
-               if filename == filenameGet || gpgUpdate {
-                       if _, err = os.Stat(path); err != nil {
-                               goto GPGSigSkip
-                       }
-                       resp, err := http.Get(uri + 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 !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
-                       }
-                       log.Println(r.RemoteAddr, "pypi downloaded signature", filename)
-               }
-       GPGSigSkip:
-               path = path + "." + hashAlgo
-               _, 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 = WriteFileSync(dirPath, path, digest); 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 {
 func listRoot(w http.ResponseWriter, r *http.Request) {
        files, err := ioutil.ReadDir(*root)
        if err != nil {
@@ -439,153 +211,6 @@ func servePkg(w http.ResponseWriter, r *http.Request, dir, filename string) {
        http.ServeFile(w, r, path)
 }
 
        http.ServeFile(w, r, path)
 }
 
-func serveUpload(w http.ResponseWriter, r *http.Request) {
-       // Authentication
-       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
-       }
-
-       // 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
-       }
-       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])
-               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", pkgName)
-               http.Error(w, "unknown internal package", http.StatusUnauthorized)
-               return
-       }
-
-       for _, file := range r.MultipartForm.File["content"] {
-               filename := file.Filename
-               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)
-                       return
-               }
-               if !mkdirForPkg(w, r, pkgName) {
-                       return
-               }
-               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
-               }
-               dstBuf := bufio.NewWriter(dst)
-               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 = dstBuf.Flush(); 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 = DirSync(dirPath); err != nil {
-                       http.Error(w, err.Error(), http.StatusInternalServerError)
-                       return
-               }
-               if err = WriteFileSync(dirPath, path+"."+HashAlgoSHA256, 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
-               }
-       }
-}
-
 func handler(w http.ResponseWriter, r *http.Request) {
        switch r.Method {
        case "GET":
 func handler(w http.ResponseWriter, r *http.Request) {
        switch r.Method {
        case "GET":
diff --git a/refresh.go b/refresh.go
new file mode 100644 (file)
index 0000000..3404a37
--- /dev/null
@@ -0,0 +1,259 @@
+/*
+GoCheese -- Python private package repository and caching proxy
+Copyright (C) 2019 Sergey Matveev <stargrave@stargrave.org>
+
+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
+the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+       "bufio"
+       "bytes"
+       "crypto/md5"
+       "crypto/sha256"
+       "crypto/sha512"
+       "encoding/hex"
+       "hash"
+       "io"
+       "io/ioutil"
+       "log"
+       "net/http"
+       "net/url"
+       "os"
+       "path/filepath"
+       "strings"
+
+       "golang.org/x/crypto/blake2b"
+)
+
+func blake2b256New() hash.Hash {
+       h, err := blake2b.New256(nil)
+       if err != nil {
+               panic(err)
+       }
+       return h
+}
+
+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
+       }
+       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
+       }
+       dirPath := filepath.Join(*root, dir)
+       for _, lineRaw := range bytes.Split(body, []byte("\n")) {
+               submatches := pkgPyPI.FindStringSubmatch(string(lineRaw))
+               if len(submatches) == 0 {
+                       continue
+               }
+               uri := submatches[1]
+               filename := submatches[2]
+               pkgURL, err := url.Parse(uri)
+               if err != nil {
+                       http.Error(w, err.Error(), http.StatusBadGateway)
+                       return false
+               }
+
+               if pkgURL.Fragment == "" {
+                       log.Println(r.RemoteAddr, "pypi", filename, "no digest provided")
+                       http.Error(w, "no digest provided", http.StatusBadGateway)
+                       return false
+               }
+               digestInfo := strings.Split(pkgURL.Fragment, "=")
+               if len(digestInfo) == 1 {
+                       // Ancient non PEP-0503 PyPIs, assume MD5
+                       digestInfo = []string{"md5", digestInfo[0]}
+               } else if len(digestInfo) != 2 {
+                       log.Println(r.RemoteAddr, "pypi", filename, "invalid digest provided")
+                       http.Error(w, "invalid digest provided", http.StatusBadGateway)
+                       return false
+               }
+               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 hashSize int
+               switch hashAlgo {
+               case HashAlgoMD5:
+                       hasherNew = md5.New
+                       hashSize = md5.Size
+               case HashAlgoSHA256:
+                       hasherNew = sha256.New
+                       hashSize = sha256.Size
+               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", hashAlgo,
+                       )
+                       http.Error(w, "unknown digest algorithm", http.StatusBadGateway)
+                       return false
+               }
+               if len(digest) != hashSize {
+                       log.Println(r.RemoteAddr, "pypi", filename, "invalid digest length")
+                       http.Error(w, "invalid digest length", http.StatusBadGateway)
+                       return false
+               }
+
+               pkgURL.Fragment = ""
+               if pkgURL.Host == "" {
+                       uri = pypiURLParsed.ResolveReference(pkgURL).String()
+               } else {
+                       uri = pkgURL.String()
+               }
+
+               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)
+                       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
+                       }
+                       defer resp.Body.Close()
+                       hasher := hasherNew()
+                       hasherSHA256 := sha256.New()
+                       dst, err := TempFile(dirPath)
+                       if err != nil {
+                               http.Error(w, err.Error(), http.StatusInternalServerError)
+                               return false
+                       }
+                       dstBuf := bufio.NewWriter(dst)
+                       wrs := []io.Writer{hasher, dstBuf}
+                       if hashAlgo != HashAlgoSHA256 {
+                               wrs = append(wrs, hasherSHA256)
+                       }
+                       wr := io.MultiWriter(wrs...)
+                       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 err = dstBuf.Flush(); 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, "digest mismatch", 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
+                       }
+                       if err = dst.Close(); err != nil {
+                               http.Error(w, err.Error(), http.StatusInternalServerError)
+                               return false
+                       }
+                       if err = os.Rename(dst.Name(), path); err != nil {
+                               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 hashAlgo != HashAlgoSHA256 {
+                               hashAlgo = HashAlgoSHA256
+                               digest = hasherSHA256.Sum(nil)
+                               for _, algo := range knownHashAlgos[1:] {
+                                       os.Remove(path + "." + algo)
+                               }
+                       }
+               }
+               if filename == filenameGet || gpgUpdate {
+                       if _, err = os.Stat(path); err != nil {
+                               goto GPGSigSkip
+                       }
+                       resp, err := http.Get(uri + 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 !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
+                       }
+                       log.Println(r.RemoteAddr, "pypi downloaded signature", filename)
+               }
+       GPGSigSkip:
+               path = path + "." + hashAlgo
+               _, 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 = WriteFileSync(dirPath, path, digest); err != nil {
+                       http.Error(w, err.Error(), http.StatusInternalServerError)
+                       return false
+               }
+       }
+       return true
+}
diff --git a/upload.go b/upload.go
new file mode 100644 (file)
index 0000000..0e7db61
--- /dev/null
+++ b/upload.go
@@ -0,0 +1,179 @@
+/*
+GoCheese -- Python private package repository and caching proxy
+Copyright (C) 2019 Sergey Matveev <stargrave@stargrave.org>
+              2019 Elena Balakhonova <balakhonova_e@riseup.net>
+
+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
+the Free Software Foundation, version 3 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+       "bufio"
+       "bytes"
+       "crypto/sha256"
+       "encoding/hex"
+       "io"
+       "io/ioutil"
+       "log"
+       "net/http"
+       "os"
+       "path/filepath"
+)
+
+func serveUpload(w http.ResponseWriter, r *http.Request) {
+       // Authentication
+       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
+       }
+
+       // 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
+       }
+       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])
+               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", pkgName)
+               http.Error(w, "unknown internal package", http.StatusUnauthorized)
+               return
+       }
+
+       for _, file := range r.MultipartForm.File["content"] {
+               filename := file.Filename
+               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)
+                       return
+               }
+               if !mkdirForPkg(w, r, pkgName) {
+                       return
+               }
+               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
+               }
+               dstBuf := bufio.NewWriter(dst)
+               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 = dstBuf.Flush(); 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 = DirSync(dirPath); err != nil {
+                       http.Error(w, err.Error(), http.StatusInternalServerError)
+                       return
+               }
+               if err = WriteFileSync(dirPath, path+"."+HashAlgoSHA256, 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
+               }
+       }
+}