X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=blobdiff_plain;f=upload.go;fp=upload.go;h=a0068db483d95556268566e1256c4234ab24113c;hp=3765c56cacb4108d0bfa5697f5372c1c3d8f6272;hb=09804703f3aa97a1a903f6bda2384cd64a2dbe85;hpb=52f1599e5a82452175fb25e5713519b855e7a201 diff --git a/upload.go b/upload.go index 3765c56..a0068db 100644 --- a/upload.go +++ b/upload.go @@ -67,7 +67,6 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { } pkgName := strings.ToLower(NormalizationRe.ReplaceAllString(pkgNames[0], "-")) dirPath := filepath.Join(Root, pkgName) - gpgSigsExpected := make(map[string]struct{}) now := time.Now().UTC() var digestSHA256Expected []byte @@ -96,7 +95,6 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { 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 { @@ -193,40 +191,6 @@ func serveUpload(w http.ResponseWriter, r *http.Request) { return } } - 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 - } - 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, 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 := io.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, now); err != nil { - log.Println("error", r.RemoteAddr, path, err) - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - } var buf bytes.Buffer wr := recfile.NewWriter(&buf)