Replace Twofish/HKDF with ChaCha20/BLAKE2X for speed and simplicity

[nncp.git] / src / cypherpunks.ru / nncp / cfg.go

diff --git a/src/cypherpunks.ru/nncp/cfg.go b/src/cypherpunks.ru/nncp/cfg.go
index c05a6a7c90424999c139f474d8a789f8456d4d04..d948a274086438719aa6e09ae36c08f27405c93a 100644 (file)
--- a/src/cypherpunks.ru/nncp/cfg.go
+++ b/src/cypherpunks.ru/nncp/cfg.go
@@ -19,17 +19,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package nncp
 
 import (
+       "bytes"
        "errors"
+       "log"
        "os"
        "path"
 
        "github.com/gorhill/cronexpr"
        "golang.org/x/crypto/ed25519"
+       "golang.org/x/crypto/ssh/terminal"
        "gopkg.in/yaml.v2"
 )
 
 const (
-       CfgPathEnv = "NNCPCFG"
+       CfgPathEnv  = "NNCPCFG"
+       CfgSpoolEnv = "NNCPSPOOL"
+       CfgLogEnv   = "NNCPLOG"
 )
 
 var (
@@ -40,15 +45,17 @@ var (
 )
 
 type NodeYAML struct {
-       Id       string
-       ExchPub  string
-       SignPub  string
-       NoisePub *string `noisepub,omitempty`
-       Sendmail []string
-       Incoming *string    `incoming,omitempty`
-       Freq     *string    `freq,omitempty`
-       Via      []string   `via,omitempty`
-       Calls    []CallYAML `calls,omitempty`
+       Id          string
+       ExchPub     string
+       SignPub     string
+       NoisePub    *string    `noisepub,omitempty`
+       Sendmail    []string   `sendmail,omitempty`
+       Incoming    *string    `incoming,omitempty`
+       Freq        *string    `freq,omitempty`
+       FreqChunked *uint64    `freqchunked,omitempty`
+       FreqMinSize *uint64    `freqminsize,omitempty`
+       Via         []string   `via,omitempty`
+       Calls       []CallYAML `calls,omitempty`
 
        Addrs map[string]string `addrs,omitempty`
 
@@ -59,7 +66,7 @@ type NodeYAML struct {
 type CallYAML struct {
        Cron           string
        Nice           *int    `nice,omitempty`
-       Xx             *string `xx,omitempty`
+       Xx             string  `xx,omitempty`
        Addr           *string `addr,omitempty`
        OnlineDeadline *uint   `onlinedeadline,omitempty`
        MaxOnlineTime  *uint   `maxonlinetime,omitempty`
@@ -86,7 +93,7 @@ type NotifyYAML struct {
 }
 
 type CfgYAML struct {
-       Self  NodeOurYAML
+       Self  *NodeOurYAML `self,omitempty`
        Neigh map[string]NodeYAML
 
        Spool  string
@@ -144,6 +151,17 @@ func NewNode(name string, yml NodeYAML) (*Node, error) {
                }
                freq = &fr
        }
+       var freqChunked int64
+       if yml.FreqChunked != nil {
+               if *yml.FreqChunked == 0 {
+                       return nil, errors.New("freqchunked value must be greater than zero")
+               }
+               freqChunked = int64(*yml.FreqChunked) * 1024
+       }
+       var freqMinSize int64
+       if yml.FreqMinSize != nil {
+               freqMinSize = int64(*yml.FreqMinSize) * 1024
+       }
 
        defOnlineDeadline := uint(DefaultDeadline)
        if yml.OnlineDeadline != nil {
@@ -171,15 +189,14 @@ func NewNode(name string, yml NodeYAML) (*Node, error) {
                        nice = uint8(*callYml.Nice)
                }
                var xx TRxTx
-               if callYml.Xx != nil {
-                       switch *callYml.Xx {
-                       case "rx":
-                               xx = TRx
-                       case "tx":
-                               xx = TTx
-                       default:
-                               return nil, errors.New("xx field must be either \"rx\" or \"tx\"")
-                       }
+               switch callYml.Xx {
+               case "rx":
+                       xx = TRx
+               case "tx":
+                       xx = TTx
+               case "":
+               default:
+                       return nil, errors.New("xx field must be either \"rx\" or \"tx\"")
                }
                var addr *string
                if callYml.Addr != nil {
@@ -203,7 +220,7 @@ func NewNode(name string, yml NodeYAML) (*Node, error) {
                calls = append(calls, &Call{
                        Cron:           expr,
                        Nice:           nice,
-                       Xx:             &xx,
+                       Xx:             xx,
                        Addr:           addr,
                        OnlineDeadline: onlineDeadline,
                        MaxOnlineTime:  maxOnlineTime,
@@ -218,6 +235,8 @@ func NewNode(name string, yml NodeYAML) (*Node, error) {
                Sendmail:       yml.Sendmail,
                Incoming:       incoming,
                Freq:           freq,
+               FreqChunked:    freqChunked,
+               FreqMinSize:    freqMinSize,
                Calls:          calls,
                Addrs:          yml.Addrs,
                OnlineDeadline: defOnlineDeadline,
@@ -231,7 +250,7 @@ func NewNode(name string, yml NodeYAML) (*Node, error) {
        return &node, nil
 }
 
-func NewNodeOur(yml NodeOurYAML) (*NodeOur, error) {
+func NewNodeOur(yml *NodeOurYAML) (*NodeOur, error) {
        id, err := NodeIdFromString(yml.Id)
        if err != nil {
                return nil, err
@@ -319,14 +338,32 @@ func (nodeOur *NodeOur) ToYAML() string {
 }
 
 func CfgParse(data []byte) (*Ctx, error) {
+       var err error
+       if bytes.Compare(data[:8], MagicNNCPBv2[:]) == 0 {
+               os.Stderr.WriteString("Passphrase:")
+               password, err := terminal.ReadPassword(0)
+               if err != nil {
+                       log.Fatalln(err)
+               }
+               os.Stderr.WriteString("\n")
+               data, err = DeEBlob(data, password)
+               if err != nil {
+                       return nil, err
+               }
+       }
        var cfgYAML CfgYAML
-       err := yaml.Unmarshal(data, &cfgYAML)
-       if err != nil {
+       if err = yaml.Unmarshal(data, &cfgYAML); err != nil {
                return nil, err
        }
-       self, err := NewNodeOur(cfgYAML.Self)
-       if err != nil {
-               return nil, err
+       if _, exists := cfgYAML.Neigh["self"]; !exists {
+               return nil, errors.New("self neighbour missing")
+       }
+       var self *NodeOur
+       if cfgYAML.Self != nil {
+               self, err = NewNodeOur(cfgYAML.Self)
+               if err != nil {
+                       return nil, err
+               }
        }
        spoolPath := path.Clean(cfgYAML.Spool)
        if !path.IsAbs(spoolPath) {
@@ -364,6 +401,7 @@ func CfgParse(data []byte) (*Ctx, error) {
                ctx.Alias[name] = neigh.Id
                vias[*neigh.Id] = neighYAML.Via
        }
+       ctx.SelfId = ctx.Alias["self"]
        for neighId, viasRaw := range vias {
                for _, viaRaw := range viasRaw {
                        foundNodeId, err := ctx.FindNode(viaRaw)
@@ -378,11 +416,3 @@ func CfgParse(data []byte) (*Ctx, error) {
        }
        return &ctx, nil
 }
-
-func CfgPathFromEnv(cmdlineFlag *string) (p string) {
-       p = os.Getenv(CfgPathEnv)
-       if p == "" {
-               p = *cmdlineFlag
-       }
-       return
-}