File CVE-2025-15366-imap-ctrl-chars.patch of Package python3.42753
From 7485ee5e2cf81d3e5ad0d9c3be73cecd2ab4eec7 Mon Sep 17 00:00:00 2001
From: Seth Michael Larson <seth@python.org>
Date: Fri, 16 Jan 2026 10:54:09 -0600
Subject: [PATCH 1/2] Add 'test.support' fixture for C0 control characters
---
Lib/imaplib.py | 4 +++-
Lib/test/test_imaplib.py | 9 ++++++++-
Misc/NEWS.d/next/Security/2026-01-16-11-41-06.gh-issue-143921.AeCOor.rst | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
Index: Python-3.6.15/Lib/imaplib.py
===================================================================
--- Python-3.6.15.orig/Lib/imaplib.py 2026-02-12 17:36:33.669549150 +0100
+++ Python-3.6.15/Lib/imaplib.py 2026-02-12 17:43:28.599870273 +0100
@@ -128,7 +128,7 @@
# We compile these in _mode_xxx.
_Literal = br'.*{(?P<size>\d+)}$'
_Untagged_status = br'\* (?P<data>\d+) (?P<type>[A-Z-]+)( (?P<data2>.*))?'
-
+_control_chars = re.compile(b'[\x00-\x1F\x7F]')
class IMAP4:
@@ -958,6 +958,8 @@
if arg is None: continue
if isinstance(arg, str):
arg = bytes(arg, self._encoding)
+ if _control_chars.search(arg):
+ raise ValueError("Control characters not allowed in commands")
data = data + b' ' + arg
literal = self.literal
Index: Python-3.6.15/Lib/test/test_imaplib.py
===================================================================
--- Python-3.6.15.orig/Lib/test/test_imaplib.py 2026-02-12 17:36:33.669549150 +0100
+++ Python-3.6.15/Lib/test/test_imaplib.py 2026-02-12 17:45:17.478765301 +0100
@@ -14,7 +14,8 @@
import inspect
from test.support import (reap_threads, verbose, transient_internet,
- run_with_tz, run_with_locale, cpython_only)
+ run_with_tz, run_with_locale, cpython_only,
+ control_characters_c0)
import unittest
from unittest import mock
from datetime import datetime, timezone, timedelta
@@ -488,6 +489,12 @@
imap_class = imaplib.IMAP4
server_class = socketserver.TCPServer
+ def test_control_characters(self):
+ client, _ = self._setup(SimpleIMAPHandler)
+ for c0 in control_characters_c0():
+ with self.assertRaises(ValueError):
+ client.login(f'user{c0}', 'pass')
+
@unittest.skipUnless(ssl, "SSL not available")
class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase):
Index: Python-3.6.15/Misc/NEWS.d/next/Security/2026-01-16-11-41-06.gh-issue-143921.AeCOor.rst
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ Python-3.6.15/Misc/NEWS.d/next/Security/2026-01-16-11-41-06.gh-issue-143921.AeCOor.rst 2026-02-12 17:43:28.600715275 +0100
@@ -0,0 +1 @@
+Reject control characters in IMAP commands.