8000 bpo-43124: Fix smtplib multiple CRLF injection by miguendes · Pull Request #25987 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-43124: Fix smtplib multiple CRLF injection #25987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 29, 2021
Merged

bpo-43124: Fix smtplib multiple CRLF injection #25987

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec13383
Fix smtplib multiple CRLF injection
miguendes May 8, 2021
4e0ee17
Respond to R. David Murray review suggestions
ambv Aug 29, 2021
61f2871
Improve Blurb wording
ambv Aug 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Respond to R. David Murray review suggestions
  • Loading branch information
@ambv
ambv committed Aug 29, 2021
commit 4e0ee170be5f4cf849a1a8f9f4e589c9bdadcce2
11 changes: 8 additions & 3 deletions Lib/smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,15 @@ def send(self, s):
def putcmd(self, cmd, args=""):
"""Send a command to the server."""
if args == "":
str = cmd
s = cmd
else:
str = '%s %s' % (cmd, args)
self.send('%s%s' % (str.replace('\n', '\\n'), CRLF))
s = f'{cmd} {args}'
if '\r' in s or '\n' in s:
s = s.replace('\n', '\\n').replace('\r', '\\r')
raise ValueError(
f'command and arguments contain prohibited newline characters: {s}'
)
self.send(f'{s}{CRLF}')

def getreply(self):
"""Get a reply from the server.
Expand Down
29 changes: 19 additions & 10 deletions Lib/test/test_smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,9 @@ def test_issue43124_putcmd_escapes_newline(self):
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
timeout=support.LOOPBACK_TIMEOUT)
self.addCleanup(smtp.close)
expected = (500, b'Error: command "HELO\\NX-INJECTED" not recognized')
smtp.putcmd('helo\nX-INJECTED')
self.assertEqual(smtp.getreply(), expected)
with self.assertRaises(ValueError) as exc:
smtp.putcmd('helo\nX-INJECTED')
self.assertIn("prohibited newline characters", str(exc.exception))
smtp.quit()

def testVRFY(self):
Expand Down Expand Up @@ -434,14 +434,18 @@ def test_issue43124_escape_localhostname(self):
smtp = smtplib.SMTP(HOST, self.port, local_hostname='hi\nX-INJECTED',
timeout=support.LOOPBACK_TIMEOUT)
self.addCleanup(smtp.close)
smtp.sendmail("hi@me.com", "you@me.com", m)
with self.assertRaises(ValueError) as exc:
smtp.sendmail("hi@me.com", "you@me.com", m)
self.assertIn(
"prohibited newline characters: ehlo hi\\nX-INJECTED",
str(exc.exception),
)
# XXX (see comment in testSend)
time.sleep(0.01)
smtp.quit()

debugout = smtpd.DEBUGSTREAM.getvalue()
ehlo = re.compile(r"ehlo hi\\\\nX-INJECTED", re.MULTILINE)
self.assertRegex(debugout, ehlo)
self.assertNotIn("X-INJECTED", debugout)

def test_issue43124_escape_options(self):
# see: https://bugs.python.org/issue43124
Expand All @@ -453,15 +457,20 @@ def test_issue43124_escape_options(self):

self.addCleanup(smtp.close)
smtp.sendmail("hi@me.com", "you@me.com", m)
smtp.mail("hi@me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
with self.assertRaises(ValueError) as exc:
smtp.mail("hi@me.com", ["X-OPTION\nX-INJECTED-1", "X-OPTION2\nX-INJECTED-2"])
msg = str(exc.exception)
self.assertIn("prohibited newline characters", msg)
self.assertIn("X-OPTION\\nX-INJECTED-1 X-OPTION2\\nX-INJECTED-2", msg)
# XXX (see comment in testSend)
time.sleep(0.01)
smtp.quit()

debugout = smtpd.DEBUGSTREAM.getvalue()
expected_opts = re.compile(r"mail FROM:<hi@me.com> X-OPTION\\\\nX-INJECTED-1 X-OPTION2\\\\nX-INJECTED-2",
re.MULTILINE)
self.assertRegex(debugout, expected_opts)
self.assertNotIn("X-OPTION", debugout)
self.assertNotIn("X-OPTION2", debugout)
self.assertNotIn("X-INJECTED-1", debugout)
self.assertNotIn("X-INJECTED-2", debugout)

def testSendNullSender(self):
m = 'A test message'
Expand Down
0