End-to-end FTP working.

cohosh · Feb 15, 2018 · 052af7d · 052af7d
1 parent 110bb85
commit 052af7d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/cmd/marionette-client/main.go b/cmd/marionette-client/main.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/redjack/marionette"
 	"github.com/redjack/marionette/mar"
+	_ "github.com/redjack/marionette/plugins"
 	"go.uber.org/zap"
 )
 
@@ -82,8 +83,11 @@ func run() error {
 	}
 	defer ln.Close()
 
+	streamSet := marionette.NewStreamSet()
+	defer streamSet.Close()
+
 	// Create dialer to remote server.
-	dialer, err := marionette.NewDialer(doc, config.Server.IP)
+	dialer, err := marionette.NewDialer(doc, config.Server.IP, streamSet)
 	if err != nil {
 		return err
 	}
@@ -96,6 +100,8 @@ func run() error {
 	}
 	defer proxy.Close()
 
+	fmt.Printf("listening on %s\n", config.Client.Bind)
+
 	// Wait for signal.
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)

diff --git a/cmd/marionette-server/main.go b/cmd/marionette-server/main.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/redjack/marionette"
 	"github.com/redjack/marionette/mar"
+	_ "github.com/redjack/marionette/plugins"
 	"go.uber.org/zap"
 )
 
@@ -88,6 +89,8 @@ func run() error {
 	}
 	defer proxy.Close()
 
+	fmt.Printf("listening on %s, proxying to %s\n", ln.Addr().String(), config.Server.Proxy)
+
 	// Wait for signal.
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)

diff --git a/fsm.go b/fsm.go
@@ -389,7 +389,7 @@ func (fsm *fsm) ensureClientConn(ctx context.Context) error {
 	}
 
 	fsm.conn = NewBufferedConn(conn, MaxCellLength)
-	fsm.closeFuncs = append(fsm.closeFuncs, conn.Close)
+	// fsm.closeFuncs = append(fsm.closeFuncs, conn.Close)
 
 	return nil
 }
@@ -406,7 +406,7 @@ func (fsm *fsm) ensureServerConn(ctx context.Context) error {
 	}
 
 	fsm.conn = NewBufferedConn(conn, MaxCellLength)
-	fsm.closeFuncs = append(fsm.closeFuncs, conn.Close)
+	// fsm.closeFuncs = append(fsm.closeFuncs, conn.Close)
 
 	return nil
 }

diff --git a/mar/formats/20150701/ftp_pasv_transfer.mar b/mar/formats/20150701/ftp_pasv_transfer.mar
@@ -3,4 +3,4 @@ connection(tcp, ftp_pasv_port):
     ftp_pasv_transfer end NULL 1
 
 action do_ftp_pasv_transfer:
-    server fte.send("ID3.*", 512)
+    server fte.send_async("ID3.*", 512)
diff --git a/mar/formats/20150701/ftp_simple_blocking.mar b/mar/formats/20150701/ftp_simple_blocking.mar
@@ -40,10 +40,10 @@ action do_pasv_mode_ok:
     server tg.send("ftp_entering_passive")
 
 action do_ftp_get_file_request:
-    client io.puts("get MyFile.mp3\n")
+    client fte.send_async("get ([a-zA-Z0-9]*).mp3\n", 128)
 
 action do_ftp_get_file_response_started:
-    server io.puts("150 Data connection starting for MyFile.mp3.\n")
+    server io.puts("150 Opening data channel for file transfer\n")
 
 action do_ftp_pasv_transfer:
     server model.spawn("ftp_pasv_transfer", 1)

diff --git a/mar/mar.gen.go b/mar/mar.gen.go
diff --git a/plugins/model/spawn.go b/plugins/model/spawn.go
@@ -50,14 +50,15 @@ func Spawn(fsm marionette.FSM, args ...interface{}) error {
 
 	// Execute a sub-FSM multiple times.
 	for i := 0; i < n; i++ {
-		logger.Debug("spawning", zap.Int("i", i))
+		logger.Debug("spawn begin", zap.Int("i", i))
 		child := fsm.Clone(doc)
 		if err := child.Execute(context.TODO()); err != nil {
 			logger.Error("child execution failed", zap.Error(err))
 			child.Reset()
 			return err
 		}
 		child.Reset()
+		logger.Debug("spawn end", zap.Int("i", i))
 	}
 
 	return nil

diff --git a/plugins/tg/send.go b/plugins/tg/send.go
@@ -42,7 +42,7 @@ func Send(fsm marionette.FSM, args ...interface{}) error {
 	ciphertext = strings.Replace(ciphertext, "%%SERVER_LISTEN_IP%%", fsm.Host(), -1)
 	for _, cipher := range grammar.Ciphers {
 		var err error
-		if ciphertext, err = encryptTo(fsm, cipher, ciphertext); err != nil {
+		if ciphertext, err = encryptTo(fsm, cipher, ciphertext, logger); err != nil {
 			logger.Error("cannot encrypt", zap.String("key", cipher.Key()), zap.Error(err))
 			return fmt.Errorf("cannot encrypt: %q", err)
 		}
@@ -58,15 +58,15 @@ func Send(fsm marionette.FSM, args ...interface{}) error {
 	return nil
 }
 
-func encryptTo(fsm marionette.FSM, cipher Cipher, template string) (_ string, err error) {
+func encryptTo(fsm marionette.FSM, cipher Cipher, template string, logger *zap.Logger) (_ string, err error) {
 	// Encode data from streams if there is capacity in the handler.
 	var data []byte
 	if capacity, err := cipher.Capacity(); err != nil {
 		return "", err
 	} else if capacity > 0 {
 		cell := fsm.StreamSet().Dequeue(capacity)
 		if cell == nil {
-			cell = marionette.NewCell(0, 0, 0, marionette.NORMAL)
+			cell = marionette.NewCell(0, 0, capacity, marionette.NORMAL)
 		}
 
 		// Assign ids and marshal to bytes.