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

Issue 5571 #5839

Merged
merged 9 commits into from Oct 24, 2021
Merged

Issue 5571 #5839

merged 9 commits into from Oct 24, 2021

Conversation

derlih
Copy link
Contributor

@derlih derlih commented Jun 29, 2021

What do these changes do?

Add treat_as_secure_origin in CookieJar contructor parameter

Are there changes in behavior for the user?

No

Related issue number

Fixes #5571

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."

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jun 29, 2021
@codecov
Copy link

codecov bot commented Jun 29, 2021

Codecov Report

Merging #5839 (980e31c) into master (ccb9c0f) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5839   +/-   ##
=======================================
  Coverage   93.34%   93.34%           
=======================================
  Files         102      102           
  Lines       30088    30112   +24     
  Branches     2689     2694    +5     
=======================================
+ Hits        28085    28109   +24     
  Misses       1829     1829           
  Partials      174      174           
Flag Coverage Δ
unit 93.27% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
aiohttp/cookiejar.py 98.83% <100.00%> (+0.05%) ⬆️
tests/test_cookiejar.py 99.06% <100.00%> (+0.03%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ccb9c0f...980e31c. Read the comment docs.

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jun 29, 2021

This pull request introduces 1 alert when merging 6243210 into 10995e8 - view on LGTM.com

new alerts:

  • 1 for Variable defined multiple times

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jun 29, 2021

This pull request introduces 1 alert when merging 841f742 into 10995e8 - view on LGTM.com

new alerts:

  • 1 for Variable defined multiple times

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jun 29, 2021

This pull request introduces 1 alert when merging 7d89e7c into 10995e8 - view on LGTM.com

new alerts:

  • 1 for Variable defined multiple times

@lgtm-com
Copy link
Contributor

lgtm-com bot commented Jun 29, 2021

This pull request introduces 1 alert when merging f944b59 into 10995e8 - view on LGTM.com

new alerts:

  • 1 for Variable defined multiple times

@asvetlov asvetlov enabled auto-merge (squash) October 24, 2021 09:26
@asvetlov asvetlov enabled auto-merge (squash) October 24, 2021 09:31
@lgtm-com
Copy link
Contributor

lgtm-com bot commented Oct 24, 2021

This pull request introduces 1 alert when merging 980e31c into 3dea782 - view on LGTM.com

new alerts:

  • 1 for Variable defined multiple times

@asvetlov asvetlov merged commit 28a806d into aio-libs:master Oct 24, 2021
@patchback
Copy link
Contributor

patchback bot commented Oct 24, 2021

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

❌ Failed to cleanly apply 28a806d on top of patchback/backports/3.8/28a806d8a972fded464e3dc78b2b033a619ee059/pr-5839

Backporting merged PR #5839 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.8/28a806d8a972fded464e3dc78b2b033a619ee059/pr-5839 upstream/3.8
  4. Now, cherry-pick PR Issue 5571 #5839 contents into that branch:
    $ git cherry-pick -x 28a806d8a972fded464e3dc78b2b033a619ee059
    If it'll yell at you with something like fatal: Commit 28a806d8a972fded464e3dc78b2b033a619ee059 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 28a806d8a972fded464e3dc78b2b033a619ee059
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Issue 5571 #5839 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.8/28a806d8a972fded464e3dc78b2b033a619ee059/pr-5839
  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.

@aio-libs-github-bot
Copy link
Contributor

💔 Backport was not successful

The PR was attempted backported to the following branches:

  • ❌ 3.8: Commit could not be cherrypicked due to conflicts

asvetlov added a commit that referenced this pull request Oct 24, 2021
By default, the transport is secure if https or wss scheme is used.
Use `CookieJar(treat_as_secure_origin="http://127.0.0.1")` to override the default security checker.

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
@derlih derlih deleted the issue_5571 branch October 24, 2021 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Client: ClientSession will not send secure cookie to localhost on unsecure connection.
2 participants