nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1803102 - Do not import cookie banner rules if the service is disabled during import. r=timhuang

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D163715
This commit is contained in:
Paul Zuehlcke 2022-12-07 15:25:33 +00:00
parent c89973144a
commit a3c18883ef
6 changed files with 27 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
toolkit/components/cookiebanners/CookieBannerListService.jsm
View file

@ -92,6 +92,15 @@ class CookieBannerListService {
try {
let rules = await this.#rs.get();
// While getting rules from RemoteSettings the enabled state of the
// feature could have changed. Ensure the service is still enabled before
// attempting to import rules.
if (!Services.cookieBanners.isEnabled) {
lazy.logConsole.warn("Skip import nsICookieBannerService is disabled");
return;
}
this.#importRules(rules);
} catch (error) {
lazy.logConsole.error(

10
toolkit/components/cookiebanners/nsCookieBannerService.cpp
View file

@ -176,6 +176,9 @@ nsresult nsCookieBannerService::Init() {
nsresult rv = NS_DispatchToCurrentThreadQueue(
NS_NewRunnableFunction("CookieBannerListService init startup",
[&] {
if (!mIsInitialized) {
return;
}
mListService->Init();
mDomainPrefService->Init();
}),
@ -209,6 +212,13 @@ nsresult nsCookieBannerService::Shutdown() {
return NS_OK;
}
NS_IMETHODIMP
nsCookieBannerService::GetIsEnabled(bool* aResult) {
*aResult = mIsInitialized;
return NS_OK;
}
NS_IMETHODIMP
nsCookieBannerService::GetRules(nsTArray<RefPtr<nsICookieBannerRule>>& aRules) {
aRules.Clear();

5
toolkit/components/cookiebanners/nsICookieBannerService.idl
View file

@ -38,6 +38,11 @@ interface nsICookieBannerService : nsISupports {
MODE_UNSET,
};
/**
* Whether the feature / service is enabled.
*/
readonly attribute boolean isEnabled;
/**
* Getter for a list of all cookie banner rules. This includes both opt-in and opt-out rules.
*/

2
toolkit/components/cookiebanners/test/browser/browser_bannerClicking_events.js
View file

@ -17,7 +17,7 @@ async function runEventTest({ mode, openPageOptions = {} }) {
});
// Insert rules only if the feature is enabled.
if (mode != Ci.nsICookieBannerService.MODE_DISABLED) {
if (Services.cookieBanners.isEnabled) {
insertTestClickRules();
}

7
toolkit/components/cookiebanners/test/browser/head.js
View file

@ -46,12 +46,7 @@ async function clickTestSetup() {
registerCleanupFunction(() => {
Services.prefs.clearUserPref("cookiebanners.service.mode");
Services.prefs.clearUserPref("cookiebanners.service.mode.privateBrowsing");
if (
Services.prefs.getIntPref("cookiebanners.service.mode") !=
Ci.nsICookieBannerService.MODE_DISABLED ||
Services.prefs.getIntPref("cookiebanners.service.mode.privateBrowsing") !=
Ci.nsICookieBannerService.MODE_DISABLED
) {
if (Services.cookieBanners.isEnabled) {
// Restore original rules.
Services.cookieBanners.resetRules(true);
}

1
toolkit/components/cookiebanners/test/unit/test_cookiebannerlistservice.js
View file

@ -171,6 +171,7 @@ add_setup(async () => {
let oldCookieBanners = Services.cookieBanners;
Services.cookieBanners = {
isEnabled: true,
insertRule,
removeRule,
resetRules() {},