X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=blobdiff_plain;f=gocheese.go;h=cdbb1358d70789ecd211e0097b6c9e5080775a5e;hp=a11e03f04d0a398efd1c1d24f9437ea0142def0a;hb=c4dc8234e8d219cf784ee604bf9bc53f8af4dd12;hpb=099686a6455463aa6ccba141da1481c82fdb0cec

diff --git a/gocheese.go b/gocheese.go
index a11e03f..cdbb135 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -298,6 +298,14 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
+	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
+		}
+	}
 	for _, file := range r.MultipartForm.File["content"] {
 		filename := file.Filename
 		log.Println(r.RemoteAddr, "put", filename, "by", username)
@@ -347,11 +355,22 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 			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 = ioutil.WriteFile(path+SHA256Ext, hasher.Sum(nil), os.FileMode(0666)); err != nil {
+		if err = ioutil.WriteFile(path+SHA256Ext, digest, os.FileMode(0666)); err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}