server: Fix \r\n\r\n being mangled into \r\n\n in message body

Author: foxcpp

data.go

@@ -103,10 +103,8 @@ func (r *dataReader) Read(b []byte) (n int, err error) {
 			}
 			if c == '\r' {
 				r.state = stateCR
-				continue
 			}
 			r.state = stateData
-
 		case stateDot:
 			if c == '\r' {
 				r.state = stateDotCR
@@ -116,22 +114,20 @@ func (r *dataReader) Read(b []byte) (n int, err error) {
 				r.state = stateEOF
 				continue
 			}
-			r.state = stateData
 
+			r.state = stateData
 		case stateDotCR:
 			if c == '\n' {
 				r.state = stateEOF
 				continue
 			}
 			r.state = stateData
-
 		case stateCR:
 			if c == '\n' {
 				r.state = stateBeginLine
 				break
 			}
 			r.state = stateData
-
 		case stateData:
 			if c == '\r' {
 				r.state = stateCR

server_test.go

@@ -455,7 +455,10 @@ func TestServer(t *testing.T) {
 		t.Fatal("Invalid DATA response:", scanner.Text())
 	}
 
+	io.WriteString(c, "From: [email protected]\r\n")
+	io.WriteString(c, "\r\n")
 	io.WriteString(c, "Hey\r <3\r\n")
+	io.WriteString(c, "..this dot is fine\r\n")
 	io.WriteString(c, ".\r\n")
 	scanner.Scan()
 	if !strings.HasPrefix(scanner.Text(), "250 ") {
@@ -473,7 +476,7 @@ func TestServer(t *testing.T) {
 	if len(msg.To) != 1 || msg.To[0] != "[email protected]" {
 		t.Fatal("Invalid mail recipients:", msg.To)
 	}
-	if string(msg.Data) != "Hey\r <3\r\n" {
+	if string(msg.Data) != "From: [email protected]\r\n\r\nHey\r <3\r\n.this dot is fine\r\n" {
 		t.Fatal("Invalid mail data:", string(msg.Data))
 	}
 }