]> Cypherpunks.ru repositories - nncp.git/blobdiff - src/toss.go
Do not keep files opened
[nncp.git] / src / toss.go
index 6abf278af8ab18cc61e785a80fb0c5565890bcca..9916cc6f11596bf2c47646fdd0d0ca0c59a7715d 100644 (file)
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-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
@@ -33,6 +33,7 @@ import (
        "path/filepath"
        "strconv"
        "strings"
+       "time"
 
        xdr "github.com/davecgh/go-xdr/xdr2"
        "github.com/dustin/go-humanize"
@@ -68,6 +69,12 @@ func (ctx *Ctx) Toss(
        nice uint8,
        dryRun, doSeen, noFile, noFreq, noExec, noTrns bool,
 ) bool {
+       dirLock, err := ctx.LockDir(nodeId, "toss")
+       if err != nil {
+               ctx.LogE("rx", LEs{}, err, "lock")
+               return false
+       }
+       defer ctx.UnlockDir(dirLock)
        isBad := false
        sendmail := ctx.Neigh[*ctx.SelfId].Exec["sendmail"]
        decompressor, err := zstd.NewReader(nil)
@@ -76,36 +83,37 @@ func (ctx *Ctx) Toss(
        }
        defer decompressor.Close()
        for job := range ctx.Jobs(nodeId, TRx) {
-               pktName := filepath.Base(job.Fd.Name())
-               sds := SDS{"node": job.PktEnc.Sender, "pkt": pktName}
+               pktName := filepath.Base(job.Path)
+               les := LEs{{"Node", job.PktEnc.Sender}, {"Pkt", pktName}}
                if job.PktEnc.Nice > nice {
-                       ctx.LogD("rx", SdsAdd(sds, SDS{"nice": int(job.PktEnc.Nice)}), "too nice")
+                       ctx.LogD("rx", append(les, LE{"Nice", int(job.PktEnc.Nice)}), "too nice")
+                       continue
+               }
+               fd, err := os.Open(job.Path)
+               if err != nil {
+                       ctx.LogE("rx", les, err, "open")
+                       isBad = true
                        continue
                }
+
                pipeR, pipeW := io.Pipe()
-               errs := make(chan error, 1)
-               go func(job Job) {
+               go func(job Job) error {
                        pipeWB := bufio.NewWriter(pipeW)
-                       _, _, err := PktEncRead(
-                               ctx.Self,
-                               ctx.Neigh,
-                               bufio.NewReader(job.Fd),
-                               pipeWB,
-                       )
-                       errs <- err
-                       pipeWB.Flush()
-                       pipeW.Close()
-                       job.Fd.Close()
+                       _, _, err := PktEncRead(ctx.Self, ctx.Neigh, bufio.NewReader(fd), pipeWB)
+                       fd.Close() // #nosec G104
                        if err != nil {
-                               ctx.LogE("rx", sds, err, "decryption")
+                               return pipeW.CloseWithError(err)
                        }
+                       if err = pipeWB.Flush(); err != nil {
+                               return pipeW.CloseWithError(err)
+                       }
+                       return pipeW.Close()
                }(job)
                var pkt Pkt
-               var err error
                var pktSize int64
                var pktSizeBlocks int64
                if _, err = xdr.Unmarshal(pipeR, &pkt); err != nil {
-                       ctx.LogE("rx", sds, err, "unmarshal")
+                       ctx.LogE("rx", les, err, "unmarshal")
                        isBad = true
                        goto Closing
                }
@@ -115,10 +123,10 @@ func (ctx *Ctx) Toss(
                        pktSize -= poly1305.TagSize
                }
                pktSize -= pktSizeBlocks * poly1305.TagSize
-               sds["size"] = pktSize
-               ctx.LogD("rx", sds, "taken")
+               les = append(les, LE{"Size", pktSize})
+               ctx.LogD("rx", les, "taken")
                switch pkt.Type {
-               case PktTypeExec:
+               case PktTypeExec, PktTypeExecFat:
                        if noExec {
                                goto Closing
                        }
@@ -129,24 +137,26 @@ func (ctx *Ctx) Toss(
                                args = append(args, string(p))
                        }
                        argsStr := strings.Join(append([]string{handle}, args...), " ")
-                       sds := SdsAdd(sds, SDS{
-                               "type": "exec",
-                               "dst":  argsStr,
-                       })
+                       les = append(les, LEs{
+                               {"Type", "exec"},
+                               {"Dst", argsStr},
+                       }...)
                        sender := ctx.Neigh[*job.PktEnc.Sender]
                        cmdline, exists := sender.Exec[handle]
                        if !exists || len(cmdline) == 0 {
-                               ctx.LogE("rx", sds, errors.New("No handle found"), "")
+                               ctx.LogE("rx", les, errors.New("No handle found"), "")
                                isBad = true
                                goto Closing
                        }
-                       if err = decompressor.Reset(pipeR); err != nil {
-                               log.Fatalln(err)
+                       if pkt.Type == PktTypeExec {
+                               if err = decompressor.Reset(pipeR); err != nil {
+                                       log.Fatalln(err)
+                               }
                        }
                        if !dryRun {
                                cmd := exec.Command(
                                        cmdline[0],
-                                       append(cmdline[1:len(cmdline)], args...)...,
+                                       append(cmdline[1:], args...)...,
                                )
                                cmd.Env = append(
                                        cmd.Env,
@@ -154,10 +164,14 @@ func (ctx *Ctx) Toss(
                                        "NNCP_SENDER="+sender.Id.String(),
                                        "NNCP_NICE="+strconv.Itoa(int(pkt.Nice)),
                                )
-                               cmd.Stdin = decompressor
+                               if pkt.Type == PktTypeExec {
+                                       cmd.Stdin = decompressor
+                               } else {
+                                       cmd.Stdin = pipeR
+                               }
                                output, err := cmd.Output()
                                if err != nil {
-                                       ctx.LogE("rx", sds, err, "handle")
+                                       ctx.LogE("rx", les, err, "handle")
                                        isBad = true
                                        goto Closing
                                }
@@ -169,24 +183,26 @@ func (ctx *Ctx) Toss(
                                        if exists {
                                                cmd := exec.Command(
                                                        sendmail[0],
-                                                       append(sendmail[1:len(sendmail)], notify.To)...,
+                                                       append(sendmail[1:], notify.To)...,
                                                )
                                                cmd.Stdin = newNotification(notify, fmt.Sprintf(
                                                        "Exec from %s: %s", sender.Name, argsStr,
                                                ), output)
-                                               cmd.Run()
+                                               if err = cmd.Run(); err != nil {
+                                                       ctx.LogE("rx", les, err, "notify")
+                                               }
                                        }
                                }
                        }
-                       ctx.LogI("rx", sds, "")
+                       ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
-                                               fd.Close()
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
+                                               fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
-                                       ctx.LogE("rx", sds, err, "remove")
+                               if err = os.Remove(job.Path); err != nil {
+                                       ctx.LogE("rx", les, err, "remove")
                                        isBad = true
                                }
                        }
@@ -195,57 +211,60 @@ func (ctx *Ctx) Toss(
                                goto Closing
                        }
                        dst := string(pkt.Path[:int(pkt.PathLen)])
-                       sds := SdsAdd(sds, SDS{"type": "file", "dst": dst})
+                       les = append(les, LEs{{"Type", "file"}, {"Dst", dst}}...)
                        if filepath.IsAbs(dst) {
-                               ctx.LogE("rx", sds, errors.New("non-relative destination path"), "")
+                               ctx.LogE("rx", les, errors.New("non-relative destination path"), "")
                                isBad = true
                                goto Closing
                        }
                        incoming := ctx.Neigh[*job.PktEnc.Sender].Incoming
                        if incoming == nil {
-                               ctx.LogE("rx", sds, errors.New("incoming is not allowed"), "")
+                               ctx.LogE("rx", les, errors.New("incoming is not allowed"), "")
                                isBad = true
                                goto Closing
                        }
                        dir := filepath.Join(*incoming, path.Dir(dst))
                        if err = os.MkdirAll(dir, os.FileMode(0777)); err != nil {
-                               ctx.LogE("rx", sds, err, "mkdir")
+                               ctx.LogE("rx", les, err, "mkdir")
                                isBad = true
                                goto Closing
                        }
                        if !dryRun {
                                tmp, err := TempFile(dir, "file")
                                if err != nil {
-                                       ctx.LogE("rx", sds, err, "mktemp")
+                                       ctx.LogE("rx", les, err, "mktemp")
                                        isBad = true
                                        goto Closing
                                }
-                               sds["tmp"] = tmp.Name()
-                               ctx.LogD("rx", sds, "created")
+                               les = append(les, LE{"Tmp", tmp.Name()})
+                               ctx.LogD("rx", les, "created")
                                bufW := bufio.NewWriter(tmp)
                                if _, err = CopyProgressed(
-                                       bufW,
-                                       pipeR,
-                                       SdsAdd(sds, SDS{"fullsize": sds["size"]}),
+                                       bufW, pipeR, "Rx file",
+                                       append(les, LE{"FullSize", pktSize}),
                                        ctx.ShowPrgrs,
                                ); err != nil {
-                                       ctx.LogE("rx", sds, err, "copy")
+                                       ctx.LogE("rx", les, err, "copy")
                                        isBad = true
                                        goto Closing
                                }
                                if err = bufW.Flush(); err != nil {
-                                       tmp.Close()
-                                       ctx.LogE("rx", sds, err, "copy")
+                                       tmp.Close() // #nosec G104
+                                       ctx.LogE("rx", les, err, "copy")
                                        isBad = true
                                        goto Closing
                                }
                                if err = tmp.Sync(); err != nil {
-                                       tmp.Close()
-                                       ctx.LogE("rx", sds, err, "copy")
+                                       tmp.Close() // #nosec G104
+                                       ctx.LogE("rx", les, err, "copy")
+                                       isBad = true
+                                       goto Closing
+                               }
+                               if err = tmp.Close(); err != nil {
+                                       ctx.LogE("rx", les, err, "copy")
                                        isBad = true
                                        goto Closing
                                }
-                               tmp.Close()
                                dstPathOrig := filepath.Join(*incoming, dst)
                                dstPath := dstPathOrig
                                dstPathCtr := 0
@@ -254,7 +273,7 @@ func (ctx *Ctx) Toss(
                                                if os.IsNotExist(err) {
                                                        break
                                                }
-                                               ctx.LogE("rx", sds, err, "stat")
+                                               ctx.LogE("rx", les, err, "stat")
                                                isBad = true
                                                goto Closing
                                        }
@@ -262,30 +281,30 @@ func (ctx *Ctx) Toss(
                                        dstPathCtr++
                                }
                                if err = os.Rename(tmp.Name(), dstPath); err != nil {
-                                       ctx.LogE("rx", sds, err, "rename")
+                                       ctx.LogE("rx", les, err, "rename")
                                        isBad = true
                                }
                                if err = DirSync(*incoming); err != nil {
-                                       ctx.LogE("rx", sds, err, "sync")
+                                       ctx.LogE("rx", les, err, "sync")
                                        isBad = true
                                }
-                               delete(sds, "tmp")
+                               les = les[:len(les)-1] // delete Tmp
                        }
-                       ctx.LogI("rx", sds, "")
+                       ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
-                                               fd.Close()
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
+                                               fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
-                                       ctx.LogE("rx", sds, err, "remove")
+                               if err = os.Remove(job.Path); err != nil {
+                                       ctx.LogE("rx", les, err, "remove")
                                        isBad = true
                                }
                                if len(sendmail) > 0 && ctx.NotifyFile != nil {
                                        cmd := exec.Command(
                                                sendmail[0],
-                                               append(sendmail[1:len(sendmail)], ctx.NotifyFile.To)...,
+                                               append(sendmail[1:], ctx.NotifyFile.To)...,
                                        )
                                        cmd.Stdin = newNotification(ctx.NotifyFile, fmt.Sprintf(
                                                "File from %s: %s (%s)",
@@ -293,7 +312,9 @@ func (ctx *Ctx) Toss(
                                                dst,
                                                humanize.IBytes(uint64(pktSize)),
                                        ), nil)
-                                       cmd.Run()
+                                       if err = cmd.Run(); err != nil {
+                                               ctx.LogE("rx", les, err, "notify")
+                                       }
                                }
                        }
                case PktTypeFreq:
@@ -302,23 +323,23 @@ func (ctx *Ctx) Toss(
                        }
                        src := string(pkt.Path[:int(pkt.PathLen)])
                        if filepath.IsAbs(src) {
-                               ctx.LogE("rx", sds, errors.New("non-relative source path"), "")
+                               ctx.LogE("rx", les, errors.New("non-relative source path"), "")
                                isBad = true
                                goto Closing
                        }
-                       sds := SdsAdd(sds, SDS{"type": "freq", "src": src})
+                       les := append(les, LEs{{"Type", "freq"}, {"Src", src}}...)
                        dstRaw, err := ioutil.ReadAll(pipeR)
                        if err != nil {
-                               ctx.LogE("rx", sds, err, "read")
+                               ctx.LogE("rx", les, err, "read")
                                isBad = true
                                goto Closing
                        }
                        dst := string(dstRaw)
-                       sds["dst"] = dst
+                       les = append(les, LE{"Dst", dst})
                        sender := ctx.Neigh[*job.PktEnc.Sender]
                        freqPath := sender.FreqPath
                        if freqPath == nil {
-                               ctx.LogE("rx", sds, errors.New("freqing is not allowed"), "")
+                               ctx.LogE("rx", les, errors.New("freqing is not allowed"), "")
                                isBad = true
                                goto Closing
                        }
@@ -333,31 +354,33 @@ func (ctx *Ctx) Toss(
                                        sender.FreqMaxSize,
                                )
                                if err != nil {
-                                       ctx.LogE("rx", sds, err, "tx file")
+                                       ctx.LogE("rx", les, err, "tx file")
                                        isBad = true
                                        goto Closing
                                }
                        }
-                       ctx.LogI("rx", sds, "")
+                       ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
-                                               fd.Close()
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
+                                               fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
-                                       ctx.LogE("rx", sds, err, "remove")
+                               if err = os.Remove(job.Path); err != nil {
+                                       ctx.LogE("rx", les, err, "remove")
                                        isBad = true
                                }
                                if len(sendmail) > 0 && ctx.NotifyFreq != nil {
                                        cmd := exec.Command(
                                                sendmail[0],
-                                               append(sendmail[1:len(sendmail)], ctx.NotifyFreq.To)...,
+                                               append(sendmail[1:], ctx.NotifyFreq.To)...,
                                        )
                                        cmd.Stdin = newNotification(ctx.NotifyFreq, fmt.Sprintf(
                                                "Freq from %s: %s", sender.Name, src,
                                        ), nil)
-                                       cmd.Run()
+                                       if err = cmd.Run(); err != nil {
+                                               ctx.LogE("rx", les, err, "notify")
+                                       }
                                }
                        }
                case PktTypeTrns:
@@ -368,38 +391,61 @@ func (ctx *Ctx) Toss(
                        copy(dst[:], pkt.Path[:int(pkt.PathLen)])
                        nodeId := NodeId(*dst)
                        node, known := ctx.Neigh[nodeId]
-                       sds := SdsAdd(sds, SDS{"type": "trns", "dst": nodeId})
+                       les := append(les, LEs{{"Type", "trns"}, {"Dst", nodeId}}...)
                        if !known {
-                               ctx.LogE("rx", sds, errors.New("unknown node"), "")
+                               ctx.LogE("rx", les, errors.New("unknown node"), "")
                                isBad = true
                                goto Closing
                        }
-                       ctx.LogD("rx", sds, "taken")
+                       ctx.LogD("rx", les, "taken")
                        if !dryRun {
                                if err = ctx.TxTrns(node, job.PktEnc.Nice, pktSize, pipeR); err != nil {
-                                       ctx.LogE("rx", sds, err, "tx trns")
+                                       ctx.LogE("rx", les, err, "tx trns")
                                        isBad = true
                                        goto Closing
                                }
                        }
-                       ctx.LogI("rx", sds, "")
+                       ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
-                                               fd.Close()
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
+                                               fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
-                                       ctx.LogE("rx", sds, err, "remove")
+                               if err = os.Remove(job.Path); err != nil {
+                                       ctx.LogE("rx", les, err, "remove")
                                        isBad = true
                                }
                        }
                default:
-                       ctx.LogE("rx", sds, errors.New("unknown type"), "")
+                       ctx.LogE("rx", les, errors.New("unknown type"), "")
                        isBad = true
                }
        Closing:
-               pipeR.Close()
+               pipeR.Close() // #nosec G104
        }
        return isBad
 }
+
+func (ctx *Ctx) AutoToss(
+       nodeId *NodeId,
+       nice uint8,
+       doSeen, noFile, noFreq, noExec, noTrns bool,
+) (chan struct{}, chan bool) {
+       finish := make(chan struct{})
+       badCode := make(chan bool)
+       go func() {
+               bad := false
+               for {
+                       select {
+                       case <-finish:
+                               badCode <- bad
+                               break
+                       default:
+                       }
+                       time.Sleep(time.Second)
+                       bad = !ctx.Toss(nodeId, nice, false, doSeen, noFile, noFreq, noExec, noTrns)
+               }
+       }()
+       return finish, badCode
+}