https://github.com/python/cpython/commit/2f0e294d85c905691e360586ebd1d1f7e7a1f5df commit: 2f0e294d85c905691e360586ebd1d1f7e7a1f5df branch: main author: Jelle Zijlstra <[email protected]> committer: JelleZijlstra <[email protected]> date: 2026-11-10T08:50:50-08:00 summary:
gh-160369: Reject buffered plaintext after IMAP STARTTLS (#160370) Co-authored-by: Seth Michael Larson <[email protected]> Co-authored-by: Hugo van Kemenade <[email protected]> files: A Misc/NEWS.d/next/Security/2026-10-22-21-59-39.gh-issue-160369.imapTLS.rst M Lib/imaplib.py M Lib/test/test_imaplib.py diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 977d6bdb1c3d86..d9ec48cbc21959 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1176,6 +1176,12 @@ def starttls(self, ssl_context=None): ssl_context = ssl._create_stdlib_context() typ, dat = self._simple_command(name) if typ == 'OK': + if any(self._readbuf): + raise self.abort('unexpected data after STARTTLS response') + # Discard received state before TLS was established + # since data could have been injected by a MITM. + self._readbuf = [] + self.untagged_responses = {} self._close_imaplib_file() self.sock = ssl_context.wrap_socket(self.sock, server_hostname=self.host) diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py index 51e3412324b72d..906c78f07d9c33 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -353,6 +353,33 @@ def test_substitute_errors(self): self.assertRaises(ValueError, sub, '?s', [[(1,)]]) # not a range pair self.assertRaises(ValueError, sub, '?s', [[(1, 2, 3)]]) # not a range pair + @unittest.skipUnless(ssl, "SSL not available") + def test_starttls_rejects_buffered_plaintext(self): + sock = mock.Mock(spec=socket.socket) + sock.recv.return_value = ( + b'* OK [CAPABILITY IMAP4rev1 STARTTLS] ready\r\n') + with mock.patch.object(imaplib.IMAP4, '_create_socket', + return_value=sock): + client = imaplib.IMAP4('localhost') + self.addCleanup(client.shutdown) + + tag = client.tagpre + str(client.tagnum).encode('ascii') + next_tag = client.tagpre + str(client.tagnum + 1).encode('ascii') + # Return the STARTTLS response and injected plaintext in one recv(), + # so the test does not depend on how TCP packets are split. + sock.recv.side_effect = [ + tag + b' OK Begin TLS\r\n' + b'* CAPABILITY IMAP4rev1 INJECTED\r\n' + + next_tag + b' OK CAPABILITY completed\r\n' + ] + context = mock.Mock() + context.wrap_socket.return_value = sock + with self.assertRaisesRegex(imaplib.IMAP4.abort, + 'unexpected data after STARTTLS response'): + client.starttls(context) + context.wrap_socket.assert_not_called() + self.assertFalse(client._tls_established) + if ssl: class SecureTCPServer(socketserver.TCPServer): @@ -2344,10 +2371,67 @@ def test_file_property_setter_should_not_close_previous_file(self): f.close.assert_not_called() +class StartTLSHandler(SimpleIMAPHandler): + capabilities = 'STARTTLS' + + def cmd_STARTTLS(self, tag, args): + context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + context.load_cert_chain(CERTFILE) + self._send_tagged(tag, 'OK', 'Begin TLS') + self.connection = context.wrap_socket(self.connection, + server_side=True) + self.rfile.close() + self.wfile.close() + self.rfile = self.connection.makefile('rb') + self.wfile = self.connection.makefile('wb', buffering=0) + self.capabilities = 'AUTH=PLAIN' + + def finish(self): + try: + super().finish() + finally: + self.connection.close() + + class NewIMAPTests(NewIMAPTestsMixin, unittest.TestCase): imap_class = imaplib.IMAP4 server_class = socketserver.TCPServer + @unittest.skipUnless(ssl, "SSL not available") + def test_starttls(self): + _, server = self._setup(StartTLSHandler, connect=False) + self.client = client = self.imap_class( + 'localhost', server.server_address[1], + timeout=support.LOOPBACK_TIMEOUT) + context = ssl.create_default_context(cafile=CAFILE) + self.assertEqual(client.capabilities, ('IMAP4REV1', 'STARTTLS')) + self.assertEqual(client.starttls(context), ('OK', [None])) + self.assertIsInstance(client.sock, ssl.SSLSocket) + self.assertEqual(client.capabilities, ('IMAP4REV1', 'AUTH=PLAIN')) + client.logout() + + @unittest.skipUnless(ssl, "SSL not available") + def test_starttls_discards_untagged_responses(self): + # Untagged responses received before STARTTLS could have been + # injected by a MITM, so they must not survive the switch to TLS. + class InjectingStartTLSHandler(StartTLSHandler): + def cmd_STARTTLS(self, tag, args): + self._send_textline('* 3 EXISTS') + self._send_textline(r'* FLAGS (\Injected)') + super().cmd_STARTTLS(tag, args) + + _, server = self._setup(InjectingStartTLSHandler, connect=False) + self.client = client = self.imap_class( + 'localhost', server.server_address[1], + timeout=support.LOOPBACK_TIMEOUT) + context = ssl.create_default_context(cafile=CAFILE) + self.assertEqual(client.starttls(context), ('OK', [None])) + self.assertIsInstance(client.sock, ssl.SSLSocket) + self.assertEqual(client.untagged_responses, {}) + self.assertEqual(client.response('EXISTS'), ('EXISTS', [None])) + self.assertEqual(client.response('FLAGS'), ('FLAGS', [None])) + client.logout() + @unittest.skipUnless(ssl, "SSL not available") class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase): @@ -2381,6 +2465,7 @@ def test_ssl_verified(self): ssl_context=ssl_context) client.shutdown() + class ThreadedNetworkedTests(unittest.TestCase): server_class = socketserver.TCPServer imap_class = imaplib.IMAP4 diff --git a/Misc/NEWS.d/next/Security/2026-10-22-21-59-39.gh-issue-160369.imapTLS.rst b/Misc/NEWS.d/next/Security/2026-10-22-21-59-39.gh-issue-160369.imapTLS.rst new file mode 100644 index 00000000000000..35c0a752745793 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2026-10-22-21-59-39.gh-issue-160369.imapTLS.rst @@ -0,0 +1,4 @@ +.. cve: CVE-2026-115559 + +:meth:`imaplib.IMAP4.starttls` now rejects unexpected plaintext buffered after +the STARTTLS response, preventing it from being processed as TLS-protected data. _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
