Skip to content

Fix (#998): Will not expire/delete cookie from session when Set-Cookie only sets Max-Age=0 without Expires #1029

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

Merged
jkbrzt merged 5 commits into from
Feb 6, 2021
Merged

Fix (#998): Will not expire/delete cookie from session when Set-Cookie only sets Max-Age=0 without Expires #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d4c35f
Fix issue: #998
finik-dev-team Feb 5, 2021
8c116e8
Add test for issue: #998
finik-dev-team Feb 5, 2021
1654d71
Add yourself to the authors, issue: #998
finik-dev-team Feb 5, 2021
bcd67d1
data of test with error > stdin
finik-dev-team Feb 5, 2021
d4e57b2
Restored the test
finik-dev-team Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ Patches and ideas
* `Edward Yang <https://github.com/honorabrutroll>`_
* `Aleksandr Vinokurov <https://github.com/aleksandr-vin>`_
* `Jeff Byrnes <https://github.com/jeffbyrnes>`_
* `Denis Belavin <https://github.com/LuckyDenis>`_


9 changes: 9 additions & 0 deletions httpie/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ def is_expired(expires: Optional[float]) -> bool:
for attrs in attr_sets
]

# HACK/FIXME: https://github.com/psf/requests/issues/5743
for cookie in cookies:
if 'expires' in cookie:
continue

max_age = cookie.get('max-age')
if max_age and max_age.isdigit():
cookie['expires'] = now + float(max_age)

Comment thread
jkbrzt marked this conversation as resolved.
return [
{
'name': cookie['name'],
Expand Down
9 changes: 9 additions & 0 deletions tests/test_sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,15 @@ def test_expired_cookies(self, httpbin):
assert 'cookie1' in updated_session['cookies']
assert 'cookie2' not in updated_session['cookies']

def test_get_expired_cookies_using_max_age(self):
headers = [
('Set-Cookie', 'one=two; Max-Age=0; path=/; domain=.tumblr.com; HttpOnly')
]
expected_expired = [
{'name': 'one', 'path': '/'}
]
assert get_expired_cookies(headers, now=None) == expected_expired

@pytest.mark.parametrize(
argnames=['headers', 'now', 'expected_expired'],
argvalues=[
Expand Down