Refactoring

Author: elwin

client/client/client.go

@@ -52,5 +52,5 @@ func run() error {
 		fmt.Printf("- %s (%d)\n", entry.Name, entry.Size)
 	}
 
-	return nil
+	return conn.Quit()
 }

server/logger.go logger/logger.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package server
+package logger
 
 import (
 	"fmt"

server/cmd.go

@@ -5,11 +5,12 @@
 package server
 
 import (
-	"encoding/binary"
 	"fmt"
 	"log"
 	"strconv"
 	"strings"
+
+	socket2 "github.com/elwin/transmit2/socket"
 )
 
 type Command interface {
@@ -277,22 +278,7 @@ func (cmd commandEprt) RequireAuth() bool {
 }
 
 func (cmd commandEprt) Execute(conn *Conn, param string) {
-	delim := string(param[0:1])
-	parts := strings.Split(param, delim)
-	addressFamily, err := strconv.Atoi(parts[1])
-	host := parts[2]
-	port, err := strconv.Atoi(parts[3])
-	if addressFamily != 1 && addressFamily != 2 {
-		conn.writeMessage(522, "Network protocol not supported, use (1,2)")
-		return
-	}
-	socket, err := newActiveSocket(host, port, conn.logger, conn.sessionID)
-	if err != nil {
-		conn.writeMessage(425, "Data connection failed")
-		return
-	}
-	conn.dataConn = socket
-	conn.writeMessage(200, "Connection established ("+strconv.Itoa(port)+")")
+	conn.writeMessage(502, "Active mode not supported, use passive mode instead")
 }
 
 // commandLprt responds to the LPRT FTP command. It allows the client to
@@ -313,49 +299,8 @@ func (cmd commandLprt) RequireAuth() bool {
 }
 
 func (cmd commandLprt) Execute(conn *Conn, param string) {
-	// No tests for this code yet
-
-	parts := strings.Split(param, ",")
-
-	addressFamily, err := strconv.Atoi(parts[0])
-	if addressFamily != 4 {
-		conn.writeMessage(522, "Network protocol not supported, use 4")
-		return
-	}
-
-	addressLength, err := strconv.Atoi(parts[1])
-	if addressLength != 4 {
-		conn.writeMessage(522, "Network IP length not supported, use 4")
-		return
-	}
-
-	host := strings.Join(parts[2:2+addressLength], ".")
-
-	portLength, err := strconv.Atoi(parts[2+addressLength])
-	portAddress := parts[3+addressLength : 3+addressLength+portLength]
+	conn.writeMessage(502, "Active mode not supported, use passive mode instead")
 
-	// Convert string[] to byte[]
-	portBytes := make([]byte, portLength)
-	for i := range portAddress {
-		p, _ := strconv.Atoi(portAddress[i])
-		portBytes[i] = byte(p)
-	}
-
-	// convert the bytes to an int
-	port := int(binary.BigEndian.Uint16(portBytes))
-
-	// if the existing connection is on the same host/port don't reconnect
-	if conn.dataConn.Host() == host && conn.dataConn.Port() == port {
-		return
-	}
-
-	socket, err := newActiveSocket(host, port, conn.logger, conn.sessionID)
-	if err != nil {
-		conn.writeMessage(425, "Data connection failed")
-		return
-	}
-	conn.dataConn = socket
-	conn.writeMessage(200, "Connection established ("+strconv.Itoa(port)+")")
 }
 
 // commandEpsv responds to the EPSV FTP command. It allows the client to
@@ -377,7 +322,7 @@ func (cmd commandEpsv) RequireAuth() bool {
 
 func (cmd commandEpsv) Execute(conn *Conn, param string) {
 	addr := conn.passiveListenIP()
-	socket, err := newPassiveSocket(addr, conn.PassivePort, conn.logger, conn.sessionID)
+	socket, err := socket2.NewPassiveSocket(addr, conn.PassivePort, conn.logger, conn.sessionID)
 	if err != nil {
 		log.Println(err)
 		conn.writeMessage(425, "Data connection failed")
@@ -646,7 +591,7 @@ func (cmd commandPasv) RequireAuth() bool {
 
 func (cmd commandPasv) Execute(conn *Conn, param string) {
 	listenIP := conn.passiveListenIP()
-	socket, err := newPassiveSocket(listenIP, conn.PassivePort, conn.logger, conn.sessionID)
+	socket, err := socket2.NewPassiveSocket(listenIP, conn.PassivePort, conn.logger, conn.sessionID)
 	if err != nil {
 		conn.writeMessage(425, "Data connection failed")
 		return
@@ -679,18 +624,7 @@ func (cmd commandPort) RequireAuth() bool {
 }
 
 func (cmd commandPort) Execute(conn *Conn, param string) {
-	nums := strings.Split(param, ",")
-	portOne, _ := strconv.Atoi(nums[4])
-	portTwo, _ := strconv.Atoi(nums[5])
-	port := (portOne * 256) + portTwo
-	host := nums[0] + "." + nums[1] + "." + nums[2] + "." + nums[3]
-	socket, err := newActiveSocket(host, port, conn.logger, conn.sessionID)
-	if err != nil {
-		conn.writeMessage(425, "Data connection failed")
-		return
-	}
-	conn.dataConn = socket
-	conn.writeMessage(200, "Connection established ("+strconv.Itoa(port)+")")
+	conn.writeMessage(502, "Active mode not supported, use passive mode instead")
 }
 
 // commandPwd responds to the PWD FTP command.

server/conn.go

@@ -17,6 +17,9 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+
+	"github.com/elwin/transmit2/logger"
+	"github.com/elwin/transmit2/socket"
 )
 
 const (
@@ -27,10 +30,10 @@ type Conn struct {
 	conn          net.Conn
 	controlReader *bufio.Reader
 	controlWriter *bufio.Writer
-	dataConn      DataSocket
+	dataConn      socket.DataSocket
 	driver        Driver
 	auth          Auth
-	logger        Logger
+	logger        logger.Logger
 	server        *Server
 	sessionID     string
 	namePrefix    string

server/scionftp/scionftp.go

@@ -12,7 +12,7 @@ import (
 
 	filedriver "github.com/elwin/file-driver"
 
-	"goftp.io/server"
+	"github.com/elwin/transmit2/server"
 )
 
 func main() {

server/server.go

@@ -11,6 +11,8 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+
+	"github.com/elwin/transmit2/logger"
 )
 
 // Version returns the library version
@@ -46,7 +48,7 @@ type ServerOpts struct {
 	WelcomeMessage string
 
 	// A logger implementation, if nil the StdLogger is used
-	Logger Logger
+	Logger logger.Logger
 }
 
 // Server is the root of your FTP application. You should instantiate one
@@ -55,12 +57,12 @@ type ServerOpts struct {
 // Always use the NewServer() method to create a new Server.
 type Server struct {
 	*ServerOpts
-	listenTo  string
-	logger    Logger
-	listener  net.Listener
-	ctx       context.Context
-	cancel    context.CancelFunc
-	feats     string
+	listenTo string
+	logger   logger.Logger
+	listener net.Listener
+	ctx      context.Context
+	cancel   context.CancelFunc
+	feats    string
 }
 
 // ErrServerClosed is returned by ListenAndServe() or Serve() when a shutdown
@@ -101,7 +103,7 @@ func serverOptsWithDefaults(opts *ServerOpts) *ServerOpts {
 		newOpts.Auth = opts.Auth
 	}
 
-	newOpts.Logger = &StdLogger{}
+	newOpts.Logger = &logger.StdLogger{}
 	if opts.Logger != nil {
 		newOpts.Logger = opts.Logger
 	}

server/socket.go socket/socket.go

@@ -1,8 +1,4 @@
-// Copyright 2018 The goftp Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package server
+package socket
 
 import (
 	"io"
@@ -14,6 +10,8 @@ import (
 	"sync"
 	"syscall"
 	"time"
+
+	"github.com/elwin/transmit2/logger"
 )
 
 // DataSocket describes a data socket is used to send non-control data between the client and
@@ -36,74 +34,13 @@ type DataSocket interface {
 	Close() error
 }
 
-type ftpActiveSocket struct {
-	conn   *net.TCPConn
-	host   string
-	port   int
-	logger Logger
-}
-
-func newActiveSocket(remote string, port int, logger Logger, sessionID string) (DataSocket, error) {
-	connectTo := net.JoinHostPort(remote, strconv.Itoa(port))
-
-	logger.Print(sessionID, "Opening active data connection to "+connectTo)
-
-	raddr, err := net.ResolveTCPAddr("tcp", connectTo)
-
-	if err != nil {
-		logger.Print(sessionID, err)
-		return nil, err
-	}
-
-	tcpConn, err := net.DialTCP("tcp", nil, raddr)
-
-	if err != nil {
-		logger.Print(sessionID, err)
-		return nil, err
-	}
-
-	socket := new(ftpActiveSocket)
-	socket.conn = tcpConn
-	socket.host = remote
-	socket.port = port
-	socket.logger = logger
-
-	return socket, nil
-}
-
-func (socket *ftpActiveSocket) Host() string {
-	return socket.host
-}
-
-func (socket *ftpActiveSocket) Port() int {
-	return socket.port
-}
-
-func (socket *ftpActiveSocket) Read(p []byte) (n int, err error) {
-	return socket.conn.Read(p)
-}
-
-func (socket *ftpActiveSocket) ReadFrom(r io.Reader) (int64, error) {
-	return socket.conn.ReadFrom(r)
-}
-
-func (socket *ftpActiveSocket) Write(p []byte) (n int, err error) {
-	return socket.conn.Write(p)
-}
-
-func (socket *ftpActiveSocket) Close() error {
-	return socket.conn.Close()
-}
-
 type ftpPassiveSocket struct {
-	conn      net.Conn
-	port      int
-	host      string
-	ingress   chan []byte
-	egress    chan []byte
-	logger    Logger
-	lock      sync.Mutex // protects conn and err
-	err       error
+	conn   net.Conn
+	port   int
+	host   string
+	logger logger.Logger
+	lock   sync.Mutex // protects conn and err
+	err    error
 }
 
 // Detect if an error is "bind: address already in use"
@@ -132,10 +69,8 @@ func isErrorAddressAlreadyInUse(err error) bool {
 	return false
 }
 
-func newPassiveSocket(host string, port func() int, logger Logger, sessionID string) (DataSocket, error) {
+func NewPassiveSocket(host string, port func() int, logger logger.Logger, sessionID string) (DataSocket, error) {
 	socket := new(ftpPassiveSocket)
-	socket.ingress = make(chan []byte)
-	socket.egress = make(chan []byte)
 	socket.logger = logger
 	socket.host = host
 	const retries = 10