Skip to content

Commit a2faaef

Browse files
sethmlarsonhroncok
authored andcommitted
pythongh-143923: Reject control characters in POP3 commands (cherry-picked from commit b234a2b)
1 parent 2d8e2b6 commit a2faaef

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
@@ -12,6 +12,7 @@
1212
import unittest
1313
from unittest import TestCase, skipUnless
1414
from test import support as test_support
15+
from test.support import control_characters_c0
1516
from test.support import hashlib_helper
1617
from test.support import socket_helper
1718
from test.support import threading_helper
@@ -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)