Hashes are redundantly present in .meta4

[gocheese.git] / upload.go

diff --git a/upload.go b/upload.go
index aec2008849f534241ad7ce3850627663cb265973..3765c56cacb4108d0bfa5697f5372c1c3d8f6272 100644 (file)
--- a/upload.go
+++ b/upload.go
@@ -1,7 +1,7 @@
 /*
 GoCheese -- Python private package repository and caching proxy
-Copyright (C) 2019-2022 Sergey Matveev <stargrave@stargrave.org>
-              2019-2022 Elena Balakhonova <balakhonova_e@riseup.net>
+Copyright (C) 2019-2023 Sergey Matveev <stargrave@stargrave.org>
+              2019-2023 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
@@ -24,7 +24,6 @@ import (
        "crypto/sha256"
        "encoding/hex"
        "io"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -109,12 +108,12 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        return
                }
                src, err := file.Open()
-               defer src.Close()
                if err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return
                }
+               defer src.Close()
                dst, err := TempFile(dirPath)
                if err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)
@@ -153,7 +152,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                digestSHA256 := hasherSHA256.Sum(nil)
                digestBLAKE2b256 := hasherBLAKE2b256.Sum(nil)
                if digestSHA256Expected != nil {
-                       if bytes.Compare(digestSHA256Expected, digestSHA256) == 0 {
+                       if bytes.Equal(digestSHA256Expected, digestSHA256) {
                                log.Println(r.RemoteAddr, filename, "good SHA256 checksum received")
                        } else {
                                log.Println(r.RemoteAddr, filename, "bad SHA256 checksum received")
@@ -163,7 +162,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        }
                }
                if digestBLAKE2b256Expected != nil {
-                       if bytes.Compare(digestBLAKE2b256Expected, digestBLAKE2b256) == 0 {
+                       if bytes.Equal(digestBLAKE2b256Expected, digestBLAKE2b256) {
                                log.Println(r.RemoteAddr, filename, "good BLAKE2b-256 checksum received")
                        } else {
                                log.Println(r.RemoteAddr, filename, "bad BLAKE2b-256 checksum received")
@@ -215,7 +214,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return
                }
-               sig, err := ioutil.ReadAll(src)
+               sig, err := io.ReadAll(src)
                src.Close()
                if err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)