cookie: cap expire times to 400 days

The pending cookie RFC update (currently known as 6265bis draft-19) says

  Let cookie-age-limit be the maximum age of the cookie (which name of
  Max-Age and an attribute-value of expiry-time. SHOULD be 400 days or
  less.

This change makes received cookies over the wire get capped to 400 days.

It does not cap the expiry date of cookies loaded from file.

It does this by rounding the expire time to a even minute. This, to
allow the test suite to do the same and have a chance to get the same
number for stable testing without requiring a debug build.

The test script generates TWO numbers in the output file for each
%days[] used in the input test file, and the function that subsequently
compares and verifies output is fine with *either* of the two numbers.

This is done so that if the test case is generated the second
immediately before curl runs, that updated expiry number is also deemed
okay. It still checks for an exact match of either number.

Closes #15937
This commit is contained in:
Daniel Stenberg 2025-01-08 10:19:26 +01:00
parent 533dc84e6e
commit 386f570df6
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
10 changed files with 103 additions and 46 deletions

View file

@ -210,14 +210,14 @@ lock: cookie [Pigs in space]: 90
unlock: cookie [Pigs in space]: 91
loaded cookies:
-----------------
www.host.foo.com FALSE / FALSE 1993463787 test6 six_more
.www.host.foo.com TRUE / FALSE 1993463787 test6 six
.host.foo.com TRUE / FALSE 1896263787 test5 five
.host.foo.com TRUE / FALSE 2061978987 test4 overwritten4
.foo.com TRUE / FALSE 1896263787 test3 three
.host.foo.com TRUE / FALSE 1896263787 test2 two
.foo.com TRUE / FALSE 1993463787 test1 overwritten1
.host.foo.com TRUE / FALSE 1896263787 injected yes
www.host.foo.com FALSE / FALSE %days[400] test6 six_more
.www.host.foo.com TRUE / FALSE %days[400] test6 six
.host.foo.com TRUE / FALSE %days[400] test5 five
.host.foo.com TRUE / FALSE %days[400] test4 overwritten4
.foo.com TRUE / FALSE %days[400] test3 three
.host.foo.com TRUE / FALSE %days[400] test2 two
.foo.com TRUE / FALSE %days[400] test1 overwritten1
.host.foo.com TRUE / FALSE %days[400] injected yes
-----------------
try SHARE_CLEANUP...
lock: share [Pigs in space]: 92
@ -238,14 +238,14 @@ GLOBAL_CLEANUP
# https://curl.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
www.host.foo.com FALSE / FALSE 1993463787 test6 six_more
.www.host.foo.com TRUE / FALSE 1993463787 test6 six
.host.foo.com TRUE / FALSE 1896263787 test5 five
.host.foo.com TRUE / FALSE 2061978987 test4 overwritten4
.foo.com TRUE / FALSE 1896263787 test3 three
.host.foo.com TRUE / FALSE 1896263787 test2 two
.foo.com TRUE / FALSE 1993463787 test1 overwritten1
.host.foo.com TRUE / FALSE 1896263787 injected yes
www.host.foo.com FALSE / FALSE %days[400] test6 six_more
.www.host.foo.com TRUE / FALSE %days[400] test6 six
.host.foo.com TRUE / FALSE %days[400] test5 five
.host.foo.com TRUE / FALSE %days[400] test4 overwritten4
.foo.com TRUE / FALSE %days[400] test3 three
.host.foo.com TRUE / FALSE %days[400] test2 two
.foo.com TRUE / FALSE %days[400] test1 overwritten1
.host.foo.com TRUE / FALSE %days[400] injected yes
</file>
</verify>
</testcase>