From 2758c63b64cf12e5f457daeb78e830959d26faae Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 8 Aug 2021 11:57:58 +0300 Subject: [PATCH] Remove unused #nosec-s --- src/call.go | 4 ++-- src/cfg.go | 4 ++-- src/check.go | 2 +- src/cmd/nncp-bundle/main.go | 2 +- src/cmd/nncp-cfgenc/main.go | 10 +++++----- src/cmd/nncp-daemon/main.go | 6 +++--- src/cmd/nncp-reass/main.go | 8 ++++---- src/cmd/nncp-xfer/main.go | 26 +++++++++++++------------- src/jobs.go | 2 +- src/lockdir.go | 6 +++--- src/log.go | 4 ++-- src/pipe.go | 2 +- src/sp.go | 16 ++++++++-------- src/tmp.go | 12 ++++++------ src/toss.go | 4 ++-- src/tx.go | 28 ++++++++++++++-------------- 16 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/call.go b/src/call.go index e8b3f76..f916a82 100644 --- a/src/call.go +++ b/src/call.go @@ -134,13 +134,13 @@ func (ctx *Ctx) CallNode( ) }) isGood = true - conn.Close() // #nosec G104 + conn.Close() break } else { ctx.LogE("call-started", les, err, func(les LEs) string { return fmt.Sprintf("Connection to %s (%s)", node.Name, addr) }) - conn.Close() // #nosec G104 + conn.Close() } } return diff --git a/src/cfg.go b/src/cfg.go index 5a404ed..22da596 100644 --- a/src/cfg.go +++ b/src/cfg.go @@ -462,12 +462,12 @@ func NewArea(ctx *Ctx, name string, cfg *AreaJSON) (*Area, error) { func CfgParse(data []byte) (*CfgJSON, error) { var err error if bytes.Compare(data[:8], MagicNNCPBv3.B[:]) == 0 { - os.Stderr.WriteString("Passphrase:") // #nosec G104 + os.Stderr.WriteString("Passphrase:") password, err := term.ReadPassword(0) if err != nil { log.Fatalln(err) } - os.Stderr.WriteString("\n") // #nosec G104 + os.Stderr.WriteString("\n") data, err = DeEBlob(data, password) if err != nil { return nil, err diff --git a/src/check.go b/src/check.go index d6a98fa..811bab0 100644 --- a/src/check.go +++ b/src/check.go @@ -62,7 +62,7 @@ func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool { return true } gut, err := Check(fd, job.Size, job.HshValue[:], les, ctx.ShowPrgrs) - fd.Close() // #nosec G104 + fd.Close() if err != nil { ctx.LogE("checking", les, err, logMsg) return true diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go index da2aafd..9911395 100644 --- a/src/cmd/nncp-bundle/main.go +++ b/src/cmd/nncp-bundle/main.go @@ -221,7 +221,7 @@ func main() { if err == io.EOF { break } - bufStdin.Discard(bufStdin.Buffered() - (len(nncp.NNCPBundlePrefix) - 1)) // #nosec G104 + bufStdin.Discard(bufStdin.Buffered() - (len(nncp.NNCPBundlePrefix) - 1)) continue } if _, err = bufStdin.Discard(prefixIdx); err != nil { diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go index 7c41ee0..1516d23 100644 --- a/src/cmd/nncp-cfgenc/main.go +++ b/src/cmd/nncp-cfgenc/main.go @@ -96,7 +96,7 @@ func main() { return } - os.Stderr.WriteString("Passphrase:") // #nosec G104 + os.Stderr.WriteString("Passphrase:") password1, err := term.ReadPassword(0) if err != nil { log.Fatalln(err) @@ -106,15 +106,15 @@ func main() { if err != nil { log.Fatalln(err) } - os.Stdout.Write(cfgRaw) // #nosec G104 + os.Stdout.Write(cfgRaw) return } - os.Stderr.WriteString("\nRepeat passphrase:") // #nosec G104 + os.Stderr.WriteString("\nRepeat passphrase:") password2, err := term.ReadPassword(0) if err != nil { log.Fatalln(err) } - os.Stderr.WriteString("\n") // #nosec G104 + os.Stderr.WriteString("\n") if bytes.Compare(password1, password2) != 0 { log.Fatalln(errors.New("Passphrases do not match")) } @@ -122,5 +122,5 @@ func main() { if err != nil { log.Fatalln(err) } - os.Stdout.Write(eblob) // #nosec G104 + os.Stdout.Write(eblob) } diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go index 485199c..266fc7a 100644 --- a/src/cmd/nncp-daemon/main.go +++ b/src/cmd/nncp-daemon/main.go @@ -168,7 +168,7 @@ func main() { ctx.Umask() if *ucspi { - os.Stderr.Close() // #nosec G104 + os.Stderr.Close() conn := &nncp.UCSPIConn{R: os.Stdin, W: os.Stdout} nodeIdC := make(chan *nncp.NodeId) addr := nncp.UCSPITCPRemoteAddr() @@ -196,7 +196,7 @@ func main() { close(autoTossFinish) <-autoTossBadCode } - conn.Close() // #nosec G104 + conn.Close() return } @@ -262,7 +262,7 @@ func main() { close(autoTossFinish) <-autoTossBadCode } - conn.Close() // #nosec G104 + conn.Close() }(conn) } } diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go index d7774c9..a1ee4a3 100644 --- a/src/cmd/nncp-reass/main.go +++ b/src/cmd/nncp-reass/main.go @@ -66,7 +66,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo }) return false } - fd.Close() // #nosec G104 + fd.Close() if metaPkt.Magic == nncp.MagicNNCPMv1.B { ctx.LogE("reass", les, nncp.MagicNNCPMv1.TooOld(), logMsg) return false @@ -163,7 +163,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo ); err != nil { log.Fatalln(err) } - fd.Close() // #nosec G104 + fd.Close() if bytes.Compare(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) != 0 { ctx.LogE( "reass-chunk", @@ -219,7 +219,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo ); err != nil { log.Fatalln(err) } - fd.Close() // #nosec G104 + fd.Close() if !keep { if err = os.Remove(chunkPath); err != nil { ctx.LogE( @@ -298,7 +298,7 @@ func findMetas(ctx *nncp.Ctx, dirPath string) []string { return nil } fis, err := dir.Readdir(0) - dir.Close() // #nosec G104 + dir.Close() if err != nil { ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg) return nil diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go index 0acba4b..fb7a0e0 100644 --- a/src/cmd/nncp-xfer/main.go +++ b/src/cmd/nncp-xfer/main.go @@ -141,7 +141,7 @@ func main() { 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" @@ -185,7 +185,7 @@ func main() { 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" @@ -241,14 +241,14 @@ func main() { return logMsg(les) + ": not valid packet: " + err.Error() }, ) - fd.Close() // #nosec G104 + 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()}) @@ -261,7 +261,7 @@ func main() { } 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 { @@ -279,7 +279,7 @@ func main() { } if err != nil { ctx.LogE("xfer-rx", les, err, logMsg) - w.CloseWithError(err) // #nosec G104 + w.CloseWithError(err) } }() if _, err = nncp.CopyProgressed( @@ -294,7 +294,7 @@ func main() { ctx.LogE("xfer-rx", les, err, logMsg) isBad = true } - fd.Close() // #nosec G104 + fd.Close() if isBad { tmp.Cancel() continue @@ -446,7 +446,7 @@ Tx: 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 } @@ -456,17 +456,17 @@ Tx: 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" }) @@ -474,7 +474,7 @@ Tx: continue } if err = tmp.Sync(); err != nil { - tmp.Close() // #nosec G104 + tmp.Close() ctx.LogE("xfer-tx-sync", les, err, func(les nncp.LEs) string { return logMsg(les) + ": syncing" }) @@ -500,7 +500,7 @@ Tx: 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", diff --git a/src/jobs.go b/src/jobs.go index 6e42877..6f18f51 100644 --- a/src/jobs.go +++ b/src/jobs.go @@ -99,7 +99,7 @@ func (ctx *Ctx) jobsFind(nodeId *NodeId, xx TRxTx, nock, part bool) chan Job { return } fis, err := dir.Readdir(0) - dir.Close() // #nosec G104 + dir.Close() if err != nil { return } diff --git a/src/lockdir.go b/src/lockdir.go index 902ec22..e94117b 100644 --- a/src/lockdir.go +++ b/src/lockdir.go @@ -45,7 +45,7 @@ func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) { ctx.LogE("lockdir-flock", LEs{{"Path", lockPath}}, err, func(les LEs) string { return "Locking directory: locking " + lockPath }) - dirLock.Close() // #nosec G104 + dirLock.Close() return nil, err } return dirLock, nil @@ -53,7 +53,7 @@ func (ctx *Ctx) LockDir(nodeId *NodeId, lockCtx string) (*os.File, error) { func (ctx *Ctx) UnlockDir(fd *os.File) { if fd != nil { - unix.Flock(int(fd.Fd()), unix.LOCK_UN) // #nosec G104 - fd.Close() // #nosec G104 + unix.Flock(int(fd.Fd()), unix.LOCK_UN) + fd.Close() } } diff --git a/src/log.go b/src/log.go index 9a8d2e7..78f9acc 100644 --- a/src/log.go +++ b/src/log.go @@ -98,8 +98,8 @@ func (ctx *Ctx) Log(rec string) { fmt.Fprintln(os.Stderr, "Can not open log:", err) return } - fd.WriteString(rec) // #nosec G104 - fd.Close() // #nosec G104 + fd.WriteString(rec) + fd.Close() } func (ctx *Ctx) LogD(who string, les LEs, msg func(LEs) string) { diff --git a/src/pipe.go b/src/pipe.go index ef25a91..35c4871 100644 --- a/src/pipe.go +++ b/src/pipe.go @@ -69,7 +69,7 @@ func (c PipeConn) Close() (err error) { err = c.w.Close() go c.cmd.Wait() time.AfterFunc(time.Duration(10*time.Second), func() { - c.cmd.Process.Kill() // #nosec G104 + c.cmd.Process.Kill() }) return } diff --git a/src/sp.go b/src/sp.go index 66fa037..099aa47 100644 --- a/src/sp.go +++ b/src/sp.go @@ -438,7 +438,7 @@ func (state *SPState) StartI(conn ConnDeadlined) error { NicenessFmt(state.Nice), ) }) - conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104 + conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) if err = state.WriteSP(conn, buf, false); err != nil { state.Ctx.LogE("sp-startI", les, err, func(les LEs) string { return fmt.Sprintf( @@ -457,7 +457,7 @@ func (state *SPState) StartI(conn ConnDeadlined) error { NicenessFmt(state.Nice), ) }) - conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104 + conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) if buf, err = state.ReadSP(conn); err != nil { state.Ctx.LogE("sp-startI-read", les, err, func(les LEs) string { return fmt.Sprintf( @@ -537,7 +537,7 @@ func (state *SPState) StartR(conn ConnDeadlined) error { } les := LEs{{"Nice", int(state.Nice)}} state.Ctx.LogD("sp-startR", les, logMsg) - conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104 + conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) if buf, err = state.ReadSP(conn); err != nil { state.Ctx.LogE("sp-startR-read", les, err, logMsg) return err @@ -611,7 +611,7 @@ func (state *SPState) StartR(conn ConnDeadlined) error { state.dirUnlock() return err } - conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104 + conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) if err = state.WriteSP(conn, buf, false); err != nil { state.Ctx.LogE("sp-startR-write", les, err, func(les LEs) string { return fmt.Sprintf( @@ -752,7 +752,7 @@ func (state *SPState) StartWorkers( break Deadlined: state.SetDead() - conn.Close() // #nosec G104 + conn.Close() case now := <-pingTicker.C: if now.After(state.TxLastSeen.Add(PingTimeout)) { state.wg.Add(1) @@ -986,7 +986,7 @@ func (state *SPState) StartWorkers( ) } state.Ctx.LogD("sp-sending", append(les, LE{"Size", int64(len(payload))}), logMsg) - conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104 + conn.SetWriteDeadline(time.Now().Add(DefaultDeadline)) ct, err := state.csOur.Encrypt(nil, nil, payload) if err != nil { state.Ctx.LogE("sp-encrypting", les, err, logMsg) @@ -1013,7 +1013,7 @@ func (state *SPState) StartWorkers( ) } state.Ctx.LogD("sp-recv-wait", les, logMsg) - conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) // #nosec G104 + conn.SetReadDeadline(time.Now().Add(DefaultDeadline)) payload, err := state.ReadSP(conn) if err != nil { if err == io.EOF { @@ -1087,7 +1087,7 @@ func (state *SPState) StartWorkers( state.SetDead() state.wg.Done() state.SetDead() - conn.Close() // #nosec G104 + conn.Close() }() return nil diff --git a/src/tmp.go b/src/tmp.go index a1ef2e8..7b9ded1 100644 --- a/src/tmp.go +++ b/src/tmp.go @@ -71,9 +71,9 @@ func (ctx *Ctx) NewTmpFileWHash() (*TmpFileWHash, error) { } func (tmp *TmpFileWHash) Cancel() { - tmp.Fd.Truncate(0) // #nosec G104 - tmp.Fd.Close() // #nosec G104 - os.Remove(tmp.Fd.Name()) // #nosec G104 + tmp.Fd.Truncate(0) + tmp.Fd.Close() + os.Remove(tmp.Fd.Name()) } func DirSync(dirPath string) error { @@ -83,7 +83,7 @@ func DirSync(dirPath string) error { } err = fd.Sync() if err != nil { - fd.Close() // #nosec G104 + fd.Close() return err } return fd.Close() @@ -99,11 +99,11 @@ func (tmp *TmpFileWHash) Commit(dir string) error { return err } if err = tmp.W.Flush(); err != nil { - tmp.Fd.Close() // #nosec G104 + tmp.Fd.Close() return err } if err = tmp.Fd.Sync(); err != nil { - tmp.Fd.Close() // #nosec G104 + tmp.Fd.Close() return err } if err = tmp.Fd.Close(); err != nil { diff --git a/src/toss.go b/src/toss.go index 21d3007..a398649 100644 --- a/src/toss.go +++ b/src/toss.go @@ -309,7 +309,7 @@ func jobProcess( return err } if err = bufW.Flush(); err != nil { - tmp.Close() // #nosec G104 + tmp.Close() ctx.LogE("rx-flush", les, err, func(les LEs) string { return fmt.Sprintf( "Tossing file %s/%s (%s): %s: flushing", @@ -320,7 +320,7 @@ func jobProcess( return err } if err = tmp.Sync(); err != nil { - tmp.Close() // #nosec G104 + tmp.Close() ctx.LogE("rx-sync", les, err, func(les LEs) string { return fmt.Sprintf( "Tossing file %s/%s (%s): %s: syncing", diff --git a/src/tx.go b/src/tx.go index a3f44fe..337bcfd 100644 --- a/src/tx.go +++ b/src/tx.go @@ -116,7 +116,7 @@ func (ctx *Ctx) Tx( ) pktEncRaws <- pktEncRaw errs <- err - dst.Close() // #nosec G104 + dst.Close() }(curSize, src, pipeW) curSize = PktEncOverhead + PktSizeOverhead + sizeWithTags(PktOverhead+curSize) curSize += padSize @@ -142,7 +142,7 @@ func (ctx *Ctx) Tx( ) pktEncRaws <- pktEncRaw errs <- err - dst.Close() // #nosec G104 + dst.Close() }(curSize, padSize, src, pipeW) curSize = PktEncOverhead + PktSizeOverhead + sizeWithTags(PktOverhead+curSize) curSize += padSize @@ -170,7 +170,7 @@ func (ctx *Ctx) Tx( ) pktEncRaws <- pktEncRaw errs <- err - dst.Close() // #nosec G104 + dst.Close() }(curSize, pipeRPrev, pipeW) curSize = PktEncOverhead + PktSizeOverhead + sizeWithTags(PktOverhead+curSize) } @@ -197,7 +197,7 @@ func (ctx *Ctx) Tx( pktEncRaw, err := PktEncWrite(ctx.Self, node, pkt, nice, size, 0, src, dst) pktEncRaws <- pktEncRaw errs <- err - dst.Close() // #nosec G104 + dst.Close() }(hops[i], pktTrns, curSize, pipeRPrev, pipeW) curSize = PktEncOverhead + PktSizeOverhead + sizeWithTags(PktOverhead+curSize) } @@ -220,13 +220,13 @@ func (ctx *Ctx) Tx( for i := 0; i <= wrappers; i++ { err = <-errs if err != nil { - tmp.Fd.Close() // #nosec G104 + tmp.Fd.Close() return nil, err } } nodePath := filepath.Join(ctx.Spool, lastNode.Id.String()) err = tmp.Commit(filepath.Join(nodePath, string(TTx))) - os.Symlink(nodePath, filepath.Join(ctx.Spool, lastNode.Name)) // #nosec G104 + os.Symlink(nodePath, filepath.Join(ctx.Spool, lastNode.Name)) if err != nil { return lastNode, err } @@ -288,7 +288,7 @@ func throughTmpFile(r io.Reader) ( rerr = err return } - os.Remove(src.Name()) // #nosec G104 + os.Remove(src.Name()) tmpW := bufio.NewWriter(src) tmpKey := make([]byte, chacha20poly1305.KeySize) if _, rerr = rand.Read(tmpKey[:]); rerr != nil { @@ -320,7 +320,7 @@ func throughTmpFile(r io.Reader) ( nonce[i] = 0 } if _, err := aeadProcess(aead, nonce, nil, false, bufio.NewReader(src), w); err != nil { - w.CloseWithError(err) // #nosec G104 + w.CloseWithError(err) } }() reader = r @@ -439,14 +439,14 @@ func prepareTxFile(srcPath string) ( } fd, err := os.Open(e.path) if err != nil { - fd.Close() // #nosec G104 + fd.Close() return w.CloseWithError(err) } if _, err = io.Copy(tarWr, bufio.NewReader(fd)); err != nil { - fd.Close() // #nosec G104 + fd.Close() return w.CloseWithError(err) } - fd.Close() // #nosec G104 + fd.Close() } if err = tarWr.Close(); err != nil { return w.CloseWithError(err) @@ -706,7 +706,7 @@ func (ctx *Ctx) TxExec( return err } if _, err = io.Copy(compressor, in); err != nil { - compressor.Close() // #nosec G104 + compressor.Close() return err } if err = compressor.Close(); err != nil { @@ -733,7 +733,7 @@ func (ctx *Ctx) TxExec( go func() { _, err := io.Copy(compressor, in) if err != nil { - compressor.Close() // #nosec G104 + compressor.Close() copyErr <- err } err = compressor.Close() @@ -828,6 +828,6 @@ func (ctx *Ctx) TxTrns(node *Node, nice uint8, size int64, src io.Reader) error } else { ctx.LogI("tx", append(les, LE{"Err", err}), logMsg) } - os.Symlink(nodePath, filepath.Join(ctx.Spool, node.Name)) // #nosec G104 + os.Symlink(nodePath, filepath.Join(ctx.Spool, node.Name)) return err } -- 2.44.0