Skip to content
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

Move cookie defaults to GetCookieSetting #651

Merged
merged 1 commit into from
Oct 18, 2018
Merged

Move cookie defaults to GetCookieSetting #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions components/content_settings/core/browser/brave_cookie_settings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ void BraveCookieSettings::GetCookieSetting(const GURL& url,
if (brave_1p_setting == CONTENT_SETTING_BLOCK) {
*cookie_setting = CONTENT_SETTING_BLOCK;
return;
} else if (brave_1p_setting == CONTENT_SETTING_DEFAULT) {
// in absence of an explicit rule, allow first-party cookies by default
brave_1p_setting = CONTENT_SETTING_ALLOW;
}

// Third party setting of allow, means always allow everything
Expand All @@ -77,6 +80,9 @@ void BraveCookieSettings::GetCookieSetting(const GURL& url,
if (brave_3p_setting == CONTENT_SETTING_ALLOW) {
*cookie_setting = CONTENT_SETTING_ALLOW;
return;
} else if (brave_3p_setting == CONTENT_SETTING_DEFAULT) {
// in absence of an explicit rule, block third-party cookies by default
brave_3p_setting = CONTENT_SETTING_BLOCK;
}

// Otherwise determine based on if the cookie is third-party or not.
Expand All @@ -86,8 +92,7 @@ void BraveCookieSettings::GetCookieSetting(const GURL& url,
if (SameDomainOrHost(url, first_party_url, INCLUDE_PRIVATE_REGISTRIES)) {
*cookie_setting = brave_1p_setting;
} else {
*cookie_setting = brave_3p_setting == CONTENT_SETTING_DEFAULT ?
CONTENT_SETTING_BLOCK : brave_3p_setting;
*cookie_setting = brave_3p_setting;
}
}
}
Expand Down
12 changes: 0 additions & 12 deletions components/content_settings/core/browser/brave_host_content_settings_map.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,12 @@ BraveHostContentSettingsMap::BraveHostContentSettingsMap(
bool migrate_requesting_and_top_level_origin_settings)
: HostContentSettingsMap(prefs, is_incognito_profile, is_guest_profile,
store_last_modified, migrate_requesting_and_top_level_origin_settings) {
InitializeCookieContentSetting();
InitializeFlashContentSetting();
}

BraveHostContentSettingsMap::~BraveHostContentSettingsMap() {
}

void BraveHostContentSettingsMap::InitializeCookieContentSetting() {
// We intentionally do not use the cookies content settings so that
// these special rules do not show up in Chromium UI.
SetContentSettingCustomScope(
ContentSettingsPattern::Wildcard(),
ContentSettingsPattern::FromString("https://firstParty/*"),
CONTENT_SETTINGS_TYPE_PLUGINS,
brave_shields::kCookies,
CONTENT_SETTING_ALLOW);
}

void BraveHostContentSettingsMap::InitializeFlashContentSetting() {
SetContentSettingCustomScope(
ContentSettingsPattern::Wildcard(),
Expand Down
1 change: 0 additions & 1 deletion components/content_settings/core/browser/brave_host_content_settings_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class BraveHostContentSettingsMap : public HostContentSettingsMap {
bool store_last_modified,
bool migrate_requesting_and_top_level_origin_settings);
private:
void InitializeCookieContentSetting();
void InitializeFlashContentSetting();
~BraveHostContentSettingsMap() override;
};
Expand Down