/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
"path/filepath"
"github.com/dustin/go-humanize"
- "go.cypherpunks.ru/nncp/v6"
+ "go.cypherpunks.ru/nncp/v8"
)
func usage() {
goto Tx
}
fis, err = dir.Readdir(0)
- dir.Close() // #nosec G104
+ dir.Close()
if err != nil {
ctx.LogE("xfer-self-read", les, err, func(les nncp.LEs) string {
return logMsg(les) + ": reading"
continue
}
fisInt, err := dir.Readdir(0)
- dir.Close() // #nosec G104
+ dir.Close()
if err != nil {
ctx.LogE("xfer-rx-read", les, err, func(les nncp.LEs) string {
return logMsg(les) + ": reading"
continue
}
pktEnc, pktEncRaw, err := ctx.HdrRead(fd)
- if err != nil || pktEnc.Magic != nncp.MagicNNCPEv4 {
- ctx.LogD("xfer-rx-not-packet", les, func(les nncp.LEs) string {
- return logMsg(les) + ": is not a packet"
- })
- fd.Close() // #nosec G104
+ if err == nil {
+ switch pktEnc.Magic {
+ case nncp.MagicNNCPEv1.B:
+ err = nncp.MagicNNCPEv1.TooOld()
+ case nncp.MagicNNCPEv2.B:
+ err = nncp.MagicNNCPEv2.TooOld()
+ case nncp.MagicNNCPEv3.B:
+ err = nncp.MagicNNCPEv3.TooOld()
+ case nncp.MagicNNCPEv4.B:
+ err = nncp.MagicNNCPEv4.TooOld()
+ case nncp.MagicNNCPEv5.B:
+ err = nncp.MagicNNCPEv5.TooOld()
+ case nncp.MagicNNCPEv6.B:
+ default:
+ err = errors.New("is not an encrypted packet")
+ }
+ }
+ if err != nil {
+ ctx.LogD(
+ "xfer-rx-not-packet",
+ append(les, nncp.LE{K: "Err", V: err}),
+ func(les nncp.LEs) string {
+ return logMsg(les) + ": not valid packet: " + err.Error()
+ },
+ )
+ fd.Close()
continue
}
if pktEnc.Nice > nice {
ctx.LogD("xfer-rx-too-nice", les, func(les nncp.LEs) string {
return logMsg(les) + ": too nice"
})
- fd.Close() // #nosec G104
+ fd.Close()
continue
}
les = append(les, nncp.LE{K: "Size", V: fiInt.Size()})
}
if !ctx.IsEnoughSpace(fiInt.Size()) {
ctx.LogE("xfer-rx", les, errors.New("is not enough space"), logMsg)
- fd.Close() // #nosec G104
+ fd.Close()
continue
}
- if _, err = fd.Seek(0, 0); err != nil {
+ if _, err = fd.Seek(0, io.SeekStart); err != nil {
log.Fatalln(err)
}
tmp, err := ctx.NewTmpFileWHash()
}
if err != nil {
ctx.LogE("xfer-rx", les, err, logMsg)
- w.CloseWithError(err) // #nosec G104
+ w.CloseWithError(err)
}
}()
if _, err = nncp.CopyProgressed(
ctx.LogE("xfer-rx", les, err, logMsg)
isBad = true
}
- fd.Close() // #nosec G104
+ fd.Close()
if isBad {
tmp.Cancel()
continue
})
continue
}
- if _, err = os.Stat(filepath.Join(dstPath, pktName+nncp.SeenSuffix)); err == nil || !os.IsNotExist(err) {
+ if _, err = os.Stat(filepath.Join(
+ dstPath, nncp.SeenDir, pktName,
+ )); err == nil || !os.IsNotExist(err) {
ctx.LogD("xfer-tx-seen", les, func(les nncp.LEs) string {
return logMsg(les) + ": already seen"
})
ctx.LogE("xfer-tx-open", les, err, func(les nncp.LEs) string {
return logMsg(les) + ": opening"
})
- tmp.Close() // #nosec G104
+ tmp.Close()
isBad = true
continue
}
append(les, nncp.LE{K: "FullSize", V: job.Size}),
ctx.ShowPrgrs,
)
- fd.Close() // #nosec G104
+ fd.Close()
if err != nil {
ctx.LogE("xfer-tx-copy", les, err, func(les nncp.LEs) string {
return logMsg(les) + ": copying"
})
- tmp.Close() // #nosec G104
+ tmp.Close()
isBad = true
continue
}
if err = bufW.Flush(); err != nil {
- tmp.Close() // #nosec G104
+ tmp.Close()
ctx.LogE("xfer-tx-flush", les, err, func(les nncp.LEs) string {
return logMsg(les) + ": flushing"
})
isBad = true
continue
}
- if err = tmp.Sync(); err != nil {
- tmp.Close() // #nosec G104
- ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string {
- return logMsg(les) + ": syncing"
- })
- isBad = true
- continue
+ if !nncp.NoSync {
+ if err = tmp.Sync(); err != nil {
+ tmp.Close()
+ ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string {
+ return logMsg(les) + ": syncing"
+ })
+ isBad = true
+ continue
+ }
}
if err = tmp.Close(); err != nil {
ctx.LogE("xfer-tx-close", les, err, func(les nncp.LEs) string {
isBad = true
continue
}
- os.Remove(filepath.Join(dstPath, pktName+".part")) // #nosec G104
+ os.Remove(filepath.Join(dstPath, pktName+".part"))
les = les[:len(les)-1]
ctx.LogI(
"xfer-tx",
})
isBad = true
} else if ctx.HdrUsage {
- os.Remove(job.Path + nncp.HdrSuffix)
+ os.Remove(nncp.JobPath2Hdr(job.Path))
}
}
}