Save BLAKE2b-256 checksum during upload

diff --git a/upload.go b/upload.go
index a72d779257dcc5333465b3cb00c2524e34c1eb89..669e414e81e07be2cd37fe12a1c427bcd20fd3c7 100644 (file)
--- a/upload.go
+++ b/upload.go
@@ -68,16 +68,25 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
        }
        pkgName := strings.ToLower(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])
+       gpgSigsExpected := make(map[string]struct{})
+       now := time.Now().UTC()
+
+       var digestSHA256Expected []byte
+       if digestSHA256ExpectedHex, exists := r.MultipartForm.Value["sha256_digest"]; exists {
+               digestSHA256Expected, err = hex.DecodeString(digestSHA256ExpectedHex[0])
                if err != nil {
                        http.Error(w, "bad sha256_digest: "+err.Error(), http.StatusBadRequest)
                        return
                }
        }
-       gpgSigsExpected := make(map[string]struct{})
-       now := time.Now().UTC()
+       var digestBLAKE2b256Expected []byte
+       if digestBLAKE2b256ExpectedHex, exists := r.MultipartForm.Value["blake2_256_digest"]; exists {
+               digestBLAKE2b256Expected, err = hex.DecodeString(digestBLAKE2b256ExpectedHex[0])
+               if err != nil {
+                       http.Error(w, "bad blake2_256_digest: "+err.Error(), http.StatusBadRequest)
+                       return
+               }
+       }
 
        // Checking is it internal package
        if _, err = os.Stat(filepath.Join(dirPath, InternalFlag)); err != nil {
@@ -113,8 +122,9 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        return
                }
                dstBuf := bufio.NewWriter(dst)
-               hasher := sha256.New()
-               wr := io.MultiWriter(hasher, dst)
+               hasherSHA256 := sha256.New()
+               hasherBLAKE2b256 := blake2b256New()
+               wr := io.MultiWriter(hasherSHA256, hasherBLAKE2b256, dst)
                if _, err = io.Copy(wr, src); err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)
                        os.Remove(dst.Name())
@@ -139,17 +149,30 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        }
                }
                dst.Close()
-               digest := hasher.Sum(nil)
-               if digestExpected != nil {
-                       if bytes.Compare(digestExpected, digest) == 0 {
-                               log.Println(r.RemoteAddr, filename, "good checksum received")
+
+               digestSHA256 := hasherSHA256.Sum(nil)
+               digestBLAKE2b256 := hasherBLAKE2b256.Sum(nil)
+               if digestSHA256Expected != nil {
+                       if bytes.Compare(digestSHA256Expected, digestSHA256) == 0 {
+                               log.Println(r.RemoteAddr, filename, "good SHA256 checksum received")
                        } else {
-                               log.Println(r.RemoteAddr, filename, "bad checksum received")
-                               http.Error(w, "bad checksum", http.StatusBadRequest)
+                               log.Println(r.RemoteAddr, filename, "bad SHA256 checksum received")
+                               http.Error(w, "bad sha256 checksum", http.StatusBadRequest)
                                os.Remove(dst.Name())
                                return
                        }
                }
+               if digestBLAKE2b256Expected != nil {
+                       if bytes.Compare(digestBLAKE2b256Expected, digestBLAKE2b256) == 0 {
+                               log.Println(r.RemoteAddr, filename, "good BLAKE2b-256 checksum received")
+                       } else {
+                               log.Println(r.RemoteAddr, filename, "bad BLAKE2b-256 checksum received")
+                               http.Error(w, "bad blake2_256 checksum", http.StatusBadRequest)
+                               os.Remove(dst.Name())
+                               return
+                       }
+               }
+
                if err = os.Rename(dst.Name(), path); err != nil {
                        log.Println("error", r.RemoteAddr, path, err)
                        http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -160,11 +183,16 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return
                }
-               if err = WriteFileSync(dirPath, path+"."+HashAlgoSHA256, digest, now); err != nil {
+               if err = WriteFileSync(dirPath, path+"."+HashAlgoSHA256, digestSHA256, now); err != nil {
                        log.Println("error", r.RemoteAddr, path+"."+HashAlgoSHA256, err)
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return
                }
+               if err = WriteFileSync(dirPath, path+"."+HashAlgoBLAKE2b256, digestBLAKE2b256, now); err != nil {
+                       log.Println("error", r.RemoteAddr, path+"."+HashAlgoBLAKE2b256, err)
+                       http.Error(w, err.Error(), http.StatusInternalServerError)
+                       return
+               }
        }
        for _, file := range r.MultipartForm.File["gpg_signature"] {
                filename := file.Filename