Skip to content

Commit 56af3fc

Browse files
sethmlarsonhroncok
authored andcommitted
pythongh-143923: Reject control characters in POP3 commands (cherry-picked from commit b234a2b)
1 parent 22fd8d9 commit 56af3fc

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
@@ -367,6 +368,13 @@ def test_quit(self):
367368
self.assertIsNone(self.client.sock)
368369
self.assertIsNone(self.client.file)
369370

371+
def test_control_characters(self):
372+
for c0 in control_characters_c0():
373+
with self.assertRaises(ValueError):
374+
self.client.user(f'user{c0}')
375+
with self.assertRaises(ValueError):
376+
self.client.pass_(f'{c0}pass')
377+
370378
@requires_ssl
371379
def test_stls_capa(self):
372380
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)