Skip to content

Commit 3f72834

Browse files
sethmlarsonhroncok
authored andcommitted
pythongh-143923: Reject control characters in POP3 commands (cherry-picked from commit b234a2b)
1 parent 48dc5da commit 3f72834

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

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
@@ -14,6 +14,7 @@
1414
import unittest
1515
from unittest import TestCase, skipUnless
1616
from test import support as test_support
17+
from test.support import control_characters_c0
1718
from test.support import hashlib_helper
1819
from test.support import socket_helper
1920

@@ -360,6 +361,13 @@ def test_quit(self):
360361
self.assertIsNone(self.client.sock)
361362
self.assertIsNone(self.client.file)
362363

364+
def test_control_characters(self):
365+
for c0 in control_characters_c0():
366+
with self.assertRaises(ValueError):
367+
self.client.user(f'user{c0}')
368+
with self.assertRaises(ValueError):
369+
self.client.pass_(f'{c0}pass')
370+
363371
@requires_ssl
364372
def test_stls_capa(self):
365373
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)