Upload

From 595d466b7678ffef26bc54e89f4a5731efe5edc0 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 8 Jan 2018 21:48:00 +0300 Subject: [PATCH] More logging --- README | 8 ++++++++ src/uploader/main.go | 24 ++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/README b/README index b97d1ad..9129971 100644 --- a/README +++ b/README @@ -1,3 +1,11 @@ Simplest form file uploader. It just saves uploaded file from HTML form to the new file on the disk. Also it calculates BLAKE2s checksum, replying with it in the answer. + +You can upload files with curl: + + curl -F fileupload=@somedata.tar.gpg http://localhost:8086/upload/ + +You can verify integrity locally: + + b2sum -a blake2s somedata.tar.gpg diff --git a/src/uploader/main.go b/src/uploader/main.go index 43794c6..a18a819 100644 --- a/src/uploader/main.go +++ b/src/uploader/main.go @@ -11,6 +11,7 @@ import ( "flag" "fmt" "io" + "log" "net" "net/http" "os" @@ -25,6 +26,7 @@ const ( ) func upload(w http.ResponseWriter, r *http.Request) { + log.Println(r.RemoteAddr, "connected") if r.Method == http.MethodGet { w.Write([]byte(` Upload @@ -35,22 +37,22 @@ func upload(w http.ResponseWriter, r *http.Request) { } mr, err := r.MultipartReader() if err != nil { - fmt.Println(err) + log.Println(r.RemoteAddr, err) return } p, err := mr.NextPart() if err != nil { - fmt.Println(err) + log.Println(r.RemoteAddr, err) return } if p.FormName() != "fileupload" { - fmt.Println("non file form field") + log.Println(r.RemoteAddr, "non file form field") return } - now := time.Now() - fd, err := os.OpenFile(now.Format(time.RFC3339Nano), os.O_WRONLY|os.O_CREATE, 0600) + fn := time.Now().Format(time.RFC3339Nano) + fd, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE, 0600) if err != nil { - fmt.Println(err) + log.Println(r.RemoteAddr, fn, p.FileName(), err) return } defer fd.Close() @@ -62,14 +64,16 @@ func upload(w http.ResponseWriter, r *http.Request) { mw := io.MultiWriter(fdBuf, h) n, err := io.Copy(mw, p) if err != nil { - fmt.Println(err) + log.Println(r.RemoteAddr, fn, p.FileName(), err) return } if err = fdBuf.Flush(); err != nil { - fmt.Println(err) + log.Println(r.RemoteAddr, fn, p.FileName(), err) return } - fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, hex.EncodeToString(h.Sum(nil))) + sum := hex.EncodeToString(h.Sum(nil)) + fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, sum) + log.Println(r.RemoteAddr, fn, p.FileName(), n, sum) } func main() { @@ -80,7 +84,7 @@ func main() { if err != nil { panic(err) } - fmt.Println("listening on", *bind) + log.Println("listening", *bind) ln = netutil.LimitListener(ln, *conns) s := &http.Server{ ReadHeaderTimeout: 10 * time.Second, -- 2.44.0