Enable whitelisting of Unknown Trackers from Ad Block module

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 + 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)
++ 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)

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,

app/panel/components/Blocking/trackerButtonRenderHelpers.jsx

@@ -77,7 +77,7 @@ export const renderUnknownTrackerButtons = (
 			</span>
 
 			{/* USE INLINE SVG FOR ANTI-TRACKING SHIELD TO CHANGE COLORS WITH CSS */}
-			<span className="t-tooltip-up-left" data-g-tooltip={t('panel_tracker_scrub_tooltip')}>
+			<span className="t-tooltip-up-left" data-g-tooltip={type === 'antiTracking' ? t('panel_tracker_scrub_tooltip') : t('panel_tracker_restrict_tooltip')}>
 				<svg className="cliqz-tracker-scrub" onClick={handleCliqzTrackerWhitelist} width="20px" height="20px" viewBox="0 0 20 20">
 					<g transform="translate(1 1)" fill="none" fillRule="evenodd">
 						<path className="border" stroke="#00AEF0" d="M-.5-.5h18.3v18.217H-.5z" />

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,
 				};

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",

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);
+	});
 });
 
 /**

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) {

yarn.lock

@@ -1544,9 +1544,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"