This is an automated email from the ASF dual-hosted git repository. nickva pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/couchdb-gun.git
commit e70618b85eea982291d229b1653e1c4b9cb6a012 Author: Loïc Hoguin <[email protected]> AuthorDate: Fri Oct 2 17:36:28 2026 +0200 Drop expired cookies when querying the jar A cookie is expired when the current time is at or after its expiry time, including on a query for a different URI. --- src/gun_cookies.erl | 29 +++++++++++++++++++++++++++++ src/gun_cookies_list.erl | 20 ++++++++++++++++---- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/gun_cookies.erl b/src/gun_cookies.erl index 41b0865..0bb4421 100644 --- a/src/gun_cookies.erl +++ b/src/gun_cookies.erl @@ -1051,4 +1051,33 @@ samesite_none_requires_secure_test() -> #{same_site => lax}), {ok, [#{same_site := lax}], _} = query(Store, Http), ok. + +%% Expired cookies are removed when the store is queried. +query_drops_expired_test() -> + URI = #{scheme => <<"http">>, host => <<"example.org">>, path => <<"/">>}, + Now = erlang:universaltime(), + Past = {{2020, 1, 1}, {0, 0, 0}}, + {gun_cookies_list, State0} = gun_cookies_list:init(), + Base = #{ + name => <<"live">>, + value => <<"1">>, + domain => <<"example.org">>, + path => <<"/">>, + creation_time => Now, + last_access_time => Now, + expiry_time => infinity, + persistent => false, + host_only => true, + secure_only => false, + http_only => false, + same_site => default + }, + Expired = Base#{name => <<"exp">>, expiry_time => Past, persistent => true}, + EqualNow = Base#{name => <<"now">>, expiry_time => Now, persistent => true}, + Store0 = {gun_cookies_list, State0#{cookies => [Expired, EqualNow, Base]}}, + {ok, Cookies, Store} = gun_cookies:query(Store0, URI), + [<<"live">>] = [N || #{name := N} <- Cookies], + {gun_cookies_list, #{cookies := Left}} = Store, + [<<"live">>] = [N || #{name := N} <- Left], + ok. -endif. diff --git a/src/gun_cookies_list.erl b/src/gun_cookies_list.erl index 0fb15f9..9b30439 100644 --- a/src/gun_cookies_list.erl +++ b/src/gun_cookies_list.erl @@ -59,8 +59,16 @@ query(State=#{cookies := Cookies}, URI) -> query(State, _, [], _, CookieList, Cookies) -> {ok, CookieList, State#{cookies => Cookies}}; -query(State, URI=#{scheme := Scheme, host := Host, path := Path}, - [Cookie|Tail], CurrentTime, CookieList, Acc) -> +query(State, URI, [Cookie|Tail], CurrentTime, CookieList, Acc) -> + case expired(Cookie, CurrentTime) of + true -> + query(State, URI, Tail, CurrentTime, CookieList, Acc); + false -> + query_match(State, URI, Cookie, Tail, CurrentTime, CookieList, Acc) + end. + +query_match(State, URI=#{scheme := Scheme, host := Host, path := Path}, + Cookie, Tail, CurrentTime, CookieList, Acc) -> Match0 = case Cookie of #{host_only := true, domain := Host} -> true; @@ -154,8 +162,12 @@ gc(State=#{cookies := Cookies0, max_cookies := MaxCookies, {ok, State#{cookies => Cookies}}. drop_expired(Cookies, CurrentTime) -> - [C || C=#{expiry_time := ExpiryTime} <- Cookies, - (ExpiryTime =:= infinity) orelse (ExpiryTime >= CurrentTime)]. + [C || C <- Cookies, not expired(C, CurrentTime)]. + +expired(#{expiry_time := infinity}, _) -> + false; +expired(#{expiry_time := ExpiryTime}, CurrentTime) -> + CurrentTime >= ExpiryTime. room(infinity) -> infinity; room(Max) -> Max - 1.
