Merge pull request #772 from wanhose/v7.1.4

7.1.4
This commit is contained in:
wanhose 2024-08-11 11:00:20 +02:00 committed by GitHub
commit df97de8d6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 461 additions and 382 deletions

View File

@ -575,6 +575,369 @@
"selector": "[title=\"ACCEPT AND CONTINUE\"]" "selector": "[title=\"ACCEPT AND CONTINUE\"]"
} }
], ],
"rules": [
{
"id": 1,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||app.usercentrics.eu^"
}
},
{
"id": 2,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||c.evidon.com^"
}
},
{
"id": 3,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cdn.cookielaw.org^"
}
},
{
"id": 4,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cdn.optable.co^"
}
},
{
"id": 5,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cdntranscend.eventbrite.com^"
}
},
{
"id": 6,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||chollometro.com/assets/js/CookiesMessage*.js^"
}
},
{
"id": 7,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cmp.inmobi.com^"
}
},
{
"id": 8,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||consent.trustarc.com^"
}
},
{
"id": 9,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||consent.cookiebot.com^"
}
},
{
"id": 10,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||consentcdn.cookiebot.com^"
}
},
{
"id": 11,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cp.as.com^"
}
},
{
"id": 12,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||eu.fastcmp.com^"
}
},
{
"id": 13,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||lensois.com/wp-admin/admin-ajax.php"
}
},
{
"id": 14,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||optanon.blob.core.windows.net^"
}
},
{
"id": 15,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||redditstatic.com/onetrust.*.js"
}
},
{
"id": 16,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||sdk.privacy-center.org^"
}
},
{
"id": 17,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||static.fastcmp.com^"
}
},
{
"id": 18,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||wcpstatic.microsoft.com^"
}
},
{
"id": 19,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||webtools.europa.eu/js/webtools.cck.js^"
}
}
],
"skips": { "skips": {
"domains": [ "domains": [
"app.diagrams.net", "app.diagrams.net",
@ -834,6 +1197,7 @@
] ]
}, },
"tokens": { "tokens": {
"backdrops": [".modal-backdrop", ".offcanvas-backdrop", ".overlay"],
"classes": [ "classes": [
"appconsent_noscroll", "appconsent_noscroll",
"b-modal-banner--disabled", "b-modal-banner--disabled",
@ -13700,5 +14064,5 @@
"ytd-consent-bump-v2-lightbox" "ytd-consent-bump-v2-lightbox"
] ]
}, },
"version": "1723359332975" "version": "1723360939225"
} }

View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 3, "manifest_version": 3,
"name": "Cookie Dialog Monster", "name": "Cookie Dialog Monster",
"version": "7.1.3", "version": "7.1.4",
"default_locale": "en", "default_locale": "en",
"description": "__MSG_appDesc__", "description": "__MSG_appDesc__",
"icons": { "icons": {
@ -59,17 +59,8 @@
"run_at": "document_start" "run_at": "document_start"
} }
], ],
"declarative_net_request": {
"rule_resources": [
{
"enabled": true,
"id": "ruleset",
"path": "rules.json"
}
]
},
"host_permissions": ["http://*/*", "https://*/*"], "host_permissions": ["http://*/*", "https://*/*"],
"permissions": ["contextMenus", "declarativeNetRequest", "scripting", "storage"], "permissions": ["contextMenus", "declarativeNetRequest", "scripting", "storage", "webRequest"],
"web_accessible_resources": [ "web_accessible_resources": [
{ {
"matches": ["http://*/*", "https://*/*"], "matches": ["http://*/*", "https://*/*"],

View File

@ -1,325 +0,0 @@
[
{
"id": 1,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||app.usercentrics.eu^"
}
},
{
"id": 2,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||c.evidon.com^"
}
},
{
"id": 3,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cdn.cookielaw.org^"
}
},
{
"id": 4,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cdn.optable.co^"
}
},
{
"id": 5,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cdntranscend.eventbrite.com^"
}
},
{
"id": 6,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cmp.inmobi.com^"
}
},
{
"id": 7,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||consent.trustarc.com^"
}
},
{
"id": 8,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||consent.cookiebot.com^"
}
},
{
"id": 10,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||consentcdn.cookiebot.com^"
}
},
{
"id": 11,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||cp.as.com^"
}
},
{
"id": 12,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||eu.fastcmp.com^"
}
},
{
"id": 13,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||lensois.com/wp-admin/admin-ajax.php"
}
},
{
"id": 14,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||optanon.blob.core.windows.net^"
}
},
{
"id": 15,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||redditstatic.com/onetrust.*.js"
}
},
{
"id": 16,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||static.fastcmp.com^"
}
},
{
"id": 17,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||wcpstatic.microsoft.com^"
}
},
{
"id": 18,
"priority": 1,
"action": {
"type": "block"
},
"condition": {
"resourceTypes": [
"font",
"image",
"media",
"object",
"script",
"stylesheet",
"xmlhttprequest"
],
"urlFilter": "||webtools.europa.eu/js/webtools.cck.js^"
}
}
]

View File

@ -233,3 +233,43 @@ browser.runtime.onInstalled.addListener(() => {
browser.runtime.onStartup.addListener(() => { browser.runtime.onStartup.addListener(() => {
refreshData(); refreshData();
}); });
/**
* @description Listen to the moment before a request is made to apply the rules
*/
browser.webRequest.onBeforeRequest.addListener(
async (details) => {
const { tabId, type, url } = details;
if (tabId > -1 && type === 'main_frame') {
const manifest = browser.runtime.getManifest();
const excludeMatches = manifest.content_scripts[0].exclude_matches;
const excludePatterns = excludeMatches.map(
(match) => `^${match.replaceAll('*.', '*(.)?').replaceAll('*', '.*')}$`
);
if (excludePatterns.some((pattern) => new RegExp(pattern).test(url))) {
return;
}
const hostname = url.split('.').slice(-3).join('.').replace('www.', '');
const store = await storage.get(hostname);
const state = store[hostname] ?? { enabled: true };
if (state.enabled) {
const { data } = await storage.get('data');
if (data?.rules?.length) {
browser.declarativeNetRequest.updateSessionRules({
addRules: data.rules.map((rule) => ({
...rule,
condition: { ...rule.condition, tabIds: [tabId] },
})),
removeRuleIds: data.rules.map((rule) => rule.id),
});
}
}
}
},
{ urls: ['<all_urls>'] }
);

View File

@ -1,28 +1,28 @@
/** /**
* @typedef {Object} ExtensionData * @typedef {Object} ExtensionData
* @property {string[] | undefined} commonWords * @property {string[]} commonWords
* @property {Fix[] | undefined} fixes * @property {Fix[]} fixes
* @property {{ domains: string[] | undefined, tags: string[] | undefined } | undefined} skips * @property {{ domains: string[], tags: string[] }} skips
* @property {{ classes: string[] | undefined, selectors: string[] | undefined } | undefined} tokens * @property {{ backdrops: string[], classes: string[], selectors: string[] }} tokens
*/ */
/** /**
* @typedef {Object} Fix * @typedef {Object} Fix
* @property {string} action * @property {string} action
* @property {string} domain * @property {string} domain
* @property {string | undefined} property * @property {string} [property]
* @property {string} selector * @property {string} selector
*/ */
/** /**
* @typedef {Object} RunParams * @typedef {Object} RunParams
* @property {HTMLElement[] | undefined} elements * @property {HTMLElement[]} [elements]
* @property {boolean | undefined} skipMatch * @property {boolean} [skipMatch]
*/ */
/** /**
* @typedef {Object} SetUpParams * @typedef {Object} SetUpParams
* @property {boolean | undefined} skipRunFn * @property {boolean} [skipRunFn]
*/ */
if (typeof browser === 'undefined') { if (typeof browser === 'undefined') {
@ -36,10 +36,22 @@ if (typeof browser === 'undefined') {
let count = 0; let count = 0;
/** /**
* @description Data properties * @description Data object with all the necessary information
* @type {ExtensionData} * @type {ExtensionData}
*/ */
let { commonWords, fixes = [], skips, tokens } = {}; let { commonWords, fixes, skips, tokens } = {
commonWords: [],
fixes: [],
skips: {
domains: [],
tags: [],
},
tokens: {
backdrops: [],
classes: [],
selectors: [],
},
};
/** /**
* @description Attribute name * @description Attribute name
@ -98,7 +110,7 @@ let state = { enabled: true };
/** /**
* @description Clean DOM * @description Clean DOM
* @param {Element[]} elements * @param {Element[]} elements
* @param {boolean?} skipMatch * @param {boolean} [skipMatch]
* @returns {void} * @returns {void}
*/ */
function clean(elements, skipMatch) { function clean(elements, skipMatch) {
@ -146,7 +158,7 @@ function clean(elements, skipMatch) {
* @param {HTMLElement} element * @param {HTMLElement} element
*/ */
function containsCommonWord(element) { function containsCommonWord(element) {
return !!element.outerHTML.match(new RegExp(commonWords.join('|'))); return !!commonWords.length && !!element.outerHTML.match(new RegExp(commonWords.join('|')));
} }
/** /**
@ -156,7 +168,7 @@ function containsCommonWord(element) {
*/ */
function forceClean(element) { function forceClean(element) {
const nodes = [...element.querySelectorAll(tokens.selectors)]; const nodes = [...element.querySelectorAll(tokens.selectors)];
const elements = nodes.flatMap((node) => filterMapEarly(node)); const elements = nodes.flatMap((node) => filterNodeEarly(node));
if (elements.length) { if (elements.length) {
fix(); fix();
@ -220,16 +232,11 @@ function isInViewport(element) {
/** /**
* @description Check if element element is removable * @description Check if element element is removable
* @param {Element} element * @param {Element} element
* @param {boolean?} skipMatch * @param {boolean} [skipMatch]
* @returns {boolean} * @returns {boolean}
*/ */
function match(element, skipMatch) { function match(element, skipMatch) {
if ( if (!tokens.selectors.length || !skips.tags.length) {
!commonWords.length ||
!tokens?.classes?.length ||
!tokens?.selectors?.length ||
!skips?.tags?.length
) {
return false; return false;
} }
@ -245,7 +252,7 @@ function match(element, skipMatch) {
return false; return false;
} }
const tagName = element.tagName?.toUpperCase?.(); const tagName = element.tagName.toUpperCase();
if (skips.tags.includes(tagName)) { if (skips.tags.includes(tagName)) {
return false; return false;
@ -283,13 +290,13 @@ function match(element, skipMatch) {
* @param {Node} node * @param {Node} node
* @param {boolean} stopRecursion * @param {boolean} stopRecursion
*/ */
function filterMapEarly(node, stopRecursion) { function filterNodeEarly(node, stopRecursion) {
if (node.nodeType !== Node.ELEMENT_NODE || !(node instanceof HTMLElement)) { if (node.nodeType !== Node.ELEMENT_NODE || !(node instanceof HTMLElement)) {
return []; return [];
} }
if (commonWords && containsCommonWord(node) && !stopRecursion) { if (commonWords && containsCommonWord(node) && !stopRecursion) {
return [node, ...[...node.children].flatMap((node) => filterMapEarly(node, true))]; return [node, ...[...node.children].flatMap((node) => filterNodeEarly(node, true))];
} }
return [node]; return [node];
@ -300,12 +307,10 @@ function filterMapEarly(node, stopRecursion) {
* @returns {void} * @returns {void}
*/ */
function fix() { function fix() {
const backdrops = document.querySelectorAll([ const backdrops = tokens.backdrops?.length
'.modal-backdrop', ? [...document.querySelectorAll(tokens.backdrops)]
'.offcanvas-backdrop', : [];
'.overlay', const domains = skips.domains.map((x) => (x.split('.').length < 3 ? `*${x}` : x));
]);
const domains = (skips?.domains ?? []).map((x) => (x.split('.').length < 3 ? `*${x}` : x));
for (const backdrop of backdrops) { for (const backdrop of backdrops) {
if (backdrop.children.length === 0 && backdrop.style.display !== 'none') { if (backdrop.children.length === 0 && backdrop.style.display !== 'none') {
@ -349,7 +354,7 @@ function fix() {
if (domains.every((x) => !hostname.match(x.replaceAll(/\*/g, '[^ ]*')))) { if (domains.every((x) => !hostname.match(x.replaceAll(/\*/g, '[^ ]*')))) {
for (const element of [document.body, document.documentElement]) { for (const element of [document.body, document.documentElement]) {
element?.classList.remove(...(tokens?.classes ?? [])); element?.classList.remove(...(tokens.classes ?? []));
element?.style.setProperty('position', 'initial', 'important'); element?.style.setProperty('position', 'initial', 'important');
element?.style.setProperty('overflow-y', 'initial', 'important'); element?.style.setProperty('overflow-y', 'initial', 'important');
} }
@ -361,10 +366,14 @@ function fix() {
* @returns {void} * @returns {void}
*/ */
function restoreDOM() { function restoreDOM() {
const backdrop = document.getElementsByClassName('modal-backdrop')[0]; const backdrops = tokens.backdrops?.length
? [...document.querySelectorAll(tokens.backdrops)]
: [];
if (backdrop?.children.length === 0) { for (const backdrop of backdrops) {
backdrop.style.removeProperty('display'); if (backdrop.children.length === 0 && backdrop.hasAttribute(dataAttributeName)) {
backdrop.style.removeProperty('display');
}
} }
const elements = [...document.querySelectorAll(`[${dataAttributeName}]`)]; const elements = [...document.querySelectorAll(`[${dataAttributeName}]`)];
@ -384,11 +393,11 @@ function restoreDOM() {
/** /**
* @description Clean DOM when this function is called * @description Clean DOM when this function is called
* @param {RunParams} params * @param {RunParams} [params]
* @returns {void} * @returns {void}
*/ */
function run(params = {}) { function run(params = {}) {
if (document.body?.children.length && !preview && state.enabled && tokens?.selectors?.length) { if (document.body?.children.length && !preview && state.enabled && tokens.selectors.length) {
fix(); fix();
if (params.elements?.length) { if (params.elements?.length) {
@ -408,7 +417,7 @@ function run(params = {}) {
...[...(document.getElementById('app')?.children ?? [])], ...[...(document.getElementById('app')?.children ?? [])],
...[...(document.getElementById('main')?.children ?? [])], ...[...(document.getElementById('main')?.children ?? [])],
...[...(document.getElementById('root')?.children ?? [])], ...[...(document.getElementById('root')?.children ?? [])],
].flatMap((node) => filterMapEarly(node)) ].flatMap((node) => filterNodeEarly(node))
); );
} }
} }
@ -417,19 +426,19 @@ function run(params = {}) {
/** /**
* @async * @async
* @description Set up the extension * @description Set up the extension
* @param {SetUpParams | undefined} params * @param {SetUpParams} [params]
*/ */
async function setUp(params) { async function setUp(params = {}) {
state = (await dispatch({ hostname, type: 'GET_HOSTNAME_STATE' })) ?? state; state = (await dispatch({ hostname, type: 'GET_HOSTNAME_STATE' })) ?? state;
dispatch({ type: 'ENABLE_POPUP' }); dispatch({ type: 'ENABLE_POPUP' });
if (state.enabled) { if (state.enabled) {
const data = await dispatch({ hostname, type: 'GET_DATA' }); const data = await dispatch({ hostname, type: 'GET_DATA' });
commonWords = data?.commonWords; commonWords = data?.commonWords ?? commonWords;
fixes = data?.fixes; fixes = data?.fixes ?? fixes;
skips = data?.skips; skips = data?.skips ?? skips;
tokens = data?.tokens; tokens = data?.tokens ?? tokens;
if (count > 0) { if (count > 0) {
dispatch({ type: 'SET_BADGE', value: `${count}` }); dispatch({ type: 'SET_BADGE', value: `${count}` });
@ -438,7 +447,7 @@ async function setUp(params) {
dispatch({ type: 'ENABLE_ICON' }); dispatch({ type: 'ENABLE_ICON' });
observer.observe(document.body ?? document.documentElement, options); observer.observe(document.body ?? document.documentElement, options);
if (!params?.skipRunFn) { if (!params.skipRunFn) {
run(); run();
} }
} else { } else {
@ -452,12 +461,12 @@ async function setUp(params) {
* @type {MutationObserver} * @type {MutationObserver}
*/ */
const observer = new MutationObserver((mutations) => { const observer = new MutationObserver((mutations) => {
if (preview || !state.enabled || !tokens?.selectors.length) { if (preview || !state.enabled || !tokens.selectors.length) {
return; return;
} }
const nodes = mutations.flatMap((mutation) => [...mutation.addedNodes]); const nodes = mutations.flatMap((mutation) => [...mutation.addedNodes]);
const elements = nodes.flatMap((node) => filterMapEarly(node)); const elements = nodes.flatMap((node) => filterNodeEarly(node));
run({ elements }); run({ elements });
}); });