Merge fx-team to m-c. a=merge (4f09769d) · Commits · The Tor Project / Applications / Mullvad Browser

b2g/installer/package-manifest.in

+1 −0

Original line number	Diff line number	Diff line
		@@ -711,6 +711,7 @@
		@RESPATH@/components/nsUrlClassifierHashCompleter.js
		@RESPATH@/components/nsUrlClassifierListManager.js
		@RESPATH@/components/nsUrlClassifierLib.js
		@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
		@RESPATH@/components/url-classifier.xpt

		; GNOME hooks

browser/base/content/aboutaccounts/aboutaccounts.js

+6 −1

Original line number	Diff line number	Diff line
		@@ -148,8 +148,13 @@ let wrapper = {

		if (accountData.customizeSync) {
		Services.prefs.setBoolPref(PREF_SYNC_SHOW_CUSTOMIZATION, true);
		delete accountData.customizeSync;
		}
		delete accountData.customizeSync;
		// sessionTokenContext is erroneously sent by the content server.
		// https://github.com/mozilla/fxa-content-server/issues/2766
		// To avoid having the FxA storage manager not knowing what to do with
		// it we delete it here.
		delete accountData.sessionTokenContext;

		// We need to confirm a relink - see shouldAllowRelink for more
		let newAccountEmail = accountData.email;

browser/base/content/browser-trackingprotection.js

+11 −4

Original line number	Diff line number	Diff line
		@@ -116,8 +116,12 @@ let TrackingProtection = {
		// Add the current host in the 'trackingprotection' consumer of
		// the permission manager using a normalized URI. This effectively
		// places this host on the tracking protection allowlist.
		if (PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) {
		PrivateBrowsingUtils.addToTrackingAllowlist(normalizedUrl);
		} else {
		Services.perms.add(normalizedUrl,
		"trackingprotection", Services.perms.ALLOW_ACTION);
		}

		// Telemetry for disable protection.
		this.eventsHistogram.add(1);
		@@ -133,8 +137,11 @@ let TrackingProtection = {
		"https://" + gBrowser.selectedBrowser.currentURI.hostPort,
		null, null);

		Services.perms.remove(normalizedUrl,
		"trackingprotection");
		if (PrivateBrowsingUtils.isBrowserPrivate(gBrowser.selectedBrowser)) {
		PrivateBrowsingUtils.removeFromTrackingAllowlist(normalizedUrl);
		} else {
		Services.perms.remove(normalizedUrl, "trackingprotection");
		}

		// Telemetry for enable protection.
		this.eventsHistogram.add(2);

browser/base/content/test/general/browser.ini

+4 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,10 @@ tags = trackingprotection
		support-files =
		trackingPage.html
		benignPage.html
		[browser_trackingUI_5.js]
		tags = trackingprotection
		support-files =
		trackingPage.html
		[browser_typeAheadFind.js]
		skip-if = buildapp == 'mulet'
		[browser_unknownContentType_title.js]

browser/base/content/test/general/browser_trackingUI_5.js

0 → 100644

+122 −0

Original line number	Diff line number	Diff line
		/* Any copyright is dedicated to the Public Domain.
		http://creativecommons.org/publicdomain/zero/1.0/ */

		// Test that sites added to the Tracking Protection whitelist in private
		// browsing mode don't persist once the private browsing window closes.

		const PB_PREF = "privacy.trackingprotection.pbmode.enabled";
		const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/general/trackingPage.html";
		let TrackingProtection = null;
		let browser = null;
		let {UrlClassifierTestUtils} = Cu.import("resource://testing-common/UrlClassifierTestUtils.jsm", {});

		registerCleanupFunction(function() {
		TrackingProtection = browser = null;
		UrlClassifierTestUtils.cleanupTestTrackers();
		});

		function hidden(sel) {
		let win = browser.ownerGlobal;
		let el = win.document.querySelector(sel);
		let display = win.getComputedStyle(el).getPropertyValue("display", null);
		return display === "none";
		}

		function clickButton(sel) {
		let win = browser.ownerGlobal;
		let el = win.document.querySelector(sel);
		el.doCommand();
		}

		function testTrackingPage(window) {
		info("Tracking content must be blocked");
		ok(!TrackingProtection.container.hidden, "The container is visible");
		is(TrackingProtection.content.getAttribute("state"), "blocked-tracking-content",
		'content: state="blocked-tracking-content"');
		is(TrackingProtection.icon.getAttribute("state"), "blocked-tracking-content",
		'icon: state="blocked-tracking-content"');

		ok(!hidden("#tracking-protection-icon"), "icon is visible");
		ok(hidden("#tracking-action-block"), "blockButton is hidden");

		ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");
		ok(!hidden("#tracking-action-unblock-private"), "unblockButtonPrivate is visible");

		// Make sure that the blocked tracking elements message appears
		ok(hidden("#tracking-not-detected"), "labelNoTracking is hidden");
		ok(hidden("#tracking-loaded"), "labelTrackingLoaded is hidden");
		ok(!hidden("#tracking-blocked"), "labelTrackingBlocked is visible");
		}

		function testTrackingPageUnblocked() {
		info("Tracking content must be white-listed and not blocked");
		ok(!TrackingProtection.container.hidden, "The container is visible");
		is(TrackingProtection.content.getAttribute("state"), "loaded-tracking-content",
		'content: state="loaded-tracking-content"');
		is(TrackingProtection.icon.getAttribute("state"), "loaded-tracking-content",
		'icon: state="loaded-tracking-content"');

		ok(!hidden("#tracking-protection-icon"), "icon is visible");
		ok(!hidden("#tracking-action-block"), "blockButton is visible");
		ok(hidden("#tracking-action-unblock"), "unblockButton is hidden");

		// Make sure that the blocked tracking elements message appears
		ok(hidden("#tracking-not-detected"), "labelNoTracking is hidden");
		ok(!hidden("#tracking-loaded"), "labelTrackingLoaded is visible");
		ok(hidden("#tracking-blocked"), "labelTrackingBlocked is hidden");
		}

		add_task(function* testExceptionAddition() {
		yield UrlClassifierTestUtils.addTestTrackers();
		let privateWin = yield promiseOpenAndLoadWindow({private: true}, true);
		browser = privateWin.gBrowser;
		let tab = browser.selectedTab = browser.addTab();

		TrackingProtection = browser.ownerGlobal.TrackingProtection;
		yield pushPrefs([PB_PREF, true]);

		ok(TrackingProtection.enabled, "TP is enabled after setting the pref");

		info("Load a test page containing tracking elements");
		yield promiseTabLoadEvent(tab, TRACKING_PAGE);

		testTrackingPage(tab.ownerDocument.defaultView);

		info("Disable TP for the page (which reloads the page)");
		let tabReloadPromise = promiseTabLoadEvent(tab);
		clickButton("#tracking-action-unblock");
		yield tabReloadPromise;
		testTrackingPageUnblocked();

		info("Test that the exception is remembered across tabs in the same private window");
		tab = browser.selectedTab = browser.addTab();

		info("Load a test page containing tracking elements");
		yield promiseTabLoadEvent(tab, TRACKING_PAGE);
		testTrackingPageUnblocked();

		yield promiseWindowClosed(privateWin);
		});

		add_task(function* testExceptionPersistence() {
		info("Open another private browsing window");
		let privateWin = yield promiseOpenAndLoadWindow({private: true}, true);
		browser = privateWin.gBrowser;
		let tab = browser.selectedTab = browser.addTab();

		TrackingProtection = browser.ownerGlobal.TrackingProtection;
		ok(TrackingProtection.enabled, "TP is still enabled");

		info("Load a test page containing tracking elements");
		yield promiseTabLoadEvent(tab, TRACKING_PAGE);

		testTrackingPage(tab.ownerDocument.defaultView);

		info("Disable TP for the page (which reloads the page)");
		let tabReloadPromise = promiseTabLoadEvent(tab);
		clickButton("#tracking-action-unblock");
		yield tabReloadPromise;
		testTrackingPageUnblocked();

		privateWin.close();
		});