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

[3.6] bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) #28038

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

Jump to bottom
Merged
merged 2 commits into from
Aug 30, 2021
Merged

[3.6] bpo-43124: Fix smtplib multiple CRLF injection (GH-25987) #28038

merged 2 commits into from
Aug 30, 2021

Conversation

miss-islington
Copy link
Contributor
@miss-islington miss-islington commented Aug 29, 2021 •
edited by bedevere-bot
Loading

Co-authored-by: Łukasz Langa lukasz@langa.pl
(cherry picked from commit 0897253)

Co-authored-by: Miguel Brito 5544985+miguendes@users.noreply.github.com

https://bugs.python.org/issue43124

@miguendes @miss-islington
bpo-43124: Fix smtplib multiple CRLF injection (pythonGH-25987)
f43b8d4 
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 0897253)

Co-authored-by: Miguel Brito <5544985+miguendes@users.noreply.github.com>
@miss-islington
Copy link
Contributor Author

@miguendes and @ambv: Status check is done, and it's a success ✅ .

@bedevere-bot bedevere-bot mentioned this pull request Aug 29, 2021
Merged
@miss-islington
Copy link
Contributor Author

@miguendes and @ambv: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Contributor Author

@miguendes and @ambv: Status check is done, and it's a success ✅ .
< 8000 !-- no margin wins, so we check it last and use its value if true. -->

@miss-islington
Copy link
Contributor Author

@miguendes and @ambv: Status check is done, and it's a failure ❌ .

@ambv
Copy link
Contributor
ambv commented Aug 29, 2021

Failure unrelated.

======================================================================
FAIL: test_fontlist_key (idlelib.idle_test.test_configdialog.FontPageTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/vsts/work/1/s/Lib/idlelib/idle_test/test_configdialog.py", line 104, in test_fontlist_key
    self.assertNotEqual(down_font, font)
AssertionError: 'DejaVu Sans' == 'DejaVu Sans'

@ambv
Copy link
Contributor
ambv commented Aug 29, 2021

@ned-deily, this is a low-pri sec fix.

@ned-deily ned-deily merged commit 29d97d1 into python:3.6 Aug 30, 2021
@miss-islington miss-islington deleted the backport-0897253-3.6 branch August 30, 2021 19:22
gentoo-bot pushed a commit to gentoo/cpython that referenced this pull request Aug 31, 2021
@miss-islington @mgorny
bpo-43124: Fix smtplib multiple CRLF injection (pythonGH-25987) (pyth…
11afbbe 
…onGH-28038)

Co-authored-by: Miguel Brito <5544985+miguendes@users.noreply.github.com>

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 0897253)

(updated for 2.7 by Michał Górny)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ned-deily ned-deily ned-deily approved these changes

Assignees

@ned-deily ned-deily

Labels
type-security A security issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@miss-islington @ambv @ned-deily @the-knights-who-say-ni @bedevere-bot @miguendes
0