Ensure lines end with \r\n

Author: srittau

NEWS.md

@@ -1,6 +1,11 @@
 Changes in FakeSMTPd 0.2.1
 ==========================
 
+Improvements
+------------
+
+* Ensure that lines end with \r\n.
+
 Bug fixes
 ---------
 

fakesmtpd/connection.py

@@ -49,7 +49,7 @@ async def _handle_connection(self) -> None:
         self._write_reply(SMTPStatus.SERVICE_READY,
                           "{} FakeSMTPd Service ready".format(getfqdn()))
         while not self.reader.at_eof():
-            line = await self.reader.readline()
+            line = await self.reader.readuntil(b"\r\n")
             try:
                 decoded = line.decode("ascii").rstrip()
             except UnicodeDecodeError:
@@ -99,7 +99,7 @@ async def _handle_mail_text(self) -> None:
 
     async def _read_mail_text(self) -> None:
         while not self.reader.at_eof():
-            line = await self.reader.readline()
+            line = await self.reader.readuntil(b"\r\n")
             if len(line) > SMTP_TEXT_LINE_LIMIT:
                 raise ValueError()
             if line == b".\r\n":

fakesmtpd_test/connection.py

@@ -20,7 +20,8 @@ def __init__(self) -> None:
 
     # SUT Interface
 
-    async def readline(self) -> bytes:
+    async def readuntil(self, separator: bytes = b"\n") -> bytes:
+        assert_equal(b"\r\n", separator)
         if not self.lines:
             return b""
         line = self.lines[0].encode("latin1") + b"\r\n"