From caa27b7823f12a971aec54f77a06280fdd84f058 Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Sat, 23 May 2009 18:49:56 +0000
Subject: [PATCH] Fix for issue 5259: ASCII encode the username and password
 before passing it to encode_base64, which requires bytes in py3k.  Fix by
 Musashi Tamura, tests by Marcin Bachry.

---
 Lib/smtplib.py           |  3 ++-
 Lib/test/test_smtplib.py | 20 ++++++++++++++++++++
 Misc/ACKS                |  1 +
 Misc/NEWS                |  3 +++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index d8d717c05b5583..0b2a586a445a3b 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -545,7 +545,8 @@ def encode_cram_md5(challenge, user, password):
             return encode_base64(response)
 
         def encode_plain(user, password):
-            return encode_base64("\0%s\0%s" % (user, password))
+            s = "\0%s\0%s" % (user, password)
+            return encode_base64(s.encode('ascii'), eol='')
 
 
         AUTH_PLAIN = "PLAIN"
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 55e30a8082866f..012ab9427eb1bb 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -284,6 +284,9 @@ def testFailingHELO(self):
              'Mrs.C@somewhereesle.com':'Ruth C',
             }
 
+sim_auth = ('Mr.A@somewhere.com', 'somepassword')
+sim_auth_b64encoded = 'AE1yLkFAc29tZXdoZXJlLmNvbQBzb21lcGFzc3dvcmQ='
+
 sim_lists = {'list-1':['Mr.A@somewhere.com','Mrs.C@somewhereesle.com'],
              'list-2':['Ms.B@somewhere.com',],
             }
@@ -296,6 +299,7 @@ def smtp_EHLO(self, arg):
                '250-SIZE 20000000\r\n' \
                '250-STARTTLS\r\n' \
                '250-DELIVERBY\r\n' \
+               '250-AUTH PLAIN\r\n' \
                '250 HELP'
         self.push(resp)
 
@@ -324,6 +328,16 @@ def smtp_EXPN(self, arg):
         else:
             self.push('550 No access for you!')
 
+    def smtp_AUTH(self, arg):
+        mech, auth = arg.split()
+        if mech.lower() == 'plain':
+            if auth == sim_auth_b64encoded:
+                self.push('235 ok, go ahead')
+            else:
+                self.push('550 No access for you!')
+        else:
+            self.push('504 auth type unimplemented')
+
 
 class SimSMTPServer(smtpd.SMTPServer):
     def handle_accept(self):
@@ -372,6 +386,7 @@ def testEHLO(self):
                              'size': '20000000',
                              'starttls': '',
                              'deliverby': '',
+                             'auth': ' PLAIN',
                              'help': '',
                              }
 
@@ -412,6 +427,11 @@ def testEXPN(self):
         self.assertEqual(smtp.expn(u), expected_unknown)
         smtp.quit()
 
+    def testAUTH(self):
+        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
+
+        expected_auth_ok = (235, b'ok, go ahead')
+        self.assertEqual(smtp.login(sim_auth[0], sim_auth[1]), expected_auth_ok)
 
 
 def test_main(verbose=None):
diff --git a/Misc/ACKS b/Misc/ACKS
index f14d45d2650bb8..b31a3b6dba31ac 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -710,6 +710,7 @@ Andrew Svetlov
 Paul Swartz
 Thenault Sylvain
 Geoff Talvola
+Musashi Tamura
 William Tanksley
 Christian Tanzer
 Steven Taschuk
diff --git a/Misc/NEWS b/Misc/NEWS
index 1380b2960a70bb..a736ad8b2c9902 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #5259: smtplib plain auth login no longer gives a traceback.  Fix
+  by Musashi Tamura, tests by Marcin Bachry.
+
 - Issue #1983: Fix functions taking or returning a process identifier to use
   the dedicated C type ``pid_t`` instead of a C ``int``. Some platforms have
   a process identifier type wider than the standard C integer type.