[tor-commits] [tor-browser-bundle/master] Bug 16783: Normalize NoScript default whitelist

[mikeperry at torproject.org]

commit 41adead1637a07ec370fbab90e95324d62c2d1a6
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Sep 15 16:12:28 2015 -0700

    Bug 16783: Normalize NoScript default whitelist
    
    This ensures that if/when the NoScript whitelist is reset, the right list is
    there. The most important change here is noscript.mandatory, as NoScript
    ensures that those elements are in the whitelist every restart (and on New
    Identity).
---
 .../Browser/profile.default/preferences/extension-overrides.js    |    5 +++--
 .../Browser/profile.default/preferences/extension-overrides.js    |    5 +++--
 .../Browser/profile.default/preferences/extension-overrides.js    |    5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
index 26b019c..83d4bbf 100644
--- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:");
 pref("noscript.ABE.enabled", false);
 pref("noscript.ABE.notify", false);
 pref("noscript.ABE.wanIpAsLocal", false);
 pref("noscript.confirmUnblock", false);
 pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resources:");
 pref("noscript.firstRunRedirection", false);
 pref("noscript.global", true);
 pref("noscript.gtemp", "");
diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
index 26b019c..83d4bbf 100644
--- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:");
 pref("noscript.ABE.enabled", false);
 pref("noscript.ABE.notify", false);
 pref("noscript.ABE.wanIpAsLocal", false);
 pref("noscript.confirmUnblock", false);
 pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resources:");
 pref("noscript.firstRunRedirection", false);
 pref("noscript.global", true);
 pref("noscript.gtemp", "");
diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
index d92bd3b..83d4bbf 100644
--- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
+++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js
@@ -17,13 +17,14 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true);
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: chrome: resource:");
+pref("capability.policy.maonoscript.sites", "about: chrome: resource: blob: mediasource: moz-safe-about:");
+pref("noscript.default", "about: chrome: resource: blob: mediasource: moz-safe-about:");
+pref("noscript.mandatory", "about: chrome: resource: blob: mediasource: moz-safe-about:");
 pref("noscript.ABE.enabled", false);
 pref("noscript.ABE.notify", false);
 pref("noscript.ABE.wanIpAsLocal", false);
 pref("noscript.confirmUnblock", false);
 pref("noscript.contentBlocker", true);
-pref("noscript.default", "about: chrome: resource:");
 pref("noscript.firstRunRedirection", false);
 pref("noscript.global", true);
 pref("noscript.gtemp", "");