Skip to content

[3.5] bpo-34155: Dont parse domains containing @ (GH-13079) #15317

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 1 commit into from
Sep 7, 2019
Merged

[3.5] bpo-34155: Dont parse domains containing @ (GH-13079) #15317

merged 1 commit into from
Sep 7, 2019

Conversation

maxking
Copy link
Contributor

@maxking maxking commented Aug 17, 2019 •
edited by bedevere-bot
Loading

Before:

    >>> email.message_from_string('From: a@malicious.org@important.com', policy=email.policy.default)['from'].addresses
    (Address(display_name='', username='a', domain='malicious.org'),)

    >>> parseaddr('a@malicious.org@important.com')
    ('', 'a@malicious.org')

After:

    >>> email.message_from_string('From: a@malicious.org@important.com', policy=email.policy.default)['from'].addresses
    (Address(display_name='', username='', domain=''),)

    >>> parseaddr('a@malicious.org@important.com')
    ('', 'a@')

https://bugs.python.org/issue34155
(cherry picked from commit 8cb65d1)

Co-authored-by: jpic jpic@users.noreply.github.com

https://bugs.python.org/issue34155

@jpic @maxking
[3.5] bpo-34155: Dont parse domains containing @ (pythonGH-13079)
2b98ade 
Before:

        >>> email.message_from_string('From: a@malicious.org@important.com', policy=email.policy.default)['from'].addresses
        (Address(display_name='', username='a', domain='malicious.org'),)

        >>> parseaddr('a@malicious.org@important.com')
        ('', 'a@malicious.org')

    After:

        >>> email.message_from_string('From: a@malicious.org@important.com', policy=email.policy.default)['from'].addresses
        (Address(display_name='', username='', domain=''),)

        >>> parseaddr('a@malicious.org@important.com')
        ('', 'a@')

https://bugs.python.org/issue34155
(cherry picked from commit 8cb65d1)

Co-authored-by: jpic <jpic@users.noreply.github.com>
@bedevere-bot bedevere-bot added the type-security A security issue label Aug 17, 2019
@alex alex requested a review from larryhastings August 17, 2019 20:53
@alex
Copy link
Member

alex commented Aug 17, 2019

This needs a review from the 3.5 RM if this is going to be backported.

vstinner
vstinner approved these changes Aug 19, 2019
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM: same change than 8cb65d1 already merged into master.

@vstinner
Copy link
Member

@larryhastings: Would you mind to merge this security fix?

@larryhastings larryhastings merged commit 063eba2 into python:3.5 Sep 7, 2019
@bedevere-bot
Copy link

@larryhastings: Please replace # with GH- in the commit message next time. Thanks!

@larryhastings
Copy link
Contributor

Thanks for the backport and the 3.5 love!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

@larryhastings larryhastings Awaiting requested review from larryhastings

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

Successfully merging this pull request may close these issues.
7 participants
@maxking @alex @vstinner @bedevere-bot @larryhastings @the-knights-who-say-ni @jpic