From 669b755c92aac40cc3d14e94b9e6dbc1e48d3ef0 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Tue, 20 Mar 2012 16:16:29 -0400 Subject: [PATCH] #14269: smtpd now conforms to the RFC and requires HELO before MAIL. This is a backward incompatible change, but since it is an RFC conformance bug and all real mail servers that I know of do conform to the RFC in this regard, I believe it is an acceptable change for a feature release. Patch by Jason Killen. --- Lib/smtpd.py | 12 +++++++++++ Lib/test/test_smtpd.py | 48 +++++++++++++++++++++++++++++++++++++++++- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/Lib/smtpd.py b/Lib/smtpd.py index d66b0d74da7..748fcaefeb4 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -374,6 +374,10 @@ class SMTPChannel(asynchat.async_chat): return address def smtp_MAIL(self, arg): + if not self.seen_greeting: + self.push('503 Error: send HELO first'); + return + print('===> MAIL', arg, file=DEBUGSTREAM) address = self.__getaddr('FROM:', arg) if arg else None if not address: @@ -387,6 +391,10 @@ class SMTPChannel(asynchat.async_chat): self.push('250 Ok') def smtp_RCPT(self, arg): + if not self.seen_greeting: + self.push('503 Error: send HELO first'); + return + print('===> RCPT', arg, file=DEBUGSTREAM) if not self.mailfrom: self.push('503 Error: need MAIL command') @@ -411,6 +419,10 @@ class SMTPChannel(asynchat.async_chat): self.push('250 Ok') def smtp_DATA(self, arg): + if not self.seen_greeting: + self.push('503 Error: send HELO first'); + return + if not self.rcpttos: self.push('503 Error: need RCPT command') return diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py index dd235655e86..a7dc5f626de 100644 --- a/Lib/test/test_smtpd.py +++ b/Lib/test/test_smtpd.py @@ -39,6 +39,7 @@ class SMTPDServerTest(TestCase): channel.socket.queue_recv(line) channel.handle_read() + write_line(b'HELO test.example') write_line(b'MAIL From:eggs@example') write_line(b'RCPT To:spam@example') write_line(b'DATA') @@ -104,6 +105,11 @@ class SMTPDChannelTest(TestCase): self.write_line(b'NOOP') self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') + def test_HELO_NOOP(self): + self.write_line(b'HELO example') + self.write_line(b'NOOP') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') + def test_NOOP_bad_syntax(self): self.write_line(b'NOOP hi') self.assertEqual(self.channel.socket.last, @@ -113,17 +119,23 @@ class SMTPDChannelTest(TestCase): self.write_line(b'QUIT') self.assertEqual(self.channel.socket.last, b'221 Bye\r\n') + def test_HELO_QUIT(self): + self.write_line(b'HELO example') + self.write_line(b'QUIT') + self.assertEqual(self.channel.socket.last, b'221 Bye\r\n') + def test_QUIT_arg_ignored(self): self.write_line(b'QUIT bye bye') self.assertEqual(self.channel.socket.last, b'221 Bye\r\n') def test_bad_state(self): self.channel.smtp_state = 'BAD STATE' - self.write_line(b'HELO') + self.write_line(b'HELO example') self.assertEqual(self.channel.socket.last, b'451 Internal confusion\r\n') def test_command_too_long(self): + self.write_line(b'HELO example') self.write_line(b'MAIL from ' + b'a' * self.channel.command_size_limit + b'@example') @@ -133,6 +145,7 @@ class SMTPDChannelTest(TestCase): def test_data_too_long(self): # Small hack. Setting limit to 2K octets here will save us some time. self.channel.data_size_limit = 2048 + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'DATA') @@ -142,43 +155,61 @@ class SMTPDChannelTest(TestCase): b'552 Error: Too much mail data\r\n') def test_need_MAIL(self): + self.write_line(b'HELO example') self.write_line(b'RCPT to:spam@example') self.assertEqual(self.channel.socket.last, b'503 Error: need MAIL command\r\n') def test_MAIL_syntax(self): + self.write_line(b'HELO example') self.write_line(b'MAIL from eggs@example') self.assertEqual(self.channel.socket.last, b'501 Syntax: MAIL FROM:
\r\n') def test_MAIL_missing_from(self): + self.write_line(b'HELO example') self.write_line(b'MAIL from:') self.assertEqual(self.channel.socket.last, b'501 Syntax: MAIL FROM:
\r\n') def test_MAIL_chevrons(self): + self.write_line(b'HELO example') self.write_line(b'MAIL from:') self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') def test_nested_MAIL(self): + self.write_line(b'HELO example') self.write_line(b'MAIL from:eggs@example') self.write_line(b'MAIL from:spam@example') self.assertEqual(self.channel.socket.last, b'503 Error: nested MAIL command\r\n') + def test_no_HELO_MAIL(self): + self.write_line(b'MAIL from:') + self.assertEqual(self.channel.socket.last, + b'503 Error: send HELO first\r\n') + def test_need_RCPT(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'DATA') self.assertEqual(self.channel.socket.last, b'503 Error: need RCPT command\r\n') def test_RCPT_syntax(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT to eggs@example') self.assertEqual(self.channel.socket.last, b'501 Syntax: RCPT TO:
\r\n') + def test_no_HELO_RCPT(self): + self.write_line(b'RCPT to eggs@example') + self.assertEqual(self.channel.socket.last, + b'503 Error: send HELO first\r\n') + def test_data_dialog(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') self.write_line(b'RCPT To:spam@example') @@ -193,12 +224,19 @@ class SMTPDChannelTest(TestCase): [('peer', 'eggs@example', ['spam@example'], 'data\nmore')]) def test_DATA_syntax(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'DATA spam') self.assertEqual(self.channel.socket.last, b'501 Syntax: DATA\r\n') + def test_no_HELO_DATA(self): + self.write_line(b'DATA spam') + self.assertEqual(self.channel.socket.last, + b'503 Error: send HELO first\r\n') + def test_data_transparency_section_4_5_2(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'DATA') @@ -206,6 +244,7 @@ class SMTPDChannelTest(TestCase): self.assertEqual(self.channel.received_data, '.') def test_multiple_RCPT(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'RCPT To:ham@example') @@ -216,6 +255,7 @@ class SMTPDChannelTest(TestCase): def test_manual_status(self): # checks that the Channel is able to return a custom status message + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'DATA') @@ -223,6 +263,7 @@ class SMTPDChannelTest(TestCase): self.assertEqual(self.channel.socket.last, b'250 Okish\r\n') def test_RSET(self): + self.write_line(b'HELO example') self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'RSET') @@ -234,6 +275,11 @@ class SMTPDChannelTest(TestCase): self.assertEqual(self.server.messages, [('peer', 'foo@example', ['eggs@example'], 'data')]) + def test_HELO_RSET(self): + self.write_line(b'HELO example') + self.write_line(b'RSET') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') + def test_RSET_syntax(self): self.write_line(b'RSET hi') self.assertEqual(self.channel.socket.last, b'501 Syntax: RSET\r\n') diff --git a/Misc/ACKS b/Misc/ACKS index 2cd02bf35ec..bc049c03179 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -531,6 +531,7 @@ Magnus Kessler Lawrence Kesteloot Vivek Khera Mads Kiilerich +Jason Killen Taek Joo Kim W. Trevor King Paul Kippes diff --git a/Misc/NEWS b/Misc/NEWS index 69388ca314b..94f3fc85540 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -30,6 +30,9 @@ Core and Builtins Library ------- +- Issue #14269: SMTPD now conforms to the RFC and requires a HELO command + before MAIL, RCPT, or DATA. + - Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr attribute.