Streamed NNCPE format

[nncp.git] / src / cmd / nncp-cfgnew / main.go

diff --git a/src/cmd/nncp-cfgnew/main.go b/src/cmd/nncp-cfgnew/main.go
index ebe603d1bd65b20cb598e8c968baf4f8937e3e6b..0ec00e91b2d0c65753e2e3fa9421814c02781316 100644 (file)
--- a/src/cmd/nncp-cfgnew/main.go
+++ b/src/cmd/nncp-cfgnew/main.go
@@ -19,11 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+       "crypto/rand"
+       "encoding/json"
        "flag"
        "fmt"
+       "log"
        "os"
 
-       "go.cypherpunks.ru/nncp/v6"
+       "github.com/hjson/hjson-go"
+       "golang.org/x/crypto/blake2b"
+       "golang.org/x/crypto/nacl/box"
+
+       "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -34,10 +41,12 @@ func usage() {
 
 func main() {
        var (
+               areaName   = flag.String("area", "", "Generate area's keypairs")
                noComments = flag.Bool("nocomments", false, "Do not include descriptive comments")
                version    = flag.Bool("version", false, "Print version information")
                warranty   = flag.Bool("warranty", false, "Print warranty information")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -48,9 +57,75 @@ func main() {
                fmt.Println(nncp.VersionGet())
                return
        }
+       if *areaName != "" {
+               pub, prv, err := box.GenerateKey(rand.Reader)
+               if err != nil {
+                       log.Fatalln(err)
+               }
+               areaId := nncp.AreaId(blake2b.Sum256(pub[:]))
+               var cfgRaw string
+               if *noComments {
+                       cfgRaw = fmt.Sprintf(`areas: {
+  %s: {
+    id: %s
+    # KEEP AWAY keypair from the nodes you want only participate in multicast
+    pub: %s
+    prv: %s
+  }
+}`,
+                               *areaName,
+                               areaId.String(),
+                               nncp.Base32Codec.EncodeToString(pub[:]),
+                               nncp.Base32Codec.EncodeToString(prv[:]),
+                       )
+               } else {
+                       cfgRaw = fmt.Sprintf(`areas: {
+  %s: {
+    id: %s
+
+    # KEEP AWAY keypair from the nodes you want only participate in multicast
+    pub: %s
+    prv: %s
+
+    # List of subscribers you should multicast area messages to
+    # subs: ["alice"]
+
+    # Allow incoming files (from the area) saving in that directory
+    # incoming: /home/areas/%s/incoming
+
+    # Allow incoming area commands execution
+    # exec: {sendmail: ["%s"]}
+
+    # Allow unknown sender's message tossing (relaying will be made anyway)
+    # allow-unknown: true
+  }
+}`,
+                               *areaName,
+                               areaId.String(),
+                               nncp.Base32Codec.EncodeToString(pub[:]),
+                               nncp.Base32Codec.EncodeToString(prv[:]),
+                               *areaName,
+                               nncp.DefaultSendmailPath,
+                       )
+               }
+               var cfgGeneral map[string]interface{}
+               if err = hjson.Unmarshal([]byte(cfgRaw), &cfgGeneral); err != nil {
+                       panic(err)
+               }
+               marshaled, err := json.Marshal(cfgGeneral)
+               if err != nil {
+                       panic(err)
+               }
+               var areas map[string]nncp.AreaJSON
+               if err = json.Unmarshal(marshaled, &areas); err != nil {
+                       panic(err)
+               }
+               fmt.Println(cfgRaw)
+               return
+       }
        nodeOur, err := nncp.NewNodeGenerate()
        if err != nil {
-               panic(err)
+               log.Fatalln(err)
        }
        var cfgRaw string
        if *noComments {
@@ -104,9 +179,15 @@ func main() {
   # umask: "022"
   # Omit progress showing by default
   # noprogress: true
-  # Do not use .hdr files
+  # Do not use hdr/ files
   # nohdr: true
 
+  # MultiCast Discovery:
+  # List of interfaces where to listen for MCD announcements
+  # mcd-listen: ["em0", "igb1"]
+  # Interfaces and intervals (in seconds) where to send MCD announcements
+  # mcd-send: {em0: 60, igb1: 5}
+
   # Enable notification email sending
   # notify: {
   #   file: {
@@ -214,6 +295,7 @@ func main() {
     #   #     addr: lan
     #   #     when-tx-exists: true
     #   #     nock: true
+    #   #     mcd-ignore: true
     #   #
     #   #     autotoss: false
     #   #     autotoss-doseen: true
@@ -221,7 +303,7 @@ func main() {
     #   #     autotoss-nofreq: true
     #   #     autotoss-noexec: true
     #   #     autotoss-notrns: true
-    #   #   },
+    #   #   }
     #   # ]
     # }
   }