ParseCmd tests

parse.go

@@ -6,7 +6,8 @@ import (
 	"strings"
 )
 
-func parseCmd(line string) (cmd string, arg string, err error) {
+// ParseCmd parses an SMTP command line
+func ParseCmd(line string) (cmd string, arg string, err error) {
 	line = strings.TrimRight(line, "\r\n")
 
 	l := len(line)
@@ -35,6 +36,7 @@ func parseCmd(line string) (cmd string, arg string, err error) {
 	return strings.ToUpper(line[0:4]), strings.Trim(line[5:], " \n\r"), nil
 }
 
+/* Not used by proxy
 // Takes the arguments proceeding a command and files them
 // into a map[string]string after uppercasing each key.  Sample arg
 // string:
@@ -54,6 +56,7 @@ func parseArgs(args []string) (map[string]string, error) {
 	}
 	return argMap, nil
 }
+*/
 
 func parseHelloArgument(arg string) (string, error) {
 	domain := arg

proxy_test.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"crypto/tls"
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -691,6 +692,14 @@ func TestClientOtherFunctions(t *testing.T) {
 	}
 }
 
+// errorMatch allows for fuzzy matching when specific errors expected
+func errorMatch(e1, eChk error) bool {
+	if e1 == nil && eChk == nil {
+		return true
+	}
+	return strings.Contains(e1.Error(), eChk.Error())
+}
+
 func TestServerOtherFunctions(t *testing.T) {
 	verboseOpt := true
 	insecureSkipVerify := true
@@ -699,13 +708,27 @@ func TestServerOtherFunctions(t *testing.T) {
 	if err != nil {
 		log.Fatal(err)
 	}
-
-	// start the proxy
-	go startProxy(t, s)
-	time.Sleep(1 * time.Second)
-	// Test additional server functions not used by the app
-	f := func(c *smtpproxy.Conn) {
-		fmt.Printf("%v\n", c)
+	_ = s // currently unused
+
+	type actionExpectedResponse struct {
+		line string
+		cmd  string
+		arg  string
+		err  error
+	}
+	arList := []actionExpectedResponse{
+		{"", "", "", nil},
+		{"STARTTLS", "STARTTLS", "", nil},
+		{"M", "", "", errors.New(`Command too short`)},
+		{"QUIT", "QUIT", "", nil},
+		{"MAIL ", "", "", errors.New(`Mangled command`)},
+		{"MAILxx", "", "", errors.New(`Mangled command`)},
+		{"MAIL FROM", "MAIL", "FROM", nil},
+	}
+	for _, v := range arList {
+		cmd, arg, err := smtpproxy.ParseCmd(v.line)
+		if cmd != v.cmd || arg != v.arg || !errorMatch(err, v.err) {
+			t.Errorf("Unexpected value cmd, arg, err = (%v, %v, %v) - expected (%v, %v, %v)\n", cmd, arg, err, v.cmd, v.arg, v.err)
+		}
 	}
-	s.ForEachConn(f)
 }

server.go

@@ -112,7 +112,7 @@ func (s *Server) handleConn(c *Conn) error {
 	for {
 		line, err := c.ReadLine()
 		if err == nil {
-			cmd, arg, err := parseCmd(line)
+			cmd, arg, err := ParseCmd(line)
 			if err != nil {
 				c.nbrErrors++
 				c.WriteResponse(501, EnhancedCode{5, 5, 2}, "Bad command")
@@ -159,7 +159,7 @@ func (s *Server) ListenAndServe() error {
 	return s.Serve(l)
 }
 
-// Close stops the server.
+// Close function not needed
 func (s *Server) Close() {
 	s.listener.Close()
 
@@ -171,11 +171,4 @@ func (s *Server) Close() {
 	}
 }
 
-// ForEachConn iterates through all opened connections.
-func (s *Server) ForEachConn(f func(*Conn)) {
-	s.locker.Lock()
-	defer s.locker.Unlock()
-	for conn := range s.conns {
-		f(conn)
-	}
-}
+// ForEachConn not needed