X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=upload.go;h=cd98df5ba5954db50c2889393c882c3b77be4994;hb=f3c71e12f9781d266b84d542b950bc77383a1dc1;hp=0e7db6148aa044f1d525f543c44e16fe1b2ef9cc;hpb=b036ee436eb9bd8889734232a22d3f24be5c9ee2;p=gocheese.git

diff --git a/upload.go b/upload.go
index 0e7db61..cd98df5 100644
--- a/upload.go
+++ b/upload.go
@@ -1,7 +1,7 @@
 /*
 GoCheese -- Python private package repository and caching proxy
-Copyright (C) 2019 Sergey Matveev <stargrave@stargrave.org>
-              2019 Elena Balakhonova <balakhonova_e@riseup.net>
+Copyright (C) 2019-2021 Sergey Matveev <stargrave@stargrave.org>
+              2019-2021 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
@@ -39,7 +39,9 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "unauthenticated", http.StatusUnauthorized)
 		return
 	}
-	auther, ok := passwords[username]
+	PasswordsM.RLock()
+	auther, ok := Passwords[username]
+	PasswordsM.RUnlock()
 	if !ok || !auther.Auth(password) {
 		log.Println(r.RemoteAddr, "unauthenticated", username)
 		http.Error(w, "unauthenticated", http.StatusUnauthorized)
@@ -82,7 +84,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		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)
+			log.Println(r.RemoteAddr, filename, "already exists")
 			http.Error(w, "already exists", http.StatusBadRequest)
 			return
 		}
@@ -92,11 +94,13 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		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
 		}
 		dst, err := TempFile(dirPath)
 		if err != nil {
+			log.Println("error", r.RemoteAddr, filename, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
@@ -104,22 +108,27 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		hasher := sha256.New()
 		wr := io.MultiWriter(hasher, dst)
 		if _, err = io.Copy(wr, src); err != nil {
+			log.Println("error", r.RemoteAddr, filename, err)
 			os.Remove(dst.Name())
 			dst.Close()
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 		if err = dstBuf.Flush(); err != nil {
+			log.Println("error", r.RemoteAddr, filename, err)
 			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
+		if !NoSync {
+			if err = dst.Sync(); err != nil {
+				log.Println("error", r.RemoteAddr, filename, err)
+				os.Remove(dst.Name())
+				dst.Close()
+				http.Error(w, err.Error(), http.StatusInternalServerError)
+				return
+			}
 		}
 		dst.Close()
 		digest := hasher.Sum(nil)
@@ -134,14 +143,17 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 		if err = os.Rename(dst.Name(), path); err != nil {
+			log.Println("error", r.RemoteAddr, path, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 		if err = DirSync(dirPath); err != nil {
+			log.Println("error", r.RemoteAddr, dirPath, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 		if err = WriteFileSync(dirPath, path+"."+HashAlgoSHA256, digest); err != nil {
+			log.Println("error", r.RemoteAddr, path+"."+HashAlgoSHA256, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
@@ -149,6 +161,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 	for _, file := range r.MultipartForm.File["gpg_signature"] {
 		filename := file.Filename
 		if _, exists := gpgSigsExpected[filename]; !exists {
+			log.Println(r.RemoteAddr, filename, "unexpected GPG signature filename")
 			http.Error(w, "unexpected GPG signature filename", http.StatusBadRequest)
 			return
 		}
@@ -156,22 +169,25 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		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)
+			log.Println(r.RemoteAddr, filename, "already exists")
 			http.Error(w, "already exists", http.StatusBadRequest)
 			return
 		}
 		src, err := file.Open()
 		if err != nil {
+			log.Println("error", r.RemoteAddr, filename, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 		sig, err := ioutil.ReadAll(src)
 		src.Close()
 		if err != nil {
+			log.Println("error", r.RemoteAddr, filename, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
 		if err = WriteFileSync(dirPath, path, sig); err != nil {
+			log.Println("error", r.RemoteAddr, path, err)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}