Remote command execution

[nncp.git] / src / cypherpunks.ru / nncp / cmd / nncp-pkt / main.go

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go
index d6a597f99c432da2b5a2d66931bd7a2b324dc405..f4de406a4b17eab7eb6b22cff66849d476cdc9d8 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-pkt/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2018 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
@@ -22,33 +22,33 @@ package main
 import (
        "bufio"
        "bytes"
+       "compress/zlib"
        "flag"
        "fmt"
        "io"
-       "io/ioutil"
        "log"
        "os"
 
        "cypherpunks.ru/nncp"
        "github.com/davecgh/go-xdr/xdr2"
-       "github.com/dustin/go-humanize"
        "golang.org/x/crypto/blake2b"
 )
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintln(os.Stderr, "nncp-pkt -- parse raw packet\n")
-       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:", os.Args[0])
+       fmt.Fprintf(os.Stderr, "nncp-pkt -- parse raw packet\n\n")
+       fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
        fmt.Fprintln(os.Stderr, "Packet is read from stdin.")
 }
 
 func main() {
        var (
-               dump     = flag.Bool("dump", false, "Write decrypted/parsed payload to stdout")
-               cfgPath  = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-               version  = flag.Bool("version", false, "Print version information")
-               warranty = flag.Bool("warranty", false, "Print warranty information")
+               dump       = flag.Bool("dump", false, "Write decrypted/parsed payload to stdout")
+               decompress = flag.Bool("decompress", false, "Try to zlib decompress dumped data")
+               cfgPath    = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
+               version    = flag.Bool("version", false, "Print version information")
+               warranty   = flag.Bool("warranty", false, "Print warranty information")
        )
        flag.Usage = usage
        flag.Parse()
@@ -62,16 +62,25 @@ func main() {
        }
 
        var err error
-       beginning := make([]byte, nncp.PktOverhead-blake2b.Size256)
+       beginning := make([]byte, nncp.PktOverhead-8-2*blake2b.Size256)
        if _, err = io.ReadFull(os.Stdin, beginning); err != nil {
                log.Fatalln("Not enough data to read")
        }
        var pkt nncp.Pkt
        _, err = xdr.Unmarshal(bytes.NewReader(beginning), &pkt)
-       if err == nil && pkt.Magic == nncp.MagicNNCPPv1 {
+       if err == nil && pkt.Magic == nncp.MagicNNCPPv2 {
                if *dump {
                        bufW := bufio.NewWriter(os.Stdout)
-                       if _, err = io.Copy(bufW, bufio.NewReader(os.Stdin)); err != nil {
+                       var r io.Reader
+                       r = bufio.NewReader(os.Stdin)
+                       if *decompress {
+                               decompressor, err := zlib.NewReader(r)
+                               if err != nil {
+                                       log.Fatalln(err)
+                               }
+                               r = decompressor
+                       }
+                       if _, err = io.Copy(bufW, r); err != nil {
                                log.Fatalln(err)
                        }
                        if err = bufW.Flush(); err != nil {
@@ -85,35 +94,44 @@ func main() {
                        payloadType = "file"
                case nncp.PktTypeFreq:
                        payloadType = "file request"
-               case nncp.PktTypeMail:
-                       payloadType = "mail"
+               case nncp.PktTypeExec:
+                       payloadType = "exec"
                case nncp.PktTypeTrns:
                        payloadType = "transitional"
                }
                var path string
                switch pkt.Type {
+               case nncp.PktTypeExec:
+                       path = string(bytes.Replace(
+                               pkt.Path[:pkt.PathLen],
+                               []byte{0},
+                               []byte(" "),
+                               -1,
+                       ))
                case nncp.PktTypeTrns:
                        path = nncp.ToBase32(pkt.Path[:pkt.PathLen])
                default:
                        path = string(pkt.Path[:pkt.PathLen])
                }
-               fmt.Printf("Packet type: plain\nPayload type: %s\nPath: %s\n", payloadType, path)
+               fmt.Printf(
+                       "Packet type: plain\nPayload type: %s\nNiceness: %d\nPath: %s\n",
+                       payloadType, pkt.Nice, path,
+               )
                return
        }
        var pktEnc nncp.PktEnc
        _, err = xdr.Unmarshal(bytes.NewReader(beginning), &pktEnc)
-       if err == nil && pktEnc.Magic == nncp.MagicNNCPEv1 {
+       if err == nil && pktEnc.Magic == nncp.MagicNNCPEv3 {
                if *dump {
-                       cfgRaw, err := ioutil.ReadFile(*cfgPath)
+                       ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false)
                        if err != nil {
-                               log.Fatalln("Can not read config:", err)
+                               log.Fatalln("Error during initialization:", err)
                        }
-                       ctx, err := nncp.CfgParse(cfgRaw)
-                       if err != nil {
-                               log.Fatalln("Can not parse config:", err)
+                       if ctx.Self == nil {
+                               log.Fatalln("Config lacks private keys")
                        }
                        bufW := bufio.NewWriter(os.Stdout)
-                       if _, err = nncp.PktEncRead(
+                       if _, _, err = nncp.PktEncRead(
                                ctx.Self,
                                ctx.Neigh,
                                io.MultiReader(
@@ -130,8 +148,8 @@ func main() {
                        return
                }
                fmt.Printf(
-                       "Packet type: encrypted\nNiceness: %d\nSender: %s\nPayload size: %s (%d bytes)\n",
-                       pktEnc.Nice, pktEnc.Sender, humanize.IBytes(pktEnc.Size), pktEnc.Size,
+                       "Packet type: encrypted\nNiceness: %d\nSender: %s\nRecipient: %s\n",
+                       pktEnc.Nice, pktEnc.Sender, pktEnc.Recipient,
                )
                return
        }