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

Fix decoding base64 chunk for BodyPartReader #3867

Merged
merged 3 commits into from
Jul 5, 2019
Merged

Fix decoding base64 chunk for BodyPartReader #3867

merged 3 commits into from
Jul 5, 2019

Conversation

hyzyla
Copy link
Contributor

@hyzyla hyzyla commented Jun 25, 2019

What do these changes do?

Those changes add the additional reading of few bytes in BodyPartReader.read_chunk if the size of the chunk is not valid for base64 decoding.

Are there changes in behavior for the user?

Yes, because if someone will try to use read_chunk for the body that has transfer encoding equal to base64, can receive more than expected bytes.

Related issue number

#3843

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES folder
    • name it <issue_id>.<type> for example (588.bugfix)
    • if you don't have an issue_id change it to the pr id after creating the pr
    • ensure type is one of the following:
      • .feature: Signifying a new feature.
      • .bugfix: Signifying a bug fix.
      • .doc: Signifying a documentation improvement.
      • .removal: Signifying a deprecation or removal of public API.
      • .misc: A ticket has been closed, but it is not of interest to users.
    • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

@hyzyla hyzyla requested a review from asvetlov as a code owner June 25, 2019 07:50
@asvetlov asvetlov merged commit aeb01ce into aio-libs:master Jul 5, 2019
@asvetlov
Copy link
Member

asvetlov commented Jul 5, 2019

Thanks!

asvetlov pushed a commit that referenced this pull request Jul 5, 2019
(cherry picked from commit aeb01ce)

Co-authored-by: Yevhenii Hyzyla <hyzyla@gmail.com>
@Dreamsorcerer
Copy link
Member

Think a backport got screwed up here...

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 12, 2024
Copy link
Contributor

patchback bot commented Aug 12, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply aeb01ce on top of patchback/backports/3.11/aeb01ce3bda7497d7cc6c434ac6806aca291e273/pr-3867

Backporting merged PR #3867 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/aeb01ce3bda7497d7cc6c434ac6806aca291e273/pr-3867 upstream/3.11
  4. Now, cherry-pick PR Fix decoding base64 chunk for BodyPartReader #3867 contents into that branch:
    $ git cherry-pick -x aeb01ce3bda7497d7cc6c434ac6806aca291e273
    If it'll yell at you with something like fatal: Commit aeb01ce3bda7497d7cc6c434ac6806aca291e273 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x aeb01ce3bda7497d7cc6c434ac6806aca291e273
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix decoding base64 chunk for BodyPartReader #3867 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/aeb01ce3bda7497d7cc6c434ac6806aca291e273/pr-3867
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Aug 12, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply aeb01ce on top of patchback/backports/3.10/aeb01ce3bda7497d7cc6c434ac6806aca291e273/pr-3867

Backporting merged PR #3867 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/aeb01ce3bda7497d7cc6c434ac6806aca291e273/pr-3867 upstream/3.10
  4. Now, cherry-pick PR Fix decoding base64 chunk for BodyPartReader #3867 contents into that branch:
    $ git cherry-pick -x aeb01ce3bda7497d7cc6c434ac6806aca291e273
    If it'll yell at you with something like fatal: Commit aeb01ce3bda7497d7cc6c434ac6806aca291e273 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x aeb01ce3bda7497d7cc6c434ac6806aca291e273
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix decoding base64 chunk for BodyPartReader #3867 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/aeb01ce3bda7497d7cc6c434ac6806aca291e273/pr-3867
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Dreamsorcerer pushed a commit that referenced this pull request Aug 12, 2024
Dreamsorcerer pushed a commit that referenced this pull request Aug 12, 2024
Dreamsorcerer added a commit that referenced this pull request Aug 12, 2024
(cherry picked from commit aeb01ce)

---------

Co-authored-by: Yevhenii Hyzyla <hyzyla@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Dreamsorcerer added a commit that referenced this pull request Aug 12, 2024
(cherry picked from commit aeb01ce)

---------

Co-authored-by: Yevhenii Hyzyla <hyzyla@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants