Fix cookie exclusion for fetch CORS pre-flight requests (fixes #3596)

Cookies (and other credentials) will be excluded when appropriate by
downgrading |credentials_mode| from kSameOrigin to kOmit.

Improve logic for Origin header inclusion, including a fix for
Referrer/Origin calculation in URLRequestJob::ComputeReferrerForPolicy
when used with custom standard schemes.

Specify correct CookiePartitionKeyCollection when loading cookies.

To test:
- Run tests from https://browseraudit.com/ with and without
  `--disable-request-handling-for-testing`. Results are the same.
- Run `ceftests --gtest_filter=CorsTest.*`.
This commit is contained in:
Marshall Greenblatt
2023-11-16 18:19:27 -05:00
parent a9f1ce090a
commit cf934a20a7
10 changed files with 166 additions and 32 deletions

View File

@@ -40,22 +40,26 @@ void AddInternalSchemes(content::ContentClient::Schemes* schemes) {
// with Blink only.
for (size_t i = 0; i < sizeof(internal_schemes) / sizeof(internal_schemes[0]);
++i) {
if (internal_schemes[i].is_standard) {
schemes->standard_schemes.push_back(internal_schemes[i].scheme_name);
const auto& scheme = internal_schemes[i];
if (scheme.is_standard) {
schemes->standard_schemes.push_back(scheme.scheme_name);
if (!scheme.is_local && !scheme.is_display_isolated) {
schemes->referrer_schemes.push_back(scheme.scheme_name);
}
}
if (internal_schemes[i].is_local) {
schemes->local_schemes.push_back(internal_schemes[i].scheme_name);
if (scheme.is_local) {
schemes->local_schemes.push_back(scheme.scheme_name);
}
if (internal_schemes[i].is_secure) {
schemes->secure_schemes.push_back(internal_schemes[i].scheme_name);
if (scheme.is_secure) {
schemes->secure_schemes.push_back(scheme.scheme_name);
}
if (internal_schemes[i].is_cors_enabled) {
schemes->cors_enabled_schemes.push_back(internal_schemes[i].scheme_name);
if (scheme.is_cors_enabled) {
schemes->cors_enabled_schemes.push_back(scheme.scheme_name);
}
if (internal_schemes[i].is_csp_bypassing) {
schemes->csp_bypassing_schemes.push_back(internal_schemes[i].scheme_name);
if (scheme.is_csp_bypassing) {
schemes->csp_bypassing_schemes.push_back(scheme.scheme_name);
}
CefAppManager::Get()->AddCustomScheme(&internal_schemes[i]);
CefAppManager::Get()->AddCustomScheme(&scheme);
}
}