package nncp
import (
+ "archive/tar"
"bufio"
"bytes"
"crypto/rand"
"path/filepath"
"strconv"
"strings"
+ "time"
- "github.com/davecgh/go-xdr/xdr2"
+ xdr "github.com/davecgh/go-xdr/xdr2"
"github.com/klauspost/compress/zstd"
"golang.org/x/crypto/blake2b"
"golang.org/x/crypto/chacha20poly1305"
)
+const (
+ TarBlockSize = 512
+ TarExt = ".tar"
+)
+
func (ctx *Ctx) Tx(
node *Node,
pkt *Pkt,
return lastNode, err
}
-func prepareTxFile(srcPath string) (io.Reader, *os.File, int64, error) {
- var reader io.Reader
- var src *os.File
- var fileSize int64
- var err error
+type DummyCloser struct{}
+
+func (dc DummyCloser) Close() error { return nil }
+
+func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize int64, archived bool, rerr error) {
if srcPath == "-" {
- src, err = ioutil.TempFile("", "nncp-file")
+ // Read content from stdin, saving to temporary file, encrypting
+ // on the fly
+ src, err := ioutil.TempFile("", "nncp-file")
if err != nil {
- return nil, nil, 0, err
+ rerr = err
+ return
}
os.Remove(src.Name())
tmpW := bufio.NewWriter(src)
tmpKey := make([]byte, chacha20poly1305.KeySize)
- if _, err = rand.Read(tmpKey[:]); err != nil {
- return nil, nil, 0, err
+ if _, rerr = rand.Read(tmpKey[:]); rerr != nil {
+ return
}
aead, err := chacha20poly1305.New(tmpKey)
if err != nil {
- return nil, nil, 0, err
+ rerr = err
+ return
}
nonce := make([]byte, aead.NonceSize())
written, err := aeadProcess(aead, nonce, true, bufio.NewReader(os.Stdin), tmpW)
if err != nil {
- return nil, nil, 0, err
+ rerr = err
+ return
}
fileSize = int64(written)
if err = tmpW.Flush(); err != nil {
- return nil, nil, 0, err
+ return
}
src.Seek(0, io.SeekStart)
r, w := io.Pipe()
go func() {
if _, err := aeadProcess(aead, nonce, false, bufio.NewReader(src), w); err != nil {
- panic(err)
+ w.CloseWithError(err)
}
}()
reader = r
- } else {
- src, err = os.Open(srcPath)
- if err != nil {
- return nil, nil, 0, err
- }
- srcStat, err := src.Stat()
+ closer = src
+ return
+ }
+
+ srcStat, err := os.Stat(srcPath)
+ if err != nil {
+ rerr = err
+ return
+ }
+ mode := srcStat.Mode()
+
+ if mode.IsRegular() {
+ // It is regular file, just send it
+ src, err := os.Open(srcPath)
if err != nil {
- return nil, nil, 0, err
+ rerr = err
+ return
}
fileSize = srcStat.Size()
reader = bufio.NewReader(src)
+ closer = src
+ return
+ }
+
+ if !mode.IsDir() {
+ rerr = errors.New("unsupported file type")
+ return
+ }
+
+ // It is directory, create PAX archive with its contents
+ archived = true
+ basePath := filepath.Base(srcPath)
+ rootPath, err := filepath.Abs(srcPath)
+ if err != nil {
+ rerr = err
+ return
+ }
+ type einfo struct {
+ path string
+ modTime time.Time
+ size int64
+ }
+ dirs := make([]einfo, 0, 1<<10)
+ files := make([]einfo, 0, 1<<10)
+ rerr = filepath.Walk(rootPath, func(path string, info os.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+ if info.IsDir() {
+ // directory header, PAX record header+contents
+ fileSize += TarBlockSize + 2*TarBlockSize
+ dirs = append(dirs, einfo{path: path, modTime: info.ModTime()})
+ } else {
+ // file header, PAX record header+contents, file content
+ fileSize += TarBlockSize + 2*TarBlockSize + info.Size()
+ if n := info.Size() % TarBlockSize; n != 0 {
+ fileSize += TarBlockSize - n // padding
+ }
+ files = append(files, einfo{
+ path: path,
+ modTime: info.ModTime(),
+ size: info.Size(),
+ })
+ }
+ return nil
+ })
+ if rerr != nil {
+ return
}
- return reader, src, fileSize, nil
+
+ r, w := io.Pipe()
+ reader = r
+ closer = DummyCloser{}
+ fileSize += 2 * TarBlockSize // termination block
+
+ go func() {
+ tarWr := tar.NewWriter(w)
+ hdr := tar.Header{
+ Typeflag: tar.TypeDir,
+ Mode: 0777,
+ PAXRecords: map[string]string{
+ "comment": "Autogenerated by " + VersionGet(),
+ },
+ Format: tar.FormatPAX,
+ }
+ for _, e := range dirs {
+ hdr.Name = basePath + e.path[len(rootPath):]
+ hdr.ModTime = e.modTime
+ if err = tarWr.WriteHeader(&hdr); err != nil {
+ w.CloseWithError(err)
+ }
+ }
+ hdr.Typeflag = tar.TypeReg
+ hdr.Mode = 0666
+ for _, e := range files {
+ hdr.Name = basePath + e.path[len(rootPath):]
+ hdr.ModTime = e.modTime
+ hdr.Size = e.size
+ if err = tarWr.WriteHeader(&hdr); err != nil {
+ w.CloseWithError(err)
+ }
+ fd, err := os.Open(e.path)
+ if err != nil {
+ w.CloseWithError(err)
+ }
+ _, err = io.Copy(tarWr, bufio.NewReader(fd))
+ if err != nil {
+ w.CloseWithError(err)
+ }
+ fd.Close()
+ }
+ tarWr.Close()
+ w.Close()
+ }()
+ return
}
func (ctx *Ctx) TxFile(node *Node, nice uint8, srcPath, dstPath string, minSize int64) error {
+ dstPathSpecified := false
if dstPath == "" {
if srcPath == "-" {
return errors.New("Must provide destination filename")
}
dstPath = filepath.Base(srcPath)
+ } else {
+ dstPathSpecified = true
}
dstPath = filepath.Clean(dstPath)
if filepath.IsAbs(dstPath) {
return errors.New("Relative destination path required")
}
- pkt, err := NewPkt(PktTypeFile, nice, []byte(dstPath))
+ reader, closer, fileSize, archived, err := prepareTxFile(srcPath)
+ if closer != nil {
+ defer closer.Close()
+ }
if err != nil {
return err
}
- reader, src, fileSize, err := prepareTxFile(srcPath)
- if src != nil {
- defer src.Close()
+ if archived && !dstPathSpecified {
+ dstPath += TarExt
}
+ pkt, err := NewPkt(PktTypeFile, nice, []byte(dstPath))
if err != nil {
return err
}
minSize int64,
chunkSize int64,
) error {
+ dstPathSpecified := false
if dstPath == "" {
if srcPath == "-" {
return errors.New("Must provide destination filename")
}
dstPath = filepath.Base(srcPath)
+ } else {
+ dstPathSpecified = true
}
dstPath = filepath.Clean(dstPath)
if filepath.IsAbs(dstPath) {
return errors.New("Relative destination path required")
}
- reader, src, fileSize, err := prepareTxFile(srcPath)
- if src != nil {
- defer src.Close()
+ reader, closer, fileSize, archived, err := prepareTxFile(srcPath)
+ if closer != nil {
+ defer closer.Close()
}
if err != nil {
return err
}
+ if archived && !dstPathSpecified {
+ dstPath += TarExt
+ }
if fileSize <= chunkSize {
pkt, err := NewPkt(PktTypeFile, nice, []byte(dstPath))