]> Sergey Matveev's repositories - uploader.git/blobdiff - src/uploader/main.go
Do not store empty files
[uploader.git] / src / uploader / main.go
index a18a81916396aefede22351cf552f11190081527..a1465cd663bfbe5b75807e2d06c1e697d5cdce48 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,6 +10,7 @@ import (
        "encoding/hex"
        "flag"
        "fmt"
+       "html/template"
        "io"
        "log"
        "net"
@@ -17,22 +18,33 @@ import (
        "os"
        "time"
 
-       "golang.org/x/crypto/blake2s"
+       "golang.org/x/crypto/blake2b"
        "golang.org/x/net/netutil"
 )
 
 const (
-       WriteBufSize = 1 << 20
+       WriteBufSize     = 1 << 20
+       FileFieldName    = "fileupload"
+       CommentFieldName = "comment"
 )
 
-func upload(w http.ResponseWriter, r *http.Request) {
-       log.Println(r.RemoteAddr, "connected")
-       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="{{.}}" /><br/>
+<label for="comment">Optional comment:</label>
+<textarea name="comment" cols="80" rows="25" name="comment"></textarea><br/>
+<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()
@@ -45,35 +57,58 @@ func upload(w http.ResponseWriter, r *http.Request) {
                log.Println(r.RemoteAddr, err)
                return
        }
-       if p.FormName() != "fileupload" {
+       if p.FormName() != FileFieldName {
                log.Println(r.RemoteAddr, "non file form field")
                return
        }
+       h, err := blake2b.New256(nil)
+       if err != nil {
+               panic(err)
+       }
        fn := time.Now().Format(time.RFC3339Nano)
-       fd, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE, 0600)
+       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
        }
-       defer fd.Close()
-       h, err := blake2s.New256(nil)
-       if err != nil {
-               panic(err)
-       }
        fdBuf := bufio.NewWriterSize(fd, WriteBufSize)
        mw := io.MultiWriter(fdBuf, h)
        n, err := io.Copy(mw, p)
        if err != nil {
                log.Println(r.RemoteAddr, fn, p.FileName(), err)
+               fd.Close()
+               return
+       }
+       if n == 0 {
+               log.Println(r.RemoteAddr, fn, p.FileName(), "empty")
+               os.Remove(fn + ".part")
+               fd.Close()
+               fmt.Fprintf(w, "Empty file")
                return
        }
        if err = fdBuf.Flush(); err != nil {
                log.Println(r.RemoteAddr, fn, p.FileName(), err)
+               fd.Close()
                return
        }
+       fd.Close()
        sum := hex.EncodeToString(h.Sum(nil))
-       fmt.Fprintf(w, "bytes: %d\nBLAKE2s: %s\n", n, sum)
+       if err = os.Rename(fn+".part", fn); err != nil {
+               log.Println(r.RemoteAddr, fn, p.FileName(), n, sum, err)
+               return
+       }
+       fmt.Fprintf(w, "Timestamp: %s\nBytes: %d\nBLAKE2b: %s\n", fn, n, sum)
        log.Println(r.RemoteAddr, fn, p.FileName(), n, sum)
+       p, err = mr.NextPart()
+       if err != nil || p.FormName() != CommentFieldName {
+               return
+       }
+       comment, err := ioutil.ReadAll(p)
+       if err != nil || len(comment) == 0 {
+               return
+       }
+       ioutil.WriteFile(fn+".txt", comment, os.FileMode(0600))
+       go notify(fn, n, string(comment))
 }
 
 func main() {