re-enable lint exception for no-prototype-builtins and revert calls b…

…ack to hasOwnProperty

.eslintrc.js

@@ -65,7 +65,7 @@ module.exports = {
 			]
 		}],
 		'no-plusplus': [0],
-		'no-prototype-builtins': [1],
+		'no-prototype-builtins': [0],
 		'no-restricted-syntax': [1],
 		'no-tabs': [0],
 		'no-underscore-dangle': [0],
@@ -80,7 +80,7 @@ module.exports = {
 		'import/prefer-default-export': [1],
 
 		// Plugin: React
-		'react/destructuring-assignment': [0],
+		'react/destructuring-assignment': [0], // ToDo
 		'react/static-property-placement': [0],
 		'react/jsx-curly-newline': [0],
 		'react/jsx-indent': [1, 'tab'],

app/content-scripts/click_to_play.js

@@ -164,7 +164,7 @@ const Click2PlayContentScript = (function(win, doc) {
 					const messageKeys = Object.keys(message);
 					for (let i = 0; i < messageKeys.length; i++) {
 						const app_id = messageKeys[i];
-						if (Object.prototype.hasOwnProperty.call(message, app_id)) {
+						if (message.hasOwnProperty(app_id)) {
 							applyC2P(app_id, message[app_id].data, message[app_id].html);
 							delete message[app_id];
 						}

app/panel-android/components/content/FixedMenu.jsx

@@ -51,7 +51,7 @@ export default class FixedMenu extends React.Component {
 				const categories = Object.keys(this.antiTrackingData);
 				for (let i = 0; i < categories.length; i++) {
 					const category = categories[i];
-					if (Object.prototype.hasOwnProperty.call(this.antiTrackingData, category)) {
+					if (this.antiTrackingData.hasOwnProperty(category)) {
 						const apps = Object.keys(this.antiTrackingData[category]);
 						for (let j = 0; j < apps.length; j++) {
 							const app = apps[j];

app/panel/reducers/blocking.js

@@ -206,7 +206,7 @@ const _updateCliqzModuleWhitelist = (state, action) => {
 
 	const addToWhitelist = () => {
 		unknownTracker.domains.forEach((domain) => {
-			if (Object.prototype.hasOwnProperty.call(whitelistedUrls, domain)) {
+			if (whitelistedUrls.hasOwnProperty(domain)) {
 				whitelistedUrls[domain].name = unknownTracker.name;
 				whitelistedUrls[domain].hosts.push(pageHost);
 			} else {

app/panel/reducers/panel.js

@@ -303,14 +303,14 @@ const _showNotification = (state, action) => {
 		updated_needsReload = { ...state.needsReload, changes: { ...state.needsReload.changes } };
 
 		// handle case where user clicks 'whitelist' then 'blacklist', or inverse
-		if (msg.updated === 'blacklist' && Object.prototype.hasOwnProperty.call(updated_needsReload.changes, 'whitelist')) {
+		if (msg.updated === 'blacklist' && updated_needsReload.changes.hasOwnProperty('whitelist')) {
 			delete updated_needsReload.changes.whitelist;
-		} else if (msg.updated === 'whitelist' && Object.prototype.hasOwnProperty.call(updated_needsReload.changes, 'blacklist')) {
+		} else if (msg.updated === 'whitelist' && updated_needsReload.changes.hasOwnProperty('blacklist')) {
 			delete updated_needsReload.changes.blacklist;
 		}
 
 		// update the 'changes' object.  if the changed item already exists, remove it to signal a disable has occurred
-		if (Object.prototype.hasOwnProperty.call(updated_needsReload.changes, msg.updated)) {
+		if (updated_needsReload.changes.hasOwnProperty(msg.updated)) {
 			delete updated_needsReload.changes[msg.updated];
 		} else if (msg.updated !== 'init') { // ignore the 'init' change, which comes from Panel.jsx to persist banners
 			updated_needsReload.changes[msg.updated] = true;

app/panel/utils/blocking.js

@@ -33,8 +33,8 @@ export function updateSummaryBlockingCount(categories = [], smartBlock, updateTr
 	categories.forEach((categoryEl) => {
 		categoryEl.trackers.forEach((trackerEl) => {
 			numTotal++;
-			const sbBlocked = Object.prototype.hasOwnProperty.call(smartBlock.blocked, trackerEl.id);
-			const sbUnblocked = Object.prototype.hasOwnProperty.call(smartBlock.unblocked, trackerEl.id);
+			const sbBlocked = smartBlock.blocked.hasOwnProperty(trackerEl.id);
+			const sbUnblocked = smartBlock.unblocked.hasOwnProperty(trackerEl.id);
 
 			if (trackerEl.ss_blocked || sbBlocked || (trackerEl.blocked && !trackerEl.ss_allowed && !sbUnblocked)) {
 				numTotalBlocked++;
@@ -81,8 +81,8 @@ export function updateBlockAllTrackers(state, action) {
 	updated_categories.forEach((categoryEl) => {
 		categoryEl.num_blocked = 0;
 		categoryEl.trackers.forEach((trackerEl) => {
-			const sbBlocked = Object.prototype.hasOwnProperty.call(smartBlock.blocked, trackerEl.id);
-			const sbUnblocked = Object.prototype.hasOwnProperty.call(smartBlock.unblocked, trackerEl.id);
+			const sbBlocked = smartBlock.blocked.hasOwnProperty(trackerEl.id);
+			const sbUnblocked = smartBlock.unblocked.hasOwnProperty(trackerEl.id);
 
 			if (trackerEl.shouldShow) {
 				trackerEl.blocked = blocked;
@@ -124,8 +124,8 @@ export function updateCategoryBlocked(state, action) {
 	const updated_category = updated_categories[catIndex];
 	updated_category.num_blocked = 0;
 	updated_category.trackers.forEach((trackerEl) => {
-		const sbBlocked = Object.prototype.hasOwnProperty.call(smartBlock.blocked, trackerEl.id);
-		const sbUnblocked = Object.prototype.hasOwnProperty.call(smartBlock.unblocked, trackerEl.id);
+		const sbBlocked = smartBlock.blocked.hasOwnProperty(trackerEl.id);
+		const sbUnblocked = smartBlock.unblocked.hasOwnProperty(trackerEl.id);
 
 		if (trackerEl.shouldShow) {
 			trackerEl.blocked = blocked;
@@ -194,8 +194,8 @@ export function updateTrackerBlocked(state, action) {
 
 	updated_category.num_blocked = 0;
 	updated_category.trackers.forEach((trackerEl) => {
-		const sbBlocked = Object.prototype.hasOwnProperty.call(smartBlock.blocked, trackerEl.id);
-		const sbUnblocked = Object.prototype.hasOwnProperty.call(smartBlock.unblocked, trackerEl.id);
+		const sbBlocked = smartBlock.blocked.hasOwnProperty(trackerEl.id);
+		const sbUnblocked = smartBlock.unblocked.hasOwnProperty(trackerEl.id);
 
 		if (trackerEl.shouldShow) {
 			if (trackerEl.id === action.data.app_id) {

src/background.js

@@ -129,10 +129,10 @@ function setGhosteryDefaultBlocking() {
 	const app_ids = Object.keys(bugDb.db.apps);
 	for (let i = 0; i < app_ids.length; i++) {
 		const app_id = app_ids[i];
-		if (Object.prototype.hasOwnProperty.call(bugDb.db.apps, app_id)) {
+		if (bugDb.db.apps.hasOwnProperty(app_id)) {
 			const category = bugDb.db.apps[app_id].cat;
 			if (categoriesBlock.indexOf(category) >= 0 &&
-			!Object.prototype.hasOwnProperty.call(selected_app_ids, app_id)) {
+			!selected_app_ids.hasOwnProperty(app_id)) {
 				selected_app_ids[app_id] = 1;
 			}
 		}
@@ -498,7 +498,7 @@ function handleRewards(name, message, callback) {
 			metrics.ping(message);
 			break;
 		case 'setPanelData':
-			if (Object.prototype.hasOwnProperty.call(message, 'enable_offers')) {
+			if (message.hasOwnProperty('enable_offers')) {
 				Rewards.sendSignal(message.signal);
 				panelData.set({ enable_offers: message.enable_offers });
 			}
@@ -580,7 +580,7 @@ function handleGhosteryHub(name, message, callback) {
 					const app_ids = Object.keys(bugDb.db.apps);
 					for (let i = 0; i < app_ids.length; i++) {
 						const app_id = app_ids[i];
-						if (!Object.prototype.hasOwnProperty.call(selected_app_ids, app_id)) {
+						if (!selected_app_ids.hasOwnProperty(app_id)) {
 							selected_app_ids[app_id] = 1;
 						}
 					}
@@ -776,7 +776,7 @@ function onMessageHandler(request, sender, callback) {
 		const { email, password } = message;
 		account.login(email, password)
 			.then((response) => {
-				if (!Object.prototype.hasOwnProperty.call(response, 'errors')) {
+				if (!response.hasOwnProperty('errors')) {
 					metrics.ping('sign_in_success');
 				}
 				callback(response);
@@ -793,7 +793,7 @@ function onMessageHandler(request, sender, callback) {
 		} = message;
 		account.register(email, confirmEmail, password, firstName, lastName)
 			.then((response) => {
-				if (!Object.prototype.hasOwnProperty.call(response, 'errors')) {
+				if (!response.hasOwnProperty('errors')) {
 					metrics.ping('create_account_success');
 				}
 				callback(response);
@@ -1013,7 +1013,7 @@ function initializeDispatcher() {
 		const { db } = bugDb;
 		db.noneSelected = (num_selected === 0);
 		// can't simply compare num_selected and size(db.apps) since apps get removed sometimes
-		db.allSelected = (!!num_selected && every(db.apps, (app, app_id) => Object.prototype.hasOwnProperty.call(appIds, app_id)));
+		db.allSelected = (!!num_selected && every(db.apps, (app, app_id) => appIds.hasOwnProperty(app_id)));
 	});
 	dispatcher.on('conf.save.site_whitelist', () => {
 		// TODO debounce with below

src/classes/ABTest.js

@@ -34,7 +34,7 @@ class ABTest {
 	 * @param {string} name 	test name
 	 */
 	hasTest(name) {
-		return Object.prototype.hasOwnProperty.call(this.tests, name);
+		return this.tests.hasOwnProperty(name);
 	}
 
 	/**

src/classes/BugDb.js

@@ -87,20 +87,20 @@ class BugDb extends Updatable {
 		const appIds = Object.keys(db.apps);
 		for (let i = 0; i < appIds.length; i++) {
 			appId = appIds[i];
-			if (Object.prototype.hasOwnProperty.call(db.apps, appId)) {
+			if (db.apps.hasOwnProperty(appId)) {
 				category = db.apps[appId].cat;
 				if (t(`category_${category}`) === `category_${category}`) {
 					category = 'uncategorized';
 				}
-				blocked = Object.prototype.hasOwnProperty.call(selectedApps, appId);
+				blocked = selectedApps.hasOwnProperty(appId);
 
 				// Because we have two trackers in the DB with the same name
 				if ((categories[category] && categories[category].trackers[db.apps[appId].name])) {
 					// eslint-disable-next-line no-continue
 					continue;
 				}
 
-				if (Object.prototype.hasOwnProperty.call(categories, category)) {
+				if (categories.hasOwnProperty(category)) {
 					categories[category].num_total++;
 					if (blocked) {
 						categories[category].num_blocked++;
@@ -131,7 +131,7 @@ class BugDb extends Updatable {
 		const categoryNames = Object.keys(categories);
 		for (let i = 0; i < categoryNames.length; i++) {
 			categoryName = categoryNames[i];
-			if (Object.prototype.hasOwnProperty.call(categories, categoryName)) {
+			if (categories.hasOwnProperty(categoryName)) {
 				const category = categories[categoryName];
 				if (category.trackers) {
 					category.trackers.sort((a, b) => {
@@ -186,7 +186,7 @@ class BugDb extends Updatable {
 		const regexesKeys = Object.keys(regexes);
 		for (let i = 0; i < regexesKeys.length; i++) {
 			const id = regexesKeys[i];
-			if (Object.prototype.hasOwnProperty.call(regexes, id)) {
+			if (regexes.hasOwnProperty(id)) {
 				db.patterns.regex[id] = new RegExp(regexes[id], 'i');
 			}
 		}
@@ -199,7 +199,7 @@ class BugDb extends Updatable {
 		// since allSelected is slow to eval, make it lazy
 		defineLazyProperty(db, 'allSelected', () => {
 			const num_selected = size(conf.selected_app_ids);
-			return (!!num_selected && every(db.apps, (app, app_id) => Object.prototype.hasOwnProperty.call(conf.selected_app_ids, app_id)));
+			return (!!num_selected && every(db.apps, (app, app_id) => conf.selected_app_ids.hasOwnProperty(app_id)));
 		});
 
 		log('processed bugdb...');
@@ -210,7 +210,7 @@ class BugDb extends Updatable {
 			// if there is an older bugs object in storage,
 			// update newAppIds and apply block-by-default
 			if (old_bugs) {
-				if (Object.prototype.hasOwnProperty.call(old_bugs, 'version') && bugs.version > old_bugs.version) {
+				if (old_bugs.hasOwnProperty('version') && bugs.version > old_bugs.version) {
 					new_app_ids = BugDb.updateNewAppIds(bugs.apps, old_bugs.apps);
 
 					if (new_app_ids.length) {
@@ -219,7 +219,7 @@ class BugDb extends Updatable {
 					}
 
 				// pre-trie/legacy db
-				} else if (Object.prototype.hasOwnProperty.call(old_bugs, 'bugsVersion') && bugs.version !== old_bugs.bugsVersion) {
+				} else if (old_bugs.hasOwnProperty('bugsVersion') && bugs.version !== old_bugs.bugsVersion) {
 					const old_apps = reduce(old_bugs.bugs, (memo, bug) => {
 						memo[bug.aid] = true;
 						return memo;

src/classes/Click2PlayDb.js

@@ -66,7 +66,7 @@ class Click2PlayDb extends Updatable {
 
 	// TODO memory leak when you close tabs before reset() can run?
 	reset(tab_id) {
-		if (!Object.prototype.hasOwnProperty.call(this.allowOnceList, tab_id)) { return; }
+		if (!this.allowOnceList.hasOwnProperty(tab_id)) { return; }
 
 		let keep = false;
 		const allowKeys = Object.keys(this.allowOnceList[tab_id]);
@@ -86,8 +86,8 @@ class Click2PlayDb extends Updatable {
 
 	allowedOnce(tab_id, aid) {
 		return (
-			Object.prototype.hasOwnProperty.call(this.allowOnceList, tab_id) &&
-			Object.prototype.hasOwnProperty.call(this.allowOnceList[tab_id], aid) &&
+			this.allowOnceList.hasOwnProperty(tab_id) &&
+			this.allowOnceList[tab_id].hasOwnProperty(aid) &&
 			this.allowOnceList[tab_id][aid] > 0
 		);
 	}
@@ -115,7 +115,7 @@ class Click2PlayDb extends Updatable {
 		let	allow;
 
 		entries.forEach((entry) => {
-			if (!Object.prototype.hasOwnProperty.call(apps, entry.aid)) {
+			if (!apps.hasOwnProperty(entry.aid)) {
 				apps[entry.aid] = [];
 			}
 

src/classes/CompatibilityDb.js

@@ -66,7 +66,7 @@ class CompatibilityDb extends Updatable {
 	 * @return {Boolean}
 	 */
 	hasIssue(aid, tab_url) {
-		return this.db.list && Object.prototype.hasOwnProperty.call(this.db.list, aid) && fuzzyUrlMatcher(tab_url, this.db.list[aid]);
+		return this.db.list && this.db.list.hasOwnProperty(aid) && fuzzyUrlMatcher(tab_url, this.db.list[aid]);
 	}
 
 	/**

src/classes/ConfData.js

@@ -186,12 +186,12 @@ class ConfData {
 
 		let lang = window.navigator.language.replace('-', '_');
 
-		if (Object.prototype.hasOwnProperty.call(SUPPORTED_LANGUAGES, lang)) {
+		if (SUPPORTED_LANGUAGES.hasOwnProperty(lang)) {
 			return lang;
 		}
 
 		lang = lang.slice(0, 2);
-		if (Object.prototype.hasOwnProperty.call(SUPPORTED_LANGUAGES, lang)) {
+		if (SUPPORTED_LANGUAGES.hasOwnProperty(lang)) {
 			return lang;
 		}
 

src/classes/FoundBugs.js

@@ -139,7 +139,7 @@ class FoundBugs {
 
 		if (app_id) {
 			const { appsById } = this._foundApps[tab_id];
-			if (Object.prototype.hasOwnProperty.call(appsById, app_id)) {
+			if (appsById.hasOwnProperty(app_id)) {
 				apps_arr.push(apps[appsById[app_id]]);
 			}
 		} else {
@@ -203,11 +203,11 @@ class FoundBugs {
 		const ids = Object.keys(bugs);
 		for (let i = 0; i < ids.length; i++) {
 			id = ids[i];
-			if (Object.prototype.hasOwnProperty.call(bugs, id)) {
+			if (bugs.hasOwnProperty(id)) {
 				aid = db.bugs[id].aid; // eslint-disable-line prefer-destructuring
 				cid = db.apps[aid].cat;
 
-				if (Object.prototype.hasOwnProperty.call(cats_obj, cid)) {
+				if (cats_obj.hasOwnProperty(cid)) {
 					if (!cats_obj[cid].appIds.includes(aid)) {
 						cats_obj[cid].appIds.push(aid);
 						cats_obj[cid].trackers.push({
@@ -244,7 +244,7 @@ class FoundBugs {
 		const cids = Object.keys(cats_obj);
 		for (let i = 0; i < cids.length; i++) {
 			cid = cids[i];
-			if (Object.prototype.hasOwnProperty.call(cats_obj, cid)) {
+			if (cats_obj.hasOwnProperty(cid)) {
 				cats_arr.push(cats_obj[cid]);
 			}
 		}
@@ -364,7 +364,7 @@ class FoundBugs {
 		const { aid } = bugDb.db.bugs[bug_id];
 
 		const { apps, appsById, issueCounts } = this._foundApps[tab_id];
-		if (Object.prototype.hasOwnProperty.call(appsById, aid)) {
+		if (appsById.hasOwnProperty(aid)) {
 			const app = apps[appsById[aid]];
 			if (!app.hasLatencyIssue) {
 				issueCounts.latency++;
@@ -395,11 +395,11 @@ class FoundBugs {
 			return false;
 		}
 
-		if (!Object.prototype.hasOwnProperty.call(this._foundBugs, tab_id)) {
+		if (!this._foundBugs.hasOwnProperty(tab_id)) {
 			this._foundBugs[tab_id] = {};
 		}
 
-		if (!Object.prototype.hasOwnProperty.call(this._foundApps, tab_id)) {
+		if (!this._foundApps.hasOwnProperty(tab_id)) {
 			this._foundApps[tab_id] = {
 				apps: [],
 				appsMetadata: {},
@@ -445,7 +445,7 @@ class FoundBugs {
 	 * @param  {string} 	type
 	 */
 	_updateFoundBugs(tab_id, bug_id, src, blocked, type) {
-		if (!Object.prototype.hasOwnProperty.call(this._foundBugs[tab_id], bug_id)) {
+		if (!this._foundBugs[tab_id].hasOwnProperty(bug_id)) {
 			this._foundBugs[tab_id][bug_id] = {
 				sources: [],
 				hasLatencyIssue: false,
@@ -487,7 +487,7 @@ class FoundBugs {
 			apps, appsMetadata, appsById, issueCounts
 		} = this._foundApps[tab_id];
 
-		if (Object.prototype.hasOwnProperty.call(appsById, aid)) {
+		if (appsById.hasOwnProperty(aid)) {
 			const app = apps[appsById[aid]];
 
 			if (!app.hasLatencyIssue && hasLatencyIssue) { issueCounts.latency++; }

src/classes/Latency.js

@@ -33,7 +33,7 @@ class Latency {
 		const request_id = details.requestId;
 		const tab_id = details.tabId;
 
-		if (!Object.prototype.hasOwnProperty.call(this.latencies, request_id)) {
+		if (!this.latencies.hasOwnProperty(request_id)) {
 			return 0;
 		}
 		// If the latencies object for this request id is empty then this is
@@ -46,7 +46,7 @@ class Latency {
 		// TRACKER1 --> NON-TRACKER --> TRACKER2
 		// TRACKER2's onBeforeRequest sync callback could maybe fire before
 		// NON-TRACKER's onBeforeRedirect async callback
-		if (!Object.prototype.hasOwnProperty.call(this.latencies[request_id], details.url)) {
+		if (!this.latencies[request_id].hasOwnProperty(details.url)) {
 			return 0;
 		}