/*
uploader -- simplest form file uploader
-Copyright (C) 2018-2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2018-2021 Sergey Matveev <stargrave@stargrave.org>
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
import (
"bufio"
+ "bytes"
"encoding/base64"
"encoding/hex"
"flag"
"net/http"
"os"
"os/exec"
+ "strconv"
"strings"
"time"
+ "go.cypherpunks.ru/recfile"
+ "go.cypherpunks.ru/tai64n"
"golang.org/x/crypto/blake2b"
"golang.org/x/net/netutil"
)
const (
WriteBufSize = 1 << 20
- FileFieldName = "fileupload"
+ FileFieldName = "file"
CommentFieldName = "comment"
SendmailCmd = "/usr/sbin/sendmail"
var (
Index = template.Must(template.New("index").Parse(`<html>
<head><title>Upload</title></head><body>
-<pre>
Example command line usage:
- curl -F fileupload=@somedata.tar.gpg [-F comment="optional comment"] http://.../upload/
- b2sum -a blake2b somedata.tar.gpg
+<pre>
+$ curl -F file=@somedata.tar.gpg [-F comment="optional comment"] http://.../upload/
+$ b2sum -a blake2b somedata.tar.gpg # to verify checksum
</pre>
<form enctype="multipart/form-data" action="/upload/" method="post">
-<input type="file" name="{{.}}" /><br/>
-<label for="comment">Optional comment:</label>
+<label for="file">File to upload:</label><br/>
+<input name="file" type="file" name="{{.}}" /><br/>
+<label for="comment">Optional comment:</label></br>
<textarea name="comment" cols="80" rows="25" name="comment"></textarea><br/>
<input type="submit" />
</form></body></html>`))
NotifyToAddr *string
)
-func notify(filename, timestamp string, size int64, comment string) {
+func notify(tai, filename string, size int64, comment string) {
if *NotifyToAddr == "" {
return
}
+ var rec bytes.Buffer
+ w := recfile.NewWriter(&rec)
+ w.WriteFields(
+ recfile.Field{Name: "TAI64N", Value: tai},
+ recfile.Field{Name: "Size", Value: strconv.FormatInt(size, 10)},
+ recfile.Field{Name: "Filename", Value: filename},
+ )
+ w.WriteFieldMultiline("Comment", strings.Split(comment, "\n"))
cmd := exec.Command(SendmailCmd, *NotifyToAddr)
cmd.Stdin = io.MultiReader(
strings.NewReader(fmt.Sprintf(
`,
*NotifyFromAddr,
*NotifyToAddr,
- mime.BEncoding.Encode("UTF-8", fmt.Sprintf(
- "%s (%d KiB)", filename, size/1024,
- )),
+ mime.BEncoding.Encode("UTF-8", fmt.Sprintf("%s (%d KiB)", filename, size/1024)),
)),
- strings.NewReader(base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf(
- "Timestamp: %s\nSize: %d bytes\nComment: %s\n",
- timestamp,
- size,
- comment,
- )))),
+ strings.NewReader(base64.StdEncoding.EncodeToString(rec.Bytes())),
)
cmd.Run()
}
if err != nil {
panic(err)
}
- fn := time.Now().Format(time.RFC3339Nano)
+ t := time.Now()
+ ts := new(tai64n.TAI64N)
+ tai64n.FromTime(t, ts)
+ tai := ts.Encode()[1:]
fnOrig := p.FileName()
- fd, err := os.OpenFile(fn+".part", os.O_WRONLY|os.O_CREATE, 0600)
+ fd, err := os.OpenFile(tai+".part", os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0666)
if err != nil {
- log.Println(r.RemoteAddr, fn, fnOrig, err)
+ log.Println(r.RemoteAddr, tai, fnOrig, err)
return
}
fdBuf := bufio.NewWriterSize(fd, WriteBufSize)
mw := io.MultiWriter(fdBuf, h)
n, err := io.Copy(mw, p)
if err != nil {
- log.Println(r.RemoteAddr, fn, fnOrig, err)
+ log.Println(r.RemoteAddr, tai, fnOrig, err)
fd.Close()
return
}
if n == 0 {
- log.Println(r.RemoteAddr, fn, fnOrig, "empty")
- os.Remove(fn + ".part")
+ log.Println(r.RemoteAddr, tai, fnOrig, "empty")
+ os.Remove(tai + ".part")
fd.Close()
fmt.Fprintf(w, "Empty file")
return
}
if err = fdBuf.Flush(); err != nil {
- log.Println(r.RemoteAddr, fn, fnOrig, err)
+ log.Println(r.RemoteAddr, tai, fnOrig, err)
+ fd.Close()
+ return
+ }
+ if err = fd.Sync(); err != nil {
+ log.Println(r.RemoteAddr, tai, fnOrig, 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, fnOrig, n, sum, err)
+ if err = os.Rename(tai+".part", tai); err != nil {
+ log.Println(r.RemoteAddr, tai, fnOrig, n, sum, err)
+ return
+ }
+ var rec bytes.Buffer
+ wr := recfile.NewWriter(&rec)
+ if _, err = wr.WriteFields(
+ recfile.Field{Name: "TAI64N", Value: tai},
+ recfile.Field{Name: "Size", Value: strconv.FormatInt(n, 10)},
+ recfile.Field{Name: "Checksum", Value: sum},
+ ); err != nil {
+ log.Println(r.RemoteAddr, tai, fnOrig, n, sum, err)
return
}
- fmt.Fprintf(w, "Timestamp: %s\nBytes: %d\nBLAKE2b: %s\n", fn, n, sum)
- log.Println(r.RemoteAddr, fn, fnOrig, n, sum)
+ io.Copy(w, &rec)
+ log.Println(r.RemoteAddr, tai, fnOrig, n, sum)
p, err = mr.NextPart()
if err != nil || p.FormName() != CommentFieldName {
- go notify(fnOrig, fn, n, "")
+ go notify(fnOrig, tai, n, "")
return
}
comment, err := ioutil.ReadAll(p)
if err != nil || len(comment) == 0 {
- go notify(fnOrig, fn, n, "")
+ go notify(tai, fnOrig, n, "")
return
}
- ioutil.WriteFile(fn+".txt", comment, os.FileMode(0600))
- go notify(fnOrig, fn, n, string(comment))
+ ioutil.WriteFile(tai+".txt", comment, os.FileMode(0666))
+ go notify(tai, fnOrig, n, string(comment))
}
func main() {
bind := flag.String("bind", "[::]:8086", "Address to bind to")
conns := flag.Int("conns", 2, "Maximal number of connections")
- NotifyFromAddr = flag.String("notify-from", "uploader@example.com", "Address notifications are send to")
- NotifyToAddr = flag.String("notify-to", "", "Address notifications are send from")
+ NotifyFromAddr = flag.String("notify-from", "uploader@example.com", "Address notifications are sent to")
+ NotifyToAddr = flag.String("notify-to", "", "Address notifications are sent from")
flag.Parse()
+ log.SetFlags(log.Lshortfile)
+ log.SetOutput(os.Stdout)
if len(*NotifyFromAddr) == 0 && len(*NotifyToAddr) > 0 {
log.Fatalln("notify-from address can not be empty, if notify-to is set")
}