Skip to content
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

bpo-38945: UU Encoding: Removed newline characters from uu encoding methods #17418

Merged
merged 4 commits into from Dec 2, 2019

Conversation

@stealthcopter
Copy link
Contributor

stealthcopter commented Nov 30, 2019

@gvanrossum as discussed via email here is the PR for the uu encoding bug.

Sanitized filenames in UU encoding methods so that the filename cannot be overflowing in the UU encoded content area.

https://bugs.python.org/issue38945

@the-knights-who-say-ni

This comment has been minimized.

Copy link

the-knights-who-say-ni commented Nov 30, 2019

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@stealthcopter

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

mat
Copy link
Contributor

isidentical left a comment

AFAIK This PR needs tests and a BPO issue

@gvanrossum

This comment has been minimized.

Copy link
Member

gvanrossum commented Nov 30, 2019

@gvanrossum

This comment has been minimized.

Copy link
Member

gvanrossum commented Nov 30, 2019

I take it back, it needs both a bpo issue and tests.

@gvanrossum

This comment has been minimized.

Copy link
Member

gvanrossum commented Nov 30, 2019

This is a security issue and needs backports to all live versions. I expect that the 2.7 backport will need some manual help, as the code is superficially different there.

@stealthcopter stealthcopter changed the title UU Encoding: Removed newline characters from uu encoding methods bpo-38945: UU Encoding: Removed newline characters from uu encoding methods Dec 1, 2019
mat
Copy link
Member

gvanrossum left a comment

LGTM. Waiting for CLA and news blurb.

@stealthcopter: Can you add a news blurb per instructions from the failing test? (If you can't let me know and I can see if I can remember how to do it.)

@gvanrossum

This comment has been minimized.

Copy link
Member

gvanrossum commented Dec 2, 2019

@stealthcopter Are you sure you submitted the CLA properly?

@stealthcopter

This comment has been minimized.

Copy link
Contributor Author

stealthcopter commented Dec 2, 2019

@gvanrossum I just clicked on the 'check yourself' link and it looks like it kicked it into working :)

@gvanrossum gvanrossum merged commit a62ad47 into python:master Dec 2, 2019
4 checks passed
4 checks passed
Azure Pipelines PR #20191201.27 succeeded
Details
bedevere/issue-number Issue number 38945 found
Details
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington

This comment has been minimized.

Copy link

miss-islington commented Dec 2, 2019

Thanks @stealthcopter for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7, 3.8.
🐍🍒🤖

@bedevere-bot

This comment has been minimized.

Copy link

bedevere-bot commented Dec 2, 2019

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

miss-islington added a commit to miss-islington/cpython that referenced this pull request Dec 2, 2019
…put format (pythonGH-17418)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
@bedevere-bot

This comment has been minimized.

Copy link

bedevere-bot commented Dec 2, 2019

GH-17442 is a backport of this pull request to the 3.8 branch.

@bedevere-bot

This comment has been minimized.

Copy link

bedevere-bot commented Dec 2, 2019

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

@gvanrossum

This comment has been minimized.

Copy link
Member

gvanrossum commented Dec 2, 2019

Thanks! I didn't even know that that feature existed. :-) Now on to the backports.

@bedevere-bot

This comment has been minimized.

Copy link

bedevere-bot commented Dec 2, 2019

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

@miss-islington

This comment has been minimized.

Copy link

miss-islington commented Dec 2, 2019

Sorry, @stealthcopter and @gvanrossum, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a62ad4730c9b575f140f24074656c0257c86a09a 2.7

miss-islington added a commit to miss-islington/cpython that referenced this pull request Dec 2, 2019
…put format (pythonGH-17418)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
miss-islington added a commit to miss-islington/cpython that referenced this pull request Dec 2, 2019
…put format (pythonGH-17418)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
@gvanrossum

This comment has been minimized.

Copy link
Member

gvanrossum commented Dec 2, 2019

@stealthcopter Can you try the 2.7 backport? I think it's simple enough, there's an unrelated change on a nearby line.

@stealthcopter

This comment has been minimized.

Copy link
Contributor Author

stealthcopter commented Dec 2, 2019

@gvanrossum yup no problem, I'll get this done tomorrow.

miss-islington added a commit that referenced this pull request Dec 2, 2019
…put format (GH-17418)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Dec 2, 2019
…put format (GH-17418)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
ned-deily added a commit that referenced this pull request Dec 2, 2019
…put format (GH-17418) (GH-17444)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
ned-deily added a commit to ned-deily/cpython that referenced this pull request Dec 3, 2019
…put format (pythonGH-17418) (pythonGH-17444)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
stealthcopter added a commit to stealthcopter/cpython that referenced this pull request Dec 3, 2019
…he output format (pythonGH-17418).

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
@bedevere-bot

This comment has been minimized.

Copy link

bedevere-bot commented Dec 3, 2019

GH-17452 is a backport of this pull request to the 2.7 branch.

@stealthcopter

This comment has been minimized.

Copy link
Contributor Author

stealthcopter commented Dec 3, 2019

Ok, think I've done it all now, sorry for the delay I had a bit of a battle with git.

gvanrossum added a commit that referenced this pull request Dec 3, 2019
…he output format (GH-17418). (#17452)

(cherry picked from commit a62ad47)

Co-authored-by: Matthew Rollings <1211162+stealthcopter@users.noreply.github.com>
jacobneiltaylor added a commit to jacobneiltaylor/cpython that referenced this pull request Dec 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.