[proxy] web.archive.org — ← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public
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.

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

bpo-30835: email: Fix AttributeError when parsing invalid CTE #13598

Merged
merged 2 commits into from Jun 4, 2019
Merged

bpo-30835: email: Fix AttributeError when parsing invalid CTE #13598

merged 2 commits into from Jun 4, 2019

Conversation

Copy link
Contributor

maxking commented May 27, 2019 •
edited by bedevere-bot

This is basically #2544 along with a test and NEWS entry.

The bugfix + test was originally written by @adjlinux. I added the NEWS entry to get this merged since the orignial PR seems to be abandoned.

https://bugs.python.org/issue30835

ajdlinux and others added 2 commits Jul 3, 2017
bpo-30835: email: Fix AttributeError when parsing invalid Content-Tra…
193eabe 
…nsfer-Encoding

Parsing an email containing a multipart Content-Type, along with a
Content-Transfer-Encoding containing an invalid (non-ASCII-decodable) byte
will fail. email.feedparser.FeedParser._parsegen() gets the header and
attempts to convert it to lowercase before comparing it with the accepted
encodings, but as the header contains an invalid byte, it's returned as a
Header object rather than a str.

Cast the Content-Transfer-Encoding header to a str to avoid this.

Found using the AFL fuzzer.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Andrew Donnellan <andrew@donnellan.id.au>
Add email and NEWS entry for the bugfix.
f5f760c
maxking requested a review from a team as a code owner May 27, 2019
eamanu reviewed May 28, 2019
View changes
Copy link
Contributor

eamanu left a comment

LGTM. I test it on debian 9 and work ok

auvipy approved these changes May 31, 2019
View changes
brettcannon added the type-bug An unexpected behavior, bug, or error label Jun 3, 2019
warsaw merged commit aa79707 into python:master Jun 4, 2019
Copy link
Contributor

miss-islington commented Jun 4, 2019

Thanks @maxking for the PR, and @warsaw for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

Copy link

bedevere-bot commented Jun 4, 2019

GH-13820 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 4, 2019
bpo-30835: email: Fix AttributeError when parsing invalid CTE (python…
ee52aeb 
…GH-13598)

* bpo-30835: email: Fix AttributeError when parsing invalid Content-Transfer-Encoding

Parsing an email containing a multipart Content-Type, along with a
Content-Transfer-Encoding containing an invalid (non-ASCII-decodable) byte
will fail. email.feedparser.FeedParser._parsegen() gets the header and
attempts to convert it to lowercase before comparing it with the accepted
encodings, but as the header contains an invalid byte, it's returned as a
Header object rather than a str.

Cast the Content-Transfer-Encoding header to a str to avoid this.

Found using the AFL fuzzer.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Andrew Donnellan <andrew@donnellan.id.au>

* Add email and NEWS entry for the bugfix.
(cherry picked from commit aa79707)

Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 4, 2019
bpo-30835: email: Fix AttributeError when parsing invalid CTE (python…
5e6b545 
…GH-13598)

* bpo-30835: email: Fix AttributeError when parsing invalid Content-Transfer-Encoding

Parsing an email containing a multipart Content-Type, along with a
Content-Transfer-Encoding containing an invalid (non-ASCII-decodable) byte
will fail. email.feedparser.FeedParser._parsegen() gets the header and
attempts to convert it to lowercase before comparing it with the accepted
encodings, but as the header contains an invalid byte, it's returned as a
Header object rather than a str.

Cast the Content-Transfer-Encoding header to a str to avoid this.

Found using the AFL fuzzer.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Andrew Donnellan <andrew@donnellan.id.au>

* Add email and NEWS entry for the bugfix.
(cherry picked from commit aa79707)

Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
Copy link

bedevere-bot commented Jun 4, 2019

GH-13821 is a backport of this pull request to the 3.6 branch.

warsaw mentioned this pull request Jun 4, 2019
Closed
miss-islington added a commit that referenced this pull request Jun 5, 2019
bpo-30835: email: Fix AttributeError when parsing invalid CTE (GH-13598)
f62a372 
* bpo-30835: email: Fix AttributeError when parsing invalid Content-Transfer-Encoding

Parsing an email containing a multipart Content-Type, along with a
Content-Transfer-Encoding containing an invalid (non-ASCII-decodable) byte
will fail. email.feedparser.FeedParser._parsegen() gets the header and
attempts to convert it to lowercase before comparing it with the accepted
encodings, but as the header contains an invalid byte, it's returned as a
Header object rather than a str.

Cast the Content-Transfer-Encoding header to a str to avoid this.

Found using the AFL fuzzer.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Andrew Donnellan <andrew@donnellan.id.au>

* Add email and NEWS entry for the bugfix.
(cherry picked from commit aa79707)

Co-authored-by: Abhilash Raj <maxking@users.noreply.github.com>
Copy link

bedevere-bot commented Jun 5, 2019

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot x86 Gentoo Installed with X 3.7 has failed when building commit f62a372.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/108/builds/1135) and take a look at the build logs.
  4. Check if the failure is related to this commit (f62a372) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/108/builds/1135

Click to see traceback logs 
From https://github.com/python/cpython
 * branch                  3.7        -> FETCH_HEAD
Reset branch '3.7'

maxking deleted the gh-2544 branch Jun 5, 2019
Copy link
Contributor Author

maxking commented Jun 5, 2019

I don't think this failure is related to the change addresses in this PR.

DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
bpo-30835: email: Fix AttributeError when parsing invalid CTE (python…
d7a922f 
…GH-13598)

* bpo-30835: email: Fix AttributeError when parsing invalid Content-Transfer-Encoding

Parsing an email containing a multipart Content-Type, along with a
Content-Transfer-Encoding containing an invalid (non-ASCII-decodable) byte
will fail. email.feedparser.FeedParser._parsegen() gets the header and
attempts to convert it to lowercase before comparing it with the accepted
encodings, but as the header contains an invalid byte, it's returned as a
Header object rather than a str.

Cast the Content-Transfer-Encoding header to a str to avoid this.

Found using the AFL fuzzer.

Reported-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Andrew Donnellan <andrew@donnellan.id.au>

* Add email and NEWS entry for the bugfix.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

eamanu

auvipy

email-team

Assignees
No one assigned
Labels
type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants