From 25979f9d627f9a09ce8e7ec9874a0ab4532ee90b Mon Sep 17 00:00:00 2001 From: Christopher Tino Date: Thu, 27 Feb 2020 11:37:18 -0500 Subject: [PATCH 1/3] enable whitlisting of Unknown ads --- app/panel/components/Blocking/Tracker.jsx | 2 +- app/panel/components/Blocking/trackerButtonRenderHelpers.jsx | 2 +- src/background.js | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/panel/components/Blocking/Tracker.jsx b/app/panel/components/Blocking/Tracker.jsx index 5e980d63e..a3f973f7c 100644 --- a/app/panel/components/Blocking/Tracker.jsx +++ b/app/panel/components/Blocking/Tracker.jsx @@ -342,7 +342,7 @@ class Tracker extends React.Component { this.clickTrackerRestrict, this.clickTrackerStatus, )} - {isUnknown && tracker.type === 'antiTracking' && renderUnknownTrackerButtons( + {isUnknown && renderUnknownTrackerButtons( this.handleCliqzTrackerWhitelist, tracker.whitelisted, tracker.siteRestricted, diff --git a/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx b/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx index 2027507b6..932d62004 100644 --- a/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx +++ b/app/panel/components/Blocking/trackerButtonRenderHelpers.jsx @@ -77,7 +77,7 @@ export const renderUnknownTrackerButtons = ( {/* USE INLINE SVG FOR ANTI-TRACKING SHIELD TO CHANGE COLORS WITH CSS */} - + diff --git a/src/background.js b/src/background.js index 107290cfe..68cbb0d02 100644 --- a/src/background.js +++ b/src/background.js @@ -1193,7 +1193,6 @@ function isWhitelisted(state) { // state.ghosteryWhitelisted is sometimes undefined so force to bool return Boolean(globals.SESSION.paused_blocking || events.policy.getSitePolicy(state.tabUrl, state.url) === 2 || state.ghosteryWhitelisted); } - /** * Set listener for 'enabled' event for Antitracking module which replaces * Antitracking isWhitelisted method with Ghostery's isWhitelisted method. @@ -1213,7 +1212,9 @@ antitracking.on('enabled', () => { * @memberOf Background */ adblocker.on('enabled', () => { - adblocker.isReady().then(() => adblocker.action('addWhiteListCheck', url => isWhitelisted({ tabUrl: url }))); + adblocker.isReady().then(() => { + adblocker.action('addWhiteListCheck', isWhitelisted); + }); }); /** From bedc27d10494bfbb0e72020a6dfc62a1d119e2d0 Mon Sep 17 00:00:00 2001 From: Christopher Tino Date: Tue, 3 Mar 2020 13:23:02 -0500 Subject: [PATCH 2/3] GH-1805 Allow whitelisting of Unknown trackers from AdBlocker module --- CHANGELOG.md | 2 +- app/panel/reducers/blocking.js | 13 ++----------- package.json | 2 +- src/utils/cliqzModulesData.js | 5 ++++- yarn.lock | 6 +++--- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8c7ddfd1..9979311ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ + Migrate to the new Chromium-based Edge browser (#492) + Disable Purplebox on Firefox Android (#494) -+ Allow white-listing of regex and wildcard domains (#497) ++ Allow white-listing of wildcard domains (#501) + Fixes issue when adding localhost to Trusted Sites with port value (Fixes #470) + Add locale-appropriate formatting to historical stats numbers (#498) + Remove email opt-in from account creation in panel and hub (#495) diff --git a/app/panel/reducers/blocking.js b/app/panel/reducers/blocking.js index 87bc75141..2aebc09bb 100644 --- a/app/panel/reducers/blocking.js +++ b/app/panel/reducers/blocking.js @@ -104,23 +104,14 @@ export default (state = initialState, action) => { } case UPDATE_CLIQZ_MODULE_DATA: case UPDATE_SUMMARY_DATA: { - if (action.data.antiTracking) { + if (action.data.antiTracking && action.data.adBlock) { const { antiTracking, adBlock } = action.data; - let adBlockUnknownTrackers = adBlock.unknownTrackers; - antiTracking.unknownTrackers.forEach((tracker) => { - if (tracker.whitelisted) { - adBlockUnknownTrackers = adBlockUnknownTrackers.filter(adBlockTracker => ( - adBlockTracker.name !== tracker.name - )); - } - }); - const unknownCategory = { totalUnsafeCount: antiTracking.totalUnsafeCount + adBlock.totalUnsafeCount, totalUnknownCount: antiTracking.totalUnknownCount + adBlock.totalUnknownCount, trackerCount: antiTracking.trackerCount + adBlock.trackerCount, unknownTrackerCount: antiTracking.unknownTrackerCount + adBlock.unknownTrackerCount, - unknownTrackers: Array.from(new Set(antiTracking.unknownTrackers.concat(adBlockUnknownTrackers))), + unknownTrackers: Array.from(new Set(antiTracking.unknownTrackers.concat(adBlock.unknownTrackers))), whitelistedUrls: Object.assign({}, antiTracking.whitelistedUrls, adBlock.whitelistedUrls), hide: state.unknownCategory.hide, }; diff --git a/package.json b/package.json index 77ab1e415..44f3a58bd 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@cliqz/adblocker-circumvention": "^1.5.0", "@cliqz/url-parser": "^1.1.1", "base64-js": "^1.3.1", - "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.3/browser-core-7.43.3.tgz", + "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.5/browser-core-7.43.5.tgz", "classnames": "^2.2.5", "d3": "^5.15.0", "foundation-sites": "^6.6.1", diff --git a/src/utils/cliqzModulesData.js b/src/utils/cliqzModulesData.js index 52297b4f8..b28e91a32 100644 --- a/src/utils/cliqzModulesData.js +++ b/src/utils/cliqzModulesData.js @@ -24,7 +24,9 @@ const { adblocker, antitracking } = cliqz.modules; * Get the totalUnsafeCount of trackers found by Anti-Tracking on this tabId * @memberOf BackgroundUtils * @param {number} tabId - * @return {object} totalUnsafeCount + * @param {string} tabHostUrl + * @param {boolean} antiTracking Fetch data from the anti-tracking module + * @return {object} */ export function getCliqzData(tabId, tabHostUrl, antiTracking) { let totalUnsafeCount = 0; @@ -129,6 +131,7 @@ export function getCliqzGhosteryBugs(tabId) { * found by Anti-Tracking * @memberOf BackgroundUtils * @param {number} tabId + * @param {string} tabHostUrl * @param {Function} callback */ export function sendCliqzModuleCounts(tabId, tabHostUrl, callback) { diff --git a/yarn.lock b/yarn.lock index abca29c6d..3c8a34e3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1501,9 +1501,9 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.43.3/browser-core-7.43.3.tgz": - version "7.43.3" - resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.3/browser-core-7.43.3.tgz#a348fa8e482f8d7bf85f6e7fc9bea1ad5ad0512c" +"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/v7.43.5/browser-core-7.43.5.tgz": + version "7.43.5" + resolved "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.5/browser-core-7.43.5.tgz#278e2e684bf86143dbc660e88380034d692d9324" dependencies: "@cliqz-oss/dexie" "^2.0.4" "@cliqz/adblocker-webextension" "^1.8.6" From 3c0c69d83a98c28745e205fa55709cd49fb8198a Mon Sep 17 00:00:00 2001 From: Christopher Tino Date: Tue, 3 Mar 2020 13:25:56 -0500 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9979311ff..62f54a2a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ + Migrate to the new Chromium-based Edge browser (#492) + Disable Purplebox on Firefox Android (#494) + Allow white-listing of wildcard domains (#501) ++ Allow site-specific white-listing of Unknown Trackers caught by Ad-Blocker (#503) + Fixes issue when adding localhost to Trusted Sites with port value (Fixes #470) + Add locale-appropriate formatting to historical stats numbers (#498) + Remove email opt-in from account creation in panel and hub (#495)