Skip to content

Commit 5859154

Browse files
committed
gh-143923: Reject control characters in POP3 commands
1 parent b6f733b commit 5859154

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

Lib/poplib.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ def _putline(self, line):
122122
def _putcmd(self, line):
123123
if self._debugging: print('*cmd*', repr(line))
124124
line = bytes(line, self.encoding)
125+
if re.search(b'[\x00-\x1F\x7F]', line):
126+
raise ValueError('Control characters not allowed in commands')
125127
self._putline(line)
126128

127129

Lib/test/test_poplib.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from test.support import threading_helper
1818
from test.support import asynchat
1919
from test.support import asyncore
20+
from test.support import control_characters_c0
2021

2122

2223
test_support.requires_working_socket(module=True)
@@ -395,6 +396,13 @@ def test_quit(self):
395396
self.assertIsNone(self.client.sock)
396397
self.assertIsNone(self.client.file)
397398

399+
def test_control_characters(self):
400+
for c0 in control_characters_c0():
401+
with self.assertRaises(ValueError):
402+
self.client.user(f'user{c0}')
403+
with self.assertRaises(ValueError):
404+
self.client.pass_(f'{c0}pass')
405+
398406
@requires_ssl
399407
def test_stls_capa(self):
400408
capa = self.client.capa()
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Reject control characters in POP3 commands.

0 commit comments

Comments
 (0)