Merge pull request #160 from drakkan/multiline_resp

add support for multi-line replies

Author: probot-auto-merge[bot]

client_handler.go

@@ -259,9 +259,15 @@ func (c *clientHandler) writeLine(line string) {
 }
 
 func (c *clientHandler) writeMessage(code int, message string) {
-	message = strings.ReplaceAll(message, "\n", "\\n")
-	message = strings.ReplaceAll(message, "\r", "\\r")
-	c.writeLine(fmt.Sprintf("%d %s", code, message))
+	lines := getMessageLines(message)
+
+	for idx, line := range lines {
+		if idx < len(lines)-1 {
+			c.writeLine(fmt.Sprintf("%d-%s", code, line))
+		} else {
+			c.writeLine(fmt.Sprintf("%d %s", code, line))
+		}
+	}
 }
 
 // ErrNoPassiveConnectionDeclared is defined when a transfer is openeed without any passive connection declared
@@ -334,3 +340,18 @@ func (c *clientHandler) multilineAnswer(code int, message string) func() {
 		c.writeLine(fmt.Sprintf("%d End", code))
 	}
 }
+
+func getMessageLines(message string) []string {
+	lines := make([]string, 0, 1)
+	sc := bufio.NewScanner(strings.NewReader(message))
+
+	for sc.Scan() {
+		lines = append(lines, sc.Text())
+	}
+
+	if len(lines) == 0 {
+		lines = append(lines, "")
+	}
+
+	return lines
+}

client_handler_test.go

@@ -37,3 +37,64 @@ func TestConcurrency(t *testing.T) {
 
 	waitGroup.Wait()
 }
+
+type multilineMessage struct {
+	message       string
+	expectedLines []string
+}
+
+func TestMultiLineMessages(t *testing.T) {
+	testMultilines := []multilineMessage{
+		{
+			message:       "single line",
+			expectedLines: []string{"single line"},
+		},
+		{
+			message:       "",
+			expectedLines: []string{""},
+		},
+		{
+			message:       "first line\r\nsecond line\r\n",
+			expectedLines: []string{"first line", "second line"},
+		},
+		{
+			message:       "first line\nsecond line\n",
+			expectedLines: []string{"first line", "second line"},
+		},
+		{
+			message:       "first line\rsecond line",
+			expectedLines: []string{"first line\rsecond line"},
+		},
+		{
+			message: `first line
+
+second line
+
+`,
+			expectedLines: []string{"first line", "", "second line", ""},
+		},
+	}
+
+	for _, msg := range testMultilines {
+		lines := getMessageLines(msg.message)
+		if len(lines) != len(msg.expectedLines) {
+			t.Errorf("unexpected number of lines got: %v want: %v", len(lines), len(msg.expectedLines))
+		}
+
+		for _, line := range lines {
+			if !isStringInSlice(line, msg.expectedLines) {
+				t.Errorf("unexpected line %#v", line)
+			}
+		}
+	}
+}
+
+func isStringInSlice(s string, list []string) bool {
+	for _, c := range list {
+		if s == c {
+			return true
+		}
+	}
+
+	return false
+}