]> Sergey Matveev's repositories - uploader.git/blobdiff - src/uploader/main.go
Raise copyright years
[uploader.git] / src / uploader / main.go
index 43794c63f18fed4ae88d1848083ae0a9ac60baf2..c3f4e23f44044b5f9d4792a12837389eda19511b 100644 (file)
@@ -1,6 +1,6 @@
 /*
 uploader -- simplest form file uploader
-Copyright (C) 2018 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2018-2019 Sergey Matveev <stargrave@stargrave.org>
 */
 
 package main
@@ -10,7 +10,9 @@ import (
        "encoding/hex"
        "flag"
        "fmt"
+       "html/template"
        "io"
+       "log"
        "net"
        "net/http"
        "os"
@@ -21,55 +23,71 @@ import (
 )
 
 const (
-       WriteBufSize = 1 << 20
+       WriteBufSize  = 1 << 20
+       FileFieldName = "fileupload"
 )
 
-func upload(w http.ResponseWriter, r *http.Request) {
-       if r.Method == http.MethodGet {
-               w.Write([]byte(`<html>
+var (
+       Index = template.Must(template.New("index").Parse(`<html>
 <head><title>Upload</title></head><body>
 <form enctype="multipart/form-data" action="/upload/" method="post">
-<input type="file" name="fileupload" /><input type="submit" />
+<input type="file" name="{{.}}" /><input type="submit" />
 </form></body></html>`))
+)
+
+func upload(w http.ResponseWriter, r *http.Request) {
+       log.Println(r.RemoteAddr, "connected")
+       if r.Method == http.MethodGet {
+               if err := Index.Execute(w, FileFieldName); err != nil {
+                       log.Println(r.RemoteAddr, err)
+               }
                return
        }
        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)
-               return
-       }
-       if p.FormName() != "fileupload" {
-               fmt.Println("non file form field")
+               log.Println(r.RemoteAddr, err)
                return
        }
-       now := time.Now()
-       fd, err := os.OpenFile(now.Format(time.RFC3339Nano), os.O_WRONLY|os.O_CREATE, 0600)
-       if err != nil {
-               fmt.Println(err)
+       if p.FormName() != FileFieldName {
+               log.Println(r.RemoteAddr, "non file form field")
                return
        }
-       defer fd.Close()
        h, err := blake2s.New256(nil)
        if err != nil {
                panic(err)
        }
+       fn := time.Now().Format(time.RFC3339Nano)
+       fd, err := os.OpenFile(fn+".part", os.O_WRONLY|os.O_CREATE, 0600)
+       if err != nil {
+               log.Println(r.RemoteAddr, fn, p.FileName(), err)
+               return
+       }
        fdBuf := bufio.NewWriterSize(fd, WriteBufSize)
        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)
+               fd.Close()
                return
        }
        if err = fdBuf.Flush(); err != nil {
-               fmt.Println(err)
+               log.Println(r.RemoteAddr, fn, p.FileName(), err)
+               fd.Close()
+               return
+       }
+       fd.Close()
+       sum := hex.EncodeToString(h.Sum(nil))
+       if err = os.Rename(fn+".part", fn); err != nil {
+               log.Println(r.RemoteAddr, fn, p.FileName(), n, sum, err)
                return
        }
-       fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, 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 +98,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,