RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:48:11 +00:00
Code Issues Activity Actions

LibWebView: Ensure we resolve cookie promises upon early returns

Browse source 
Note no test here, because this early return involves HTTP-only cookies,
which we don't have the infrastructure to test (we would need to support
custom HTTP headers in tests).
This commit is contained in:
Timothy Flynn 2024-03-06 12:28:10 -05:00 • committed by Tim Flynn
parent 18b71a363a
commit 5a20353bc4
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibWebView/CookieJar.cpp
View file

@ -373,6 +373,8 @@ void CookieJar::store_cookie(Web::Cookie::ParsedCookie const& parsed_cookie, con
// 11. If the cookie store contains a cookie with the same name, domain, and path as the newly created cookie: // 11. If the cookie store contains a cookie with the same name, domain, and path as the newly created cookie:
[this, source, sync_promise](auto& cookie, auto old_cookie) { [this, source, sync_promise](auto& cookie, auto old_cookie) {
ScopeGuard guard { [&]() { sync_promise->resolve({}); } };
// If the newly created cookie was received from a "non-HTTP" API and the old-cookie's http-only-flag is set, abort these // If the newly created cookie was received from a "non-HTTP" API and the old-cookie's http-only-flag is set, abort these
// steps and ignore the newly created cookie entirely. // steps and ignore the newly created cookie entirely.
if (source != Web::Cookie::Source::Http && old_cookie.http_only) if (source != Web::Cookie::Source::Http && old_cookie.http_only)
@ -384,7 +386,6 @@ void CookieJar::store_cookie(Web::Cookie::ParsedCookie const& parsed_cookie, con
// Remove the old-cookie from the cookie store. // Remove the old-cookie from the cookie store.
// NOTE: Rather than deleting then re-inserting this cookie, we update it in-place. // NOTE: Rather than deleting then re-inserting this cookie, we update it in-place.
update_cookie_in_database(cookie); update_cookie_in_database(cookie);
sync_promise->resolve({});
}, },
// 12. Insert the newly created cookie into the cookie store. // 12. Insert the newly created cookie into the cookie store.