- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 4f7417becede4e116eecade1dfad65f67ccbbe8d Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 19 11:45:29 2018 -0700 Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60 The infrastructure for loading extension-overrides.js no longer exists in ESR60, so these prefs had to be moved. Unfortunately, we can't just dump the contents of extension-overrides.js into 000-tor-browser.js. The settings are actually partially built in tor-browser-build to conditionally include various bridge strings as well as localization settings. So, we piggy back off this existing build process and just append the contents of the partially generated extension-overrids.js to 000-tor-browser.js. --- .../extension-overrides.js | 0 .../preferences/extension-overrides.js | 63 ---------------------- .../preferences/extension-overrides.js | 63 ---------------------- projects/tor-browser/build | 17 +++--- 4 files changed, 9 insertions(+), 134 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js similarity index 100% rename from projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js rename to projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js deleted file mode 100644 index c81a7bf..0000000 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ /dev/null @@ -1,63 +0,0 @@ -# Overrides for Extension Preferences -# Tor Browser Bundle -# Do not edit this file. - -# HTTPS Everywhere Preferences: -pref("extensions.https_everywhere._observatory.popup_shown", true); -pref("extensions.https_everywhere.toolbar_hint_shown", true); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -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.firstRunRedirection", false); -pref("noscript.global", true); -pref("noscript.gtemp", ""); -pref("noscript.opacizeObject", 3); -pref("noscript.forbidWebGL", true); -pref("noscript.forbidFonts", false); -pref("noscript.options.tabSelectedIndexes", "5,0,0"); -pref("noscript.policynames", ""); -pref("noscript.secureCookies", true); -pref("noscript.showAllowPage", false); -pref("noscript.showBaseDomain", false); -pref("noscript.showDistrust", false); -pref("noscript.showRecentlyBlocked", false); -pref("noscript.showTemp", false); -pref("noscript.showTempToPerm", false); -pref("noscript.showUntrusted", false); -pref("noscript.STS.enabled", false); -pref("noscript.subscription.lastCheck", -142148139); -pref("noscript.temp", ""); -pref("noscript.untrusted", ""); -pref("noscript.forbidMedia", false); -pref("noscript.allowWhitelistUpdates", false); -pref("noscript.fixLinks", false); -// Now handled by plugins.click_to_play -pref("noscript.forbidFlash", false); -pref("noscript.forbidSilverlight", false); -pref("noscript.forbidJava", false); -pref("noscript.forbidPlugins", false); -// Usability tweaks -pref("noscript.showPermanent", false); -pref("noscript.showTempAllowPage", true); -pref("noscript.showRevokeTemp", true); -pref("noscript.notify", false); -pref("noscript.autoReload", true); -pref("noscript.autoReload.allTabs", false); -pref("noscript.cascadePermissions", true); -pref("noscript.restrictSubdocScripting", true); -pref("noscript.showVolatilePrivatePermissionsToggle", false); -pref("noscript.volatilePrivatePermissions", true); -pref("noscript.clearClick", 0); - -# PDF.js -// needs to be a user_pref because pdf.js blows away non-user prefs with its own -// defaults each time -user_pref("pdfjs.disableRange", true); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js deleted file mode 100644 index c81a7bf..0000000 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ /dev/null @@ -1,63 +0,0 @@ -# Overrides for Extension Preferences -# Tor Browser Bundle -# Do not edit this file. - -# HTTPS Everywhere Preferences: -pref("extensions.https_everywhere._observatory.popup_shown", true); -pref("extensions.https_everywhere.toolbar_hint_shown", true); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -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.firstRunRedirection", false); -pref("noscript.global", true); -pref("noscript.gtemp", ""); -pref("noscript.opacizeObject", 3); -pref("noscript.forbidWebGL", true); -pref("noscript.forbidFonts", false); -pref("noscript.options.tabSelectedIndexes", "5,0,0"); -pref("noscript.policynames", ""); -pref("noscript.secureCookies", true); -pref("noscript.showAllowPage", false); -pref("noscript.showBaseDomain", false); -pref("noscript.showDistrust", false); -pref("noscript.showRecentlyBlocked", false); -pref("noscript.showTemp", false); -pref("noscript.showTempToPerm", false); -pref("noscript.showUntrusted", false); -pref("noscript.STS.enabled", false); -pref("noscript.subscription.lastCheck", -142148139); -pref("noscript.temp", ""); -pref("noscript.untrusted", ""); -pref("noscript.forbidMedia", false); -pref("noscript.allowWhitelistUpdates", false); -pref("noscript.fixLinks", false); -// Now handled by plugins.click_to_play -pref("noscript.forbidFlash", false); -pref("noscript.forbidSilverlight", false); -pref("noscript.forbidJava", false); -pref("noscript.forbidPlugins", false); -// Usability tweaks -pref("noscript.showPermanent", false); -pref("noscript.showTempAllowPage", true); -pref("noscript.showRevokeTemp", true); -pref("noscript.notify", false); -pref("noscript.autoReload", true); -pref("noscript.autoReload.allTabs", false); -pref("noscript.cascadePermissions", true); -pref("noscript.restrictSubdocScripting", true); -pref("noscript.showVolatilePrivatePermissionsToggle", false); -pref("noscript.volatilePrivatePermissions", true); -pref("noscript.clearClick", 0); - -# PDF.js -// needs to be a user_pref because pdf.js blows away non-user prefs with its own -// defaults each time -user_pref("pdfjs.disableRange", true); diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 1c98c35..f3ed949 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -12,6 +12,7 @@ mkdir -p $OUTDIR # directory named tor-browser (instead of tor-browser_en-US). Therefore we # stage everything under tor-browser-stage to avoid a conflict. TB_STAGE_DIR=$distdir/tor-browser-stage +EXTOVERRIDESPATH=$rootdir/Bundle-Data/PTConfigs/extension-overrides.js [% IF c("var/osx") %] TBDIR="$TB_STAGE_DIR/Tor Browser.app" @@ -20,7 +21,6 @@ TB_STAGE_DIR=$distdir/tor-browser-stage EXTSPATH=Contents/Resources/distribution/extensions TORBINPATH=Contents/MacOS/Tor TORCONFIGPATH=Contents/Resources/TorBrowser/Tor - EXTOVERRIDESPATH=Contents/Resources/distribution/preferences//extension-overrides.js MEEKPROFILEPATH=Contents/Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/libdmg') %] @@ -31,7 +31,6 @@ TB_STAGE_DIR=$distdir/tor-browser-stage DOCSPATH=TorBrowser/Docs EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions TORCONFIGPATH=TorBrowser/Data/Tor - EXTOVERRIDESPATH=TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches" @@ -116,9 +115,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T [% IF c("var/linux") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$TBDIR/$EXTOVERRIDESPATH" + >> "$EXTOVERRIDESPATH" [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$TBDIR/$EXTOVERRIDESPATH" + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$EXTOVERRIDESPATH" [% END %] [% END -%] [% IF c("var/windows") -%] @@ -126,13 +125,13 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T # We don't have fte available on Windows x86_64 yet grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ - >> "$TBDIR/$EXTOVERRIDESPATH" + >> "$EXTOVERRIDESPATH" [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> "$TBDIR/$EXTOVERRIDESPATH" + >> "$EXTOVERRIDESPATH" [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" @@ -146,8 +145,8 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u [% END %] [% IF ! c("var/multi_lingual") %] - echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$TBDIR/$EXTOVERRIDESPATH" - echo 'pref("intl.locale.matchOS", false);' >> "$TBDIR/$EXTOVERRIDESPATH" + echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$EXTOVERRIDESPATH" + echo 'pref("intl.locale.matchOS", false);' >> "$EXTOVERRIDESPATH" [% END %] [% IF c("var/linux") %] @@ -174,6 +173,8 @@ unzip omni.ja chrome/en-US/locale/browser/searchplugins* || [ $? -lt 3 ] mv chrome/en-US/locale/browser/searchplugins $rootdir rm -rf chrome/en-US unzip omni.ja defaults/preferences/000-tor-browser.js || [ $? -lt 3 ] +# Append our built extension-overrides.js to 000-tor-browser.js +cat "$EXTOVERRIDESPATH" >> defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js $rootdir [% IF c("var/osx") %] # Embed our default bookmarks within the en-US locale.

1 0

[tor-browser-build/master] Bug 20628: Add locales bn-BD, da, he, sv-SE, zh-TW
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 7ccafbcff04c11b352dc31081be06bc68f49ad60 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 00:59:11 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv-SE, zh-TW --- rbm.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rbm.conf b/rbm.conf index de5102d..f283b19 100644 --- a/rbm.conf +++ b/rbm.conf @@ -52,10 +52,13 @@ var: locale_ja: ja locales: - ar + - bn-BD + - da - de - es-ES - fa - fr + - he - it - '[% c("var/locale_ja") %]' - ko @@ -63,9 +66,11 @@ var: - pl - pt-BR - ru + - sv-SE - tr - vi - zh-CN + - zh-TW sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'arthur/20628+1'
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit b39dad476f870b60d7008c1e22e477dc80875c38 Merge: 6402ea6 7ccafbc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 22 05:30:07 2018 +0000 Merge remote-tracking branch 'arthur/20628+1' rbm.conf | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor-browser-build/maint-7.5] Revert "Bug 26428: add temporary fix to avoid https-e submodule error"
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 1c472c7aeff5f81b1d8e8357e37168520d14a36a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 00:14:35 2018 +0000 Revert "Bug 26428: add temporary fix to avoid https-e submodule error" This reverts commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0. First part of Bug 26451. --- projects/https-everywhere/config | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index c55933e..2385c5c 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,12 +1,10 @@ # vim: filetype=yaml sw=2 version: 2018.6.13 -git_url: https://github.com/boklm/https-everywhere -# Temporary fix for #26428 -git_hash: 53091373b8e4a78504dd2ddc55f953a267a7de87 +git_url: https://git.torproject.org/https-everywhere.git +git_hash: '[% c("version") %]' git_submodule: 1 gpg_keyring: https-everywhere.gpg -# Temporarily disable gpg check for #26428 -#tag_gpg_id: 1 +tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid

1 0

[tor-browser-build/maint-7.5] Picking up a new HTTPS Everywhere version
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 4377771ed4db4b90f7dddf8fc9a56626dfe491e6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 22 04:24:31 2018 +0000 Picking up a new HTTPS Everywhere version --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 84f2c76..6f9af8a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,8 +4,8 @@ Tor Browser 7.5.6 -- June 26 2018 * Update Tor to 0.3.3.7 * Update Tor Launcher to 0.2.14.5 * Bug 20890: Increase control port connection timeout - * Update HTTPS Everywhere to 2018.6.13 - * Bug 26428: Work around HTTPS Everywhere caused build bustage + * Update HTTPS Everywhere to 2018.6.21 + * Bug 26451: Prevent HTTPS Everywhere from freezing the browser * Update NoScript to 5.1.8.6 * Bug 21537: Mark .onion cookies as secure * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) diff --git a/rbm.conf b/rbm.conf index 31b9cc1..a741f7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[tor-browser-build/maint-7.5] Bug 26451: Latest https-everywhere, fixes browser freeze
by gk＠torproject.org 22 Jun '18

22 Jun '18

commit 74af3e0e1432b956c11ee95d32eb68dc968fe209 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 00:16:58 2018 +0000 Bug 26451: Latest https-everywhere, fixes browser freeze --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 2385c5c..739347b 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.6.13 +version: 2018.6.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_26058'
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 824e6df6e8177fabcb33dac06142332add64a7dd Merge: 46c71b6 72aacbd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 20:28:06 2018 +0000 Merge remote-tracking branch 'gk/bug_26058' src/chrome/content/torbutton.js | 16 ---------------- src/defaults/preferences/preferences.js | 1 - 2 files changed, 17 deletions(-)

1 0

[torbutton/master] Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu"
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 72aacbd7178d50abf2c95c43ce907e65b95ddb1c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 12:33:21 2018 +0000 Revert "Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu" This reverts commit d127873b498fb83e4f608b82a8d382df25183dd3. --- src/chrome/content/torbutton.js | 16 ---------------- src/defaults/preferences/preferences.js | 1 - 2 files changed, 17 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7f750bc..b56a628 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -175,9 +175,6 @@ var torbutton_unique_pref_observer = case "privacy.firstparty.isolate": torbutton_update_isolation_prefs(); break; - case "extensions.torbutton.hide_sync_ui": - torbutton_update_sync_ui(); - break; } } } @@ -404,7 +401,6 @@ function torbutton_init() { torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); - torbutton_update_sync_ui(); createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, m_tb_control_port, m_tb_control_pass, @@ -2339,18 +2335,6 @@ function torbutton_is_homepage_url(aURI) return (urls.indexOf(aURI.spec) >= 0); } -// Check if "extensions.torbutton.hide_sync_ui" is enabled, and if so, -// hide the "Sign in to Sync" button on the hamburger menu. -function torbutton_update_sync_ui() -{ - try { - document.getElementById("PanelUI-footer-fxa").style.display = - getBoolPref("extensions.torbutton.hide_sync_ui") ? "none" : ""; - } catch (e) { - torbutton_log(5, 'Error updating the Sync UI: ' + e); - } -} - // Update the NoScript button to reflect any changes to noscript prefs function torbutton_update_noscript_button() { diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f61cb89..5cfb0eb 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.hide_sync_ui", true); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[tor-launcher/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit f34580ab7e70487e5c97c67969326111ac00d074 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 01:37:46 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv, zh-TW --- src/chrome/content/network-settings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f86402d..0e18b29 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -304,10 +304,13 @@ function populateLocaleList(aLangPackAddons) let knownLanguages = { "en-US" : "English", "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", + "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", + "da" : "Dansk", "de" : "Deutsch", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", + "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", "ko" : "\ud55c\uad6d\uc5b4", @@ -315,9 +318,11 @@ function populateLocaleList(aLangPackAddons) "pl" : "Polski", "pt-PT" : "Portugu\u00eas (Europeu)", "ru" : "\u0420\u0443\u0441\u0441\u043a\u0438\u0439", + "sv" : "Svenska", "tr" : "T\u00fcrk\u00e7e", "vi" : "Ti\u1ebfng Vi\u1ec7t", - "zh-CN" : "\u7b80\u4f53\u5b57" + "zh-CN" : "\u7b80\u4f53\u5b57", + "zh-TW" : "\u6b63\u9ad4\u5b57" }; // Retrieve the current locale so we can select it within the list by default.

1 0

[torbutton/master] Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 46c71b6a528e70386fb8165f7d1507615d1a2a47 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jun 21 01:04:05 2018 -0700 Bug 20628: Add locales bn-BD, da, he, sv, zh-TW --- trans_tools/import-translations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 83c2b6a..736d62f 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,14 +2,14 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt-BR ru tr vi zh-CN" +BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain # so Basque XPIs can be build independently. We can do # this for other languages too, if anyone requests this # and translations are available. -BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv da" +BUNDLE_LOCALES="$BUNDLE_LOCALES eu" LOCALE_DIR=../src/chrome/locale

1 0

[tor-browser-build/master] Fold in older changelogs
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 6402ea66ab8ccc58870f09222a71caceeed4e41d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 19:03:17 2018 +0000 Fold in older changelogs --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 089cbad..4438a9d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,13 @@ +Tor Browser 8.0a8 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + +Tor Browser 7.5.5 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + Tor Browser 8.0a7 -- May 9 2018 * All platforms * Update Firefox to 52.8.0esr @@ -14,6 +24,17 @@ Tor Browser 8.0a7 -- May 9 2018 * Linux * Bug 26010: Change Snowflake rendezvous to use the Azure domain front +Tor Browser 7.5.4 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 23439: Exempt .onion domains from mixed content warnings + * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable + * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25020: Add a tbb_version.json file + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc

1 0

[tor-browser-build/maint-7.5] Picking up a -build2 from Mozilla
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit e2e0f83294692b6ff271ba073ad9ffa25fa5d02a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 18:48:05 2018 +0000 Picking up a -build2 from Mozilla --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index cfafe70..0ed39da 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 079c216..31b9cc1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[tor-browser-build/master] Bug 26440: move vaulted vars to a separate directory
by gk＠torproject.org 21 Jun '18

21 Jun '18

commit 2baf11975323cffae6a993fb5a2f57236f7c880d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 16:27:50 2018 +0200 Bug 26440: move vaulted vars to a separate directory --- tools/ansible/boklm-tbb-nightly-build.yml | 2 ++ .../ansible/{group_vars => vaulted_vars}/boklm-tbb-nightly/dma-auth.yml | 0 2 files changed, 2 insertions(+) diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index 2fe48cd..dd9e1dc 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -6,3 +6,5 @@ - role: tbb-nightly-build - role: unattended-upgrades - role: mta + vars_files: + - vaulted_vars/boklm-tbb-nightly/dma-auth.yml diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml similarity index 100% rename from tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml rename to tools/ansible/vaulted_vars/boklm-tbb-nightly/dma-auth.yml

1 0

[tor-browser-build/master] Bug 23384: Add user sukhbir on build-sunet-a.torproject.net
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 9638ce481f00edd72e5f307cde29978e66a5d24f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 21 15:50:27 2018 +0200 Bug 23384: Add user sukhbir on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/sukhbir.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 1445fce..8bf2e66 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -6,3 +6,4 @@ tbb_team_members: - gk - mcs - mikeperry + - sukhbir diff --git a/tools/ansible/roles/tbb-team/files/sukhbir.pub b/tools/ansible/roles/tbb-team/files/sukhbir.pub new file mode 100644 index 0000000..3277487 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/sukhbir.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCs5gQrS9m8H4qiR+Q0BT85jIHFgSb3ns2l1M1JWgWyI5eZvXCxIq1G9xI+HOp86mHA2XX7uWSCKWiWM1lt4UnM4jHm5thC2MEsKVqHaHF7s+lXq2uhybUma2fxXdYc9AM/TxujKKJ6U5qIkqLsX3HF5tQtEKY2lgPXgXNpldfX/IhtBWOfmRGTH5iu1hBIhhMAz31lTcYR4AOpcSeeMGRhYEka5RrH492OLfCVxphtlRtXm4CtAL4NpNe/cMZnntqprJJAjRJC71gU3OpT5a2zKKctN/5wTwAWpR1URXrQK4Mu37angYhjR/698iTJVAv2XxEgkB+NUCse98cIMUj5 sukhbir.in(a)gmail.com

1 0

[tor-browser-build/master] Bug 26438: Use non-sandbox background and .DS_Store again
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 8b91968072326cf32da011b2c8bd3bbef14e4ef4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 08:44:02 2018 +0000 Bug 26438: Use non-sandbox background and .DS_Store again --- .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 12292 bytes .../mac-applications.dmg/.background/background.png | Bin 49906 -> 50020 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store index 6eeec47..aeb3104 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png index a4358cf..94e4584 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png differ

1 0

[tor-browser-build/master] Bug 26438: Remove seatbelt profiles for macOS
by boklm＠torproject.org 21 Jun '18

21 Jun '18

commit 767dd879b91584d5828998804ab1ee45499ca640 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 21 07:45:40 2018 +0000 Bug 26438: Remove seatbelt profiles for macOS Starting with content sandboxing being enabled our seatbelt profiles have been broken (see: #22000). We should remove them for now to avoid a broken experience in the alphas. --- .../tor-browser/Bundle-Data/mac-sandbox/.DS_Store | Bin 6148 -> 0 bytes .../tor-browser/Bundle-Data/mac-sandbox/README.txt | 29 ----- .../mac-sandbox/start-browser-with-sandbox | 24 ---- .../Bundle-Data/mac-sandbox/start-tor-with-sandbox | 42 ------- projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb | 122 --------------------- .../tor-browser/Bundle-Data/mac-sandbox/tor.sb | 64 ----------- projects/tor-browser/build | 5 - 7 files changed, 286 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/.DS_Store b/projects/tor-browser/Bundle-Data/mac-sandbox/.DS_Store deleted file mode 100644 index 6c49e24..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-sandbox/.DS_Store and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/README.txt b/projects/tor-browser/Bundle-Data/mac-sandbox/README.txt deleted file mode 100644 index 47d6e5c..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/README.txt +++ /dev/null @@ -1,29 +0,0 @@ -Experimental Sandboxed Tor Browser for OS X - -Requirements: - Mac OS 10.9 or newer. - A willingness to run shell commands from Terminal. - -Follow these steps to use the sandbox profiles: - -1. Copy this folder ("Sandboxed Tor Browser") to a local drive, but do not - put it in /Applications. -2. Copy the TorBrowser app into your "Sandboxed Tor Browser" folder. -3. Open Terminal. -4. Run start-tor-with-sandbox and wait for Tor bootstrapping to finish. -5. Run start-browser-with-sandbox. - -Known Issues: - -You will need to manually kill start-tor-with-sandbox or the tor.real -process after you exit the browser. - -The browser has full access to the Tor control port. Ideally, access -would be limited to the things that are necessary for New Identity and -for the circuit display features. - -Printing does not work. - -The built-in updater will not work. - -Files can only be downloaded or saved to ~/Downloads. diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/start-browser-with-sandbox b/projects/tor-browser/Bundle-Data/mac-sandbox/start-browser-with-sandbox deleted file mode 100755 index 31d4218..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/start-browser-with-sandbox +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# TODO: assumes not in /Applications -# TODO: assumes app is in TorBrowser.app - -BASEDIR="`dirname \"$0\"`" -BASEDIR="`(cd \"$BASEDIR\" && pwd)`" -TORBROWSER_APP_DIR="$BASEDIR/TorBrowser.app" -TORBROWSER_DATA_DIR="$BASEDIR/TorBrowser-Data" -TOR_DATA_DIR="$TORBROWSER_DATA_DIR/Tor" -SOCKETDIR="/tmp/Tor" - -export TOR_SKIP_LAUNCH=1 -export TOR_CONTROL_IPC_PATH="$SOCKETDIR/control.socket" -export TOR_SOCKS_IPC_PATH="$SOCKETDIR/socks.socket" -export TOR_CONTROL_COOKIE_AUTH_FILE="$TOR_DATA_DIR/control_auth_cookie" -SB_PROFILE="`pwd`/tb.sb" -cd "$TORBROWSER_APP_DIR" -sandbox-exec -f "$SB_PROFILE" \ - -D "HOME_DIR=$HOME" \ - -D "CURRENT_DIR=$BASEDIR" \ - -D "TORBROWSER_APP_DIR=$TORBROWSER_APP_DIR" \ - -D "TORBROWSER_DATA_DIR=$TORBROWSER_DATA_DIR" \ - "./Contents/MacOS/firefox" diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/start-tor-with-sandbox b/projects/tor-browser/Bundle-Data/mac-sandbox/start-tor-with-sandbox deleted file mode 100755 index ec7f15e..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/start-tor-with-sandbox +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# TODO: assumes not in /Applications -# TODO: assumes /tmp/Tor is not used by anyone else. -# TODO: assumes app is in TorBrowser.app - -set -e - -BASEDIR="`dirname \"$0\"`" -BASEDIR="`(cd \"$BASEDIR\" && pwd)`" -TOR_DATA_DIR="$BASEDIR/TorBrowser-Data/Tor" -TOR_STATIC_DATA_DIR="$BASEDIR/TorBrowser.app/Contents/Resources/TorBrowser/Tor" -TOR_BIN_DIR="$BASEDIR/TorBrowser.app/Contents/MacOS/Tor" -TORRC="$TOR_DATA_DIR/torrc" -SOCKETDIR="/tmp/Tor" - -# Compiled Python modules require a compatible Python, which means 32-bit 2.6. -export VERSIONER_PYTHON_VERSION=2.6 -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH - -mkdir -p "$TOR_DATA_DIR" -if [ ! -e "$TORRC" ]; then - touch "$TORRC" -fi - -if [ ! -e "$SOCKETDIR" ]; then - mkdir -p "$SOCKETDIR" - chmod 700 "$SOCKETDIR" -fi - -TOR="$TOR_BIN_DIR/tor.real" -sandbox-exec -f tor.sb -D "TOR_DATA_DIR=$TOR_DATA_DIR" \ - -D "TOR_STATIC_DATA_DIR=$TOR_STATIC_DATA_DIR" \ - -D "TOR_BIN_DIR=$TOR_BIN_DIR" "$TOR" \ - --defaults-torrc "$TOR_STATIC_DATA_DIR/torrc-defaults" \ - -f "$TORRC" \ - CookieAuthentication 1 \ - DataDirectory "$TOR_DATA_DIR" \ - GeoIPFile "$TOR_STATIC_DATA_DIR/geoip" \ - GeoIPv6File "$TOR_STATIC_DATA_DIR/geoip6" \ - ControlPort "unix:$SOCKETDIR/control.socket" \ - SocksPort "unix:$SOCKETDIR/socks.socket" diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb b/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb deleted file mode 100644 index 385e914..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb +++ /dev/null @@ -1,122 +0,0 @@ -(version 1) - -;; Parameters: -;; HOME_DIR the user's home directory -;; CURRENT_DIR the current working directory -;; TORBROWSER_APP_DIR the TorBrowser.app directory -;; TORBROWSER_DATA_DIR the TorBrowser-Data directory - -;; TODO: can see all dirs but can download/save only in Downloads (no error reported though!) -;; TODO: printing does not work (Save to PDF does). - -(deny default) - -(define (home-path aSubPath) - (path (string-append (param "HOME_DIR") aSubPath))) - -(define (home-subpath aSubPath) - (subpath (string-append (param "HOME_DIR") aSubPath))) - -(define (torbrowser-data-dir-path aSubPath) - (path (string-append (param "TORBROWSER_DATA_DIR") aSubPath))) - -(define (torbrowser-data-dir-subpath aSubPath) - (subpath (string-append (param "TORBROWSER_DATA_DIR") aSubPath))) - -(define (torbrowser-app-dir-path aSubPath) - (subpath (string-append (param "TORBROWSER_APP_DIR") aSubPath))) - -(allow file-read* - (path "/Library/Preferences/com.apple.HIToolbox.plist") - (path "/Library/Preferences/com.apple.ViewBridge.plist") - (path "/Library/Preferences/.GlobalPreferences.plist") - (path "/dev/random") - (path "/dev/urandom") - (path "/dev/dtracehelper") - (path "/private/etc/localtime") - (path "/private/etc/passwd") - (path "/private/tmp") - (path "/private/var/tmp") - (path (param "HOME_DIR")) - (subpath "/Library/Audio") - (subpath "/Library/Fonts") - (subpath "/System") - (subpath "/private/var/folders") - (subpath "/usr/lib") - (subpath "/usr/share") - (home-subpath "/Downloads") - (home-subpath "/Library/Input Methods") - (home-subpath "/Library/Keyboard Layouts") - (home-subpath "/Library/Preferences") - (torbrowser-app-dir-path "") - (torbrowser-data-dir-path "") - (torbrowser-data-dir-subpath "/Browser") - (torbrowser-data-dir-path "/Tor/control_auth_cookie") -) - -(allow file-read-metadata - (home-path "/Desktop") - (home-path "/Library") - (home-path "/Library/Saved Application State") - (path (param "CURRENT_DIR")) - (path "/") - (path "/Applications") - (path "/Users") - (path "/etc") - (path "/home") - (path "/net") - (path "/private/var/db/.AppleSetupDone") - (path "/tmp") - (path "/var") - (torbrowser-data-dir-path "/Tor/control.socket") - (torbrowser-data-dir-path "/Tor/socks.socket") - (path-regex "/private/tmp/Tor[-0-9]*/control.socket") - (path-regex "/private/tmp/Tor[-0-9]*/socks.socket") -) - -(allow file-write-data file-ioctl - (path "/dev/dtracehelper") -) - -(allow file-write* - (home-subpath "/Downloads") - (home-path "/Library/Preferences/.GlobalPreferences.plist") - (torbrowser-data-dir-subpath "/Browser") - (subpath "/private/var/folders") - (path-regex (string-append "^" (param "HOME_DIR") "/Library/Preferences/org.mozilla.tor")) - (path "/Library/Preferences/.GlobalPreferences.plist") -) - -(allow iokit-open) - -(allow ipc-posix-shm - (ipc-posix-name "apple.shm.notification_center") - (ipc-posix-name-regex "^/tmp/com.apple.csseed") - (ipc-posix-name-regex "^CFPBS:") - (ipc-posix-name-regex "^apple\.cfprefs\.") - (ipc-posix-name-regex "^apple\.shm\.cfprefs\.") - (ipc-posix-name-regex "^AudioIO") -) - -(allow mach-lookup) - -(allow mach-register - (local-name "com.apple.CFPasteboardClient") - (local-name "com.apple.axserver") - (local-name "com.apple.coredrag") - (local-name "com.apple.tsm.portname") -) - -(allow network-outbound - (path "/private/var/run/cupsd") - (torbrowser-data-dir-path "/Tor/control.socket") - (torbrowser-data-dir-path "/Tor/socks.socket") - (path-regex "/private/tmp/Tor[-0-9]*/control.socket") - (path-regex "/private/tmp/Tor[-0-9]*/socks.socket") -) - -(allow process-exec* - (torbrowser-app-dir-path "/Contents/MacOS/firefox") -) - -(allow sysctl-read) diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/tor.sb b/projects/tor-browser/Bundle-Data/mac-sandbox/tor.sb deleted file mode 100644 index 40abc9c..0000000 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/tor.sb +++ /dev/null @@ -1,64 +0,0 @@ -(version 1) - -;; Parameters: -;; TOR_DATA_DIR directory that contains writeable config, e.g, torrc -;; TOR_STATIC_DATA_DIR directory for read-only config, e.g., torrc-defaults -;; TOR_BIN_DIR directory that contains tor binaries, e.g., tor.real - -(deny default) - -(allow file-read* file-write-data file-ioctl - (path "/dev/dtracehelper") -) - -(allow file-read* - (subpath (param "TOR_BIN_DIR")) - (subpath "/usr/local") - (subpath (param "TOR_DATA_DIR")) - (subpath (param "TOR_STATIC_DATA_DIR")) - (subpath (param "TOR_BIN_DIR")) - (path-regex "/private/tmp/Tor[-0-9]*") -) - -(allow file-read-data - (path "/dev/random") - (path "/dev/srandom") - (path "/dev/urandom") - (subpath "/usr/share") -) - -(allow file-read-metadata - (path "/etc") - (path "/private/etc/localtime") - (path "/tmp") - (subpath "/usr/lib") -) - -(allow file-write* - (subpath (param "TOR_DATA_DIR")) -) - -(allow ipc-posix-shm-read-data - (ipc-posix-name "apple.shm.notification_center") -) - -(allow mach-lookup - (global-name "com.apple.system.notification_center") -) - -(allow network-inbound file-write* - (path (string-append (param "TOR_DATA_DIR") "/control.socket")) - (path (string-append (param "TOR_DATA_DIR") "/socks.socket")) - (path-regex "/private/tmp/Tor[-0-9]*/control.socket") - (path-regex "/private/tmp/Tor[-0-9]*/socks.socket") -) - -(allow network-outbound - (remote tcp "*:*") -) - -(allow process-exec - (path (string-append (param "TOR_BIN_DIR") "/tor.real")) -) - -(allow sysctl-read) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 65c752b..1c98c35 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -105,11 +105,6 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mv "$TBDIR/$TORBINPATH/tor" "$TBDIR/$TORBINPATH/tor.real" cp Bundle-Data/mac-tor.sh "$TBDIR/$TORCONFIGPATH/tor" - [% IF ! c("var/release") -%] - SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" - mv Bundle-Data/mac-sandbox "$SANDBOX_FOLDER" - [% END -%] - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %]

1 0

[tor-browser-build/maint-7.5] Prepating build2 with fix for #26428
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 1d5a375834a1fc1884145591d4fb63623b071486 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 20 19:46:00 2018 +0000 Prepating build2 with fix for #26428 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f7160bf..84f2c76 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser 7.5.6 -- June 26 2018 * Update Tor Launcher to 0.2.14.5 * Bug 20890: Increase control port connection timeout * Update HTTPS Everywhere to 2018.6.13 + * Bug 26428: Work around HTTPS Everywhere caused build bustage * Update NoScript to 5.1.8.6 * Bug 21537: Mark .onion cookies as secure * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) diff --git a/rbm.conf b/rbm.conf index 5a90617..079c216 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5.6' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5.4 - 7.5.5

1 0

[tor-browser-build/maint-7.5] Bug 26428: add temporary fix to avoid https-e submodule error
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 20 19:14:27 2018 +0200 Bug 26428: add temporary fix to avoid https-e submodule error --- projects/https-everywhere/config | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 2385c5c..c55933e 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,10 +1,12 @@ # vim: filetype=yaml sw=2 version: 2018.6.13 -git_url: https://git.torproject.org/https-everywhere.git -git_hash: '[% c("version") %]' +git_url: https://github.com/boklm/https-everywhere +# Temporary fix for #26428 +git_hash: 53091373b8e4a78504dd2ddc55f953a267a7de87 git_submodule: 1 gpg_keyring: https-everywhere.gpg -tag_gpg_id: 1 +# Temporarily disable gpg check for #26428 +#tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid

1 0

[tor-browser-build/maint-7.5] Bug 26054: Make sure to create incrementals from previously signed MAR files
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 6df6be50faee48c807e8ca257e9179998aa8bc61 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 15:54:31 2018 +0200 Bug 26054: Make sure to create incrementals from previously signed MAR files --- tools/update-responses/update_responses | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bf2415d..1df35b3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -209,6 +209,10 @@ sub create_incremental_mar { my $tmpdir = get_tmpdir($config); extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); + # bug 26054: make sure previous macOS version is code signed + if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { + exit_error "Missing code signature in $from_version while creating $mar_file"; + } if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") {

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5.6
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 376527bbad5fa5550f1109c7d9de4bb216a32da2 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 20 13:30:18 2018 +0000 Release preparations for 7.5.6 Changelog update and versions bump --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 3 ++- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index e91d1ca..cfafe70 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.8.1 + firefox_platform_version: 52.9.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index cfa0a78..2385c5c 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.4.11 +version: 2018.6.13 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5d52b10..f7160bf 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 7.5.6 -- June 26 2018 + * All platforms + * Update Firefox to 52.9.0esr + * Update Tor to 0.3.3.7 + * Update Tor Launcher to 0.2.14.5 + * Bug 20890: Increase control port connection timeout + * Update HTTPS Everywhere to 2018.6.13 + * Update NoScript to 5.1.8.6 + * Bug 21537: Mark .onion cookies as secure + * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) + * Bug 25721: Backport patches from Mozilla's bug 1448771 + * Bug 25147+25458: Sanitize HTML fragments for chrome documents + * Bug 26221: Backport fix for leak in SHA256 in nsHttpConnectionInfo.cpp + * Windows + * Bug 26424: Disable UNC paths to prevent possible proxy bypasses + Tor Browser 7.5.5 -- June 10 2018 * All platforms * Update Firefox to 52.8.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index dec5648..4d7c959 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi + - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.6.xpi name: noscript - sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 + sha256sum: c09f19b0ce79ea9b59a988af77d28d48fd7afbbd26a85f93a35c22100eb51536 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 05d353f..43a9cb0 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14.4 +version: 0.2.14.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 9107b28..7ec9504 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.10 +version: 0.3.3.7 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index 4329958..5a90617 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5.5' + torbrowser_version: '7.5.6' torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5.4 + - 7.5.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-7.5] Bug 26059: Use signed directory when generating incremental mars
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit c4dafdefafde5f6f4208eee508ef244a1333510d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 13:14:13 2018 +0200 Bug 26059: Use signed directory when generating incremental mars We update the update_responses script to be able to specify a different $releases_dir for each version. When generating incremental mars, this allows us to set the default releases_dir to {alpha,release}/signed and the current version's releases_dir to {alpha,release}/unsigned. --- Makefile | 4 ++-- projects/release/config | 4 ++++ projects/release/update_responses_config.yml | 5 ++++- tools/update-responses/update_responses | 27 ++++++++++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2707d41..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,13 @@ signtag-alpha: submodule-update $(rbm) build release --step signtag --target alpha incrementals-release: submodule-update - $(rbm) build release --step update_responses_config --target release + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update - $(rbm) build release --step update_responses_config --target alpha + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha diff --git a/projects/release/config b/projects/release/config index 61c6175..bd94607 100644 --- a/projects/release/config +++ b/projects/release/config @@ -73,6 +73,10 @@ targets: var: signed_status: signed + create_unsigned_incrementals: + var: + create_unsigned_incrementals: 1 + input_files: # Release diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 01c6950..1a9b0cf 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -5,7 +5,7 @@ appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install appname_bundle_win64: torbrowser-install-win64 -releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] +releases_dir: [% path(c('output_dir')) %]/signed download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../keyring/torbrowser.gpg @@ -25,6 +25,9 @@ channels: [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %] versions: [% c("var/torbrowser_version") %]: +[% IF c("var/create_unsigned_incrementals") -%] + releases_dir: [% path(c('output_dir')) %]/unsigned +[% END -%] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 658f451..bf2415d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -92,7 +92,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $appname = $config->{appname_marfile}; my $files = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -126,7 +126,7 @@ sub get_version_files { sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -179,15 +179,15 @@ sub extract_mar { } sub mar_filename { - my ($appname, $version, $os, $lang) = @_; - "$releases_dir/$version/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os, $lang) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; } sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $appname = $config->{appname_marfile}; my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; - my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; return; @@ -207,8 +207,8 @@ sub create_incremental_mar { }; return if $pm->start($finished_file); my $tmpdir = get_tmpdir($config); - extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); - extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); + extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { @@ -250,6 +250,11 @@ sub get_config { // $config->{$name}; } +sub version_dir { + my ($config, $version) = @_; + return get_config($config, $version, 'any', 'releases_dir') . "/$version"; +} + sub channel_to_version { my ($config, @channels) = @_; return values %{$config->{channels}} unless @channels; @@ -270,7 +275,7 @@ sub get_buildinfos { next unless $files->{$os}{$lang}{complete}; my $tmpdir = get_tmpdir($config); extract_mar( - mar_filename($config->{appname_marfile}, $version, $os, $lang), + mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), "$tmpdir"); my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; $appfile = "$tmpdir/Contents/Resources/application.ini" @@ -423,7 +428,7 @@ my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; my $osname = osname; - my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -523,7 +528,7 @@ sub check_update_responses_channel { sub download_version { my ($config, $version) = @_; my $tmpdir = get_tmpdir($config); - my $destdir = "$releases_dir/$version"; + my $destdir = version_dir($config, $version); my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { @@ -576,7 +581,7 @@ sub download_missing_versions { my $cversion = $config->{channels}{$channel}; next unless $config->{versions}{$cversion}{incremental_from}; foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { - next if -d "$releases_dir/$version"; + next if -d version_dir($config, $version); download_version($config, $version); } }

1 0

[tor-browser/tor-browser-52.8.0esr-7.5-1] Bug 1444532 - Fix a leak in SHA256 in nsHttpConnectionInfo.cpp. r=mayhemer, a=jcristau
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 4edbd21ab9244671cb77cf9a4de5e1126079146e Author: David Keeler <dkeeler(a)mozilla.com> Date: Fri Mar 9 14:16:57 2018 -0800 Bug 1444532 - Fix a leak in SHA256 in nsHttpConnectionInfo.cpp. r=mayhemer, a=jcristau The original code (from bug 1200802) declared an XPCOM object as a static bare pointer, which for future reference is probably never the right thing to do. It might have worked if it was cleared before shutdown but it never was. MozReview-Commit-ID: EMe7wgzm6zv --HG-- extra : rebase_source : 16c36a76e39b762e87c7d3c74e64204d7ca9929d extra : source : ad1e07a06363096efbfbf115cbc274c4ee9dcd40 --- netwerk/protocol/http/nsHttpConnectionInfo.cpp | 28 +++++++++++--------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.cpp b/netwerk/protocol/http/nsHttpConnectionInfo.cpp index e965fd1cc2e9..4b9c84a7ed62 100644 --- a/netwerk/protocol/http/nsHttpConnectionInfo.cpp +++ b/netwerk/protocol/http/nsHttpConnectionInfo.cpp @@ -14,33 +14,29 @@ #define LOG_ENABLED() LOG5_ENABLED() #include "nsHttpConnectionInfo.h" + #include "mozilla/net/DNS.h" -#include "prnetdb.h" -#include "nsICryptoHash.h" #include "nsComponentManagerUtils.h" +#include "nsICryptoHash.h" #include "nsIProtocolProxyService.h" +#include "nsNetCID.h" +#include "prnetdb.h" static nsresult SHA256(const char* aPlainText, nsAutoCString& aResult) { - static nsICryptoHash* hasher = nullptr; - nsresult rv; - if (!hasher) { - rv = CallCreateInstance("@mozilla.org/security/hash;1", &hasher); + nsresult rv; + nsCOMPtr<nsICryptoHash> hasher = + do_CreateInstance(NS_CRYPTO_HASH_CONTRACTID, &rv); if (NS_FAILED(rv)) { LOG(("nsHttpDigestAuth: no crypto hash!\n")); return rv; } - } - - rv = hasher->Init(nsICryptoHash::SHA256); - NS_ENSURE_SUCCESS(rv, rv); - - rv = hasher->Update((unsigned char*) aPlainText, strlen(aPlainText)); - NS_ENSURE_SUCCESS(rv, rv); - - rv = hasher->Finish(false, aResult); - return rv; + rv = hasher->Init(nsICryptoHash::SHA256); + NS_ENSURE_SUCCESS(rv, rv); + rv = hasher->Update((unsigned char*) aPlainText, strlen(aPlainText)); + NS_ENSURE_SUCCESS(rv, rv); + return hasher->Finish(false, aResult); } namespace mozilla {

1 0

[tor-browser/tor-browser-52.8.0esr-7.5-1] Bug 25458: UI customization half-broken in Tor Browser 8.0a3
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit dfc72b77f566b3dd98f08db0e4a8e7bedcf050a1 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Apr 20 16:03:41 2018 -0700 Bug 25458: UI customization half-broken in Tor Browser 8.0a3 Fixed fallout from #25147. Some of the functionality of the UI Customize screen is dependent on setting innerHTML on divs. Since the code runs in the System context, the HTML was being sanitized and broke page functionality. The offending statements have been switched to the unsafeSetInnerHTML() method which bypasses sanitization in System context. --- browser/components/customizableui/CustomizeMode.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/customizableui/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm index 49868cdbd4a0..4c32fd867c09 100644 --- a/browser/components/customizableui/CustomizeMode.jsm +++ b/browser/components/customizableui/CustomizeMode.jsm @@ -690,13 +690,13 @@ CustomizeMode.prototype = { // Put the tip contents in the popup. let bundle = this.document.getElementById("bundle_browser"); const kLabelClass = "customization-tipPanel-link"; - messageNode.innerHTML = bundle.getFormattedString("customizeTips.tip0", [ + messageNode.unsafeSetInnerHTML(bundle.getFormattedString("customizeTips.tip0", [ "<label class=\"customization-tipPanel-em\" value=\"" + bundle.getString("customizeTips.tip0.hint") + "\"/>", this.document.getElementById("bundle_brand").getString("brandShortName"), "<label class=\"" + kLabelClass + " text-link\" value=\"" + bundle.getString("customizeTips.tip0.learnMore") + "\"/>" - ]); + ])); messageNode.querySelector("." + kLabelClass).addEventListener("click", () => { let url = Services.urlFormatter.formatURLPref("browser.customizemode.tip0.learnMoreUrl");

1 0

[tor-browser/tor-browser-52.8.0esr-7.5-1] Bug 25147: Sanitize HTML fragments created for chrome-privileged documents
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 8c3c7dcd7e71ae7ca9237fef555efb602ddc7bcc Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Mar 1 14:12:08 2018 -0800 Bug 25147: Sanitize HTML fragments created for chrome-privileged documents Ported over firefox patch c2db4a50dc5c (Bug 1432966) --- .../tests/mochitest/events/test_mutation.html | 4 +- browser/base/content/browser-media.js | 59 ++++++------ .../customizableui/CustomizableWidgets.jsm | 2 +- browser/modules/webrtcUI.jsm | 21 +++-- .../client/responsive.html/components/browser.js | 7 ++ devtools/shared/gcli/source/lib/gcli/util/util.js | 6 +- .../tests/browser/browser_l10n_localizeMarkup.js | 4 +- dom/base/Element.cpp | 6 ++ dom/base/Element.h | 1 + dom/base/FragmentOrElement.cpp | 13 ++- dom/base/FragmentOrElement.h | 3 +- dom/base/nsContentUtils.cpp | 60 ++++++++++-- dom/base/nsContentUtils.h | 26 +++++- dom/base/nsDocument.cpp | 12 ++- dom/base/nsIDocument.h | 6 ++ dom/base/test/chrome.ini | 1 + dom/base/test/chrome/test_bug683852.xul | 4 +- dom/base/test/test_fragment_sanitization.xul | 101 +++++++++++++++++++++ dom/webidl/Document.webidl | 5 + dom/webidl/Element.webidl | 10 ++ layout/style/test/chrome/bug418986-2.js | 16 +++- mobile/android/chrome/content/config.js | 4 +- toolkit/content/tests/chrome/test_bug570192.xul | 4 +- toolkit/mozapps/extensions/content/extensions.js | 2 +- 24 files changed, 309 insertions(+), 68 deletions(-) diff --git a/accessible/tests/mochitest/events/test_mutation.html b/accessible/tests/mochitest/events/test_mutation.html index 232a0972777f..63dd74ca4775 100644 --- a/accessible/tests/mochitest/events/test_mutation.html +++ b/accessible/tests/mochitest/events/test_mutation.html @@ -348,8 +348,8 @@ this.invoke = function insertReferredElm_invoke() { - this.containerNode.innerHTML = - "<span id='insertReferredElms_span'></span><input aria-labelledby='insertReferredElms_span'>"; + this.containerNode.unsafeSetInnerHTML( + "<span id='insertReferredElms_span'></span><input aria-labelledby='insertReferredElms_span'>"); } this.getID = function insertReferredElm_getID() diff --git a/browser/base/content/browser-media.js b/browser/base/content/browser-media.js index 81e7faf17aad..c1ed8f9399fa 100644 --- a/browser/base/content/browser-media.js +++ b/browser/base/content/browser-media.js @@ -41,11 +41,23 @@ var gEMEHandler = { } return true; }, - getLearnMoreLink: function(msgId) { - let text = gNavigatorBundle.getString("emeNotifications." + msgId + ".learnMoreLabel"); + getEMEDisabledFragment(msgId) { + let mainMessage = gNavigatorBundle.getString("emeNotifications.drmContentDisabled.message"); + let [prefix, suffix] = mainMessage.split(/%(?:1\$)?S/).map(s => document.createTextNode(s)); + let text = gNavigatorBundle.getString("emeNotifications.drmContentDisabled.learnMoreLabel"); let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL"); - return "<label class='text-link' href='" + baseURL + "drm-content'>" + - text + "</label>"; + let link = document.createElement("label"); + link.className = "text-link"; + link.setAttribute("href", baseURL + "drm-content"); + link.textContent = text; + + let fragment = document.createDocumentFragment(); + [prefix, link, suffix].forEach(n => fragment.appendChild(n)); + return fragment; + }, + getMessageWithBrandName(notificationId) { + let msgId = "emeNotifications." + notificationId + ".message"; + return gNavigatorBundle.getFormattedString(msgId, [this._brandShortName]); }, receiveMessage: function({target: browser, data: data}) { let parsedData; @@ -63,7 +75,8 @@ var gEMEHandler = { let notificationId; let buttonCallback; - let params = []; + // Notification message can be either a string or a DOM fragment. + let notificationMessage; switch (status) { case "available": case "cdm-created": @@ -77,18 +90,18 @@ var gEMEHandler = { case "api-disabled": case "cdm-disabled": notificationId = "drmContentDisabled"; - buttonCallback = gEMEHandler.ensureEMEEnabled.bind(gEMEHandler, browser, keySystem) - params = [this.getLearnMoreLink(notificationId)]; + buttonCallback = gEMEHandler.ensureEMEEnabled.bind(gEMEHandler, browser, keySystem); + notificationMessage = this.getEMEDisabledFragment(); break; case "cdm-insufficient-version": notificationId = "drmContentCDMInsufficientVersion"; - params = [this._brandShortName]; + notificationMessage = this.getMessageWithBrandName(notificationId); break; case "cdm-not-installed": notificationId = "drmContentCDMInstalling"; - params = [this._brandShortName]; + notificationMessage = this.getMessageWithBrandName(notificationId); break; case "cdm-not-supported": @@ -100,43 +113,27 @@ var gEMEHandler = { return; } - this.showNotificationBar(browser, notificationId, keySystem, params, buttonCallback); - }, - showNotificationBar: function(browser, notificationId, keySystem, labelParams, callback) { + // Now actually create the notification + let box = gBrowser.getNotificationBox(browser); if (box.getNotificationWithValue(notificationId)) { return; } - let msgPrefix = "emeNotifications." + notificationId + "."; - let msgId = msgPrefix + "message"; - - let message = labelParams.length ? - gNavigatorBundle.getFormattedString(msgId, labelParams) : - gNavigatorBundle.getString(msgId); - let buttons = []; - if (callback) { + if (buttonCallback) { + let msgPrefix = "emeNotifications." + notificationId + "."; let btnLabelId = msgPrefix + "button.label"; let btnAccessKeyId = msgPrefix + "button.accesskey"; buttons.push({ label: gNavigatorBundle.getString(btnLabelId), accessKey: gNavigatorBundle.getString(btnAccessKeyId), - callback: callback + callback: buttonCallback, }); } let iconURL = "chrome://browser/skin/drm-icon.svg#chains-black"; - - // Do a little dance to get rich content into the notification: - let fragment = document.createDocumentFragment(); - let descriptionContainer = document.createElement("description"); - descriptionContainer.innerHTML = message; - while (descriptionContainer.childNodes.length) { - fragment.appendChild(descriptionContainer.childNodes[0]); - } - - box.appendNotification(fragment, notificationId, iconURL, box.PRIORITY_WARNING_MEDIUM, + box.appendNotification(notificationMessage, notificationId, iconURL, box.PRIORITY_WARNING_MEDIUM, buttons); }, showPopupNotificationForSuccess: function(browser, keySystem) { diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 907e2e0f75b7..b18249a35811 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -327,7 +327,7 @@ const CustomizableWidgets = [ let promoParentElt = doc.getElementById("PanelUI-remotetabs-mobile-promo"); // Put it all together... let contents = bundle.getFormattedString("appMenuRemoteTabs.mobilePromo.text2", formatArgs); - promoParentElt.innerHTML = contents; + promoParentElt.unsafeSetInnerHTML(contents); // We manually manage the "click" event to open the promo links because // allowing the "text-link" widget handle it has 2 problems: (1) it only // supports button 0 and (2) it's tricky to intercept when it does the diff --git a/browser/modules/webrtcUI.jsm b/browser/modules/webrtcUI.jsm index b24135bfc959..ddcf09260f97 100644 --- a/browser/modules/webrtcUI.jsm +++ b/browser/modules/webrtcUI.jsm @@ -536,21 +536,26 @@ function prompt(aBrowser, aRequest) { bundle.getString("getUserMedia.shareScreen.learnMoreLabel"); let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL"); - let learnMore = - "<label class='text-link' href='" + baseURL + "screenshare-safety'>" + - learnMoreText + "</label>"; + + let learnMore = chromeWin.document.createElement("label"); + learnMore.className = "text-link"; + learnMore.setAttribute("href", baseURL + "screenshare-safety"); + learnMore.textContent = learnMoreText; if (type == "screen") { string = bundle.getFormattedString("getUserMedia.shareScreenWarning.message", - [learnMore]); - } - else { + ["<>"]); + } else { let brand = chromeDoc.getElementById("bundle_brand").getString("brandShortName"); string = bundle.getFormattedString("getUserMedia.shareFirefoxWarning.message", - [brand, learnMore]); + [brand, "<>"]); } - warning.innerHTML = string; + + let [pre, post] = string.split("<>"); + warning.textContent = pre; + warning.appendChild(learnMore); + warning.appendChild(chromeWin.document.createTextNode(post)); } let perms = Services.perms; diff --git a/devtools/client/responsive.html/components/browser.js b/devtools/client/responsive.html/components/browser.js index f2902905b522..91f709f0cb8a 100644 --- a/devtools/client/responsive.html/components/browser.js +++ b/devtools/client/responsive.html/components/browser.js @@ -16,6 +16,13 @@ const Types = require("../types"); const e10s = require("../utils/e10s"); const message = require("../utils/message"); +// Allow creation of HTML fragments without automatic sanitization, even +// though we're in a chrome-privileged document. +// This is, unfortunately, necessary in order to React to function +// correctly. + +document.allowUnsafeHTML = true; + module.exports = createClass({ /** diff --git a/devtools/shared/gcli/source/lib/gcli/util/util.js b/devtools/shared/gcli/source/lib/gcli/util/util.js index 065bf36c07db..cfc18062e1c5 100644 --- a/devtools/shared/gcli/source/lib/gcli/util/util.js +++ b/devtools/shared/gcli/source/lib/gcli/util/util.js @@ -498,7 +498,11 @@ exports.setContents = function(elem, contents) { return; } - if ('innerHTML' in elem) { + if ('unsafeSetInnerHTML' in elem) { + // FIXME: Stop relying on unsanitized HTML. + elem.unsafeSetInnerHTML(contents); + } + else if ('innerHTML' in elem) { elem.innerHTML = contents; } else { diff --git a/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js b/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js index f33a5a331c51..59bbb308ba44 100644 --- a/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js +++ b/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js @@ -18,7 +18,7 @@ add_task(function* () { info("Create the test markup"); let div = document.createElement("div"); - div.innerHTML = + div.unsafeSetInnerHTML( `<div data-localization-bundle="devtools/client/locales/startup.properties"> <div id="d0" data-localization="content=inspector.someInvalidKey"></div> <div id="d1" data-localization="content=inspector.label">Text will disappear</div> @@ -32,7 +32,7 @@ add_task(function* () { <div id="d5" data-localization="content=toolbox.defaultTitle"></div> </div> </div> - `; + `); info("Use localization helper to localize the test markup"); localizeMarkup(div); diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 09c6b39da574..daf5d6aa98bf 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -3564,6 +3564,12 @@ Element::SetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError) } void +Element::UnsafeSetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError) +{ + SetInnerHTMLInternal(aInnerHTML, aError, true); +} + +void Element::GetOuterHTML(nsAString& aOuterHTML) { GetMarkup(true, aOuterHTML); diff --git a/dom/base/Element.h b/dom/base/Element.h index 5d878df60668..94991b26a641 100644 --- a/dom/base/Element.h +++ b/dom/base/Element.h @@ -896,6 +896,7 @@ public: NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML); virtual void SetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError); + void UnsafeSetInnerHTML(const nsAString& aInnerHTML, ErrorResult& aError); void GetOuterHTML(nsAString& aOuterHTML); void SetOuterHTML(const nsAString& aOuterHTML, ErrorResult& aError); void InsertAdjacentHTML(const nsAString& aPosition, const nsAString& aText, diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp index 4ad10931a8d0..c83a76dc2603 100644 --- a/dom/base/FragmentOrElement.cpp +++ b/dom/base/FragmentOrElement.cpp @@ -2183,7 +2183,8 @@ ContainsMarkup(const nsAString& aStr) } void -FragmentOrElement::SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult& aError) +FragmentOrElement::SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult& aError, + bool aNeverSanitize) { FragmentOrElement* target = this; // Handle template case. @@ -2237,6 +2238,9 @@ FragmentOrElement::SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult contextNameSpaceID = shadowRoot->GetHost()->GetNameSpaceID(); } + auto sanitize = (aNeverSanitize ? nsContentUtils::NeverSanitize + : nsContentUtils::SanitizeSystemPrivileged); + if (doc->IsHTMLDocument()) { int32_t oldChildCount = target->GetChildCount(); aError = nsContentUtils::ParseFragmentHTML(aInnerHTML, @@ -2245,14 +2249,17 @@ FragmentOrElement::SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult contextNameSpaceID, doc->GetCompatibilityMode() == eCompatibility_NavQuirks, - true); + true, + sanitize); mb.NodesAdded(); // HTML5 parser has notified, but not fired mutation events. nsContentUtils::FireMutationEventsForDirectParsing(doc, target, oldChildCount); } else { RefPtr<DocumentFragment> df = - nsContentUtils::CreateContextualFragment(target, aInnerHTML, true, aError); + nsContentUtils::CreateContextualFragment(target, aInnerHTML, true, + sanitize, + aError); if (!aError.Failed()) { // Suppress assertion about node removal mutation events that can't have // listeners anyway, because no one has had the chance to register mutation diff --git a/dom/base/FragmentOrElement.h b/dom/base/FragmentOrElement.h index 3cb5575fe063..c6ed7ab85e41 100644 --- a/dom/base/FragmentOrElement.h +++ b/dom/base/FragmentOrElement.h @@ -357,7 +357,8 @@ public: protected: void GetMarkup(bool aIncludeSelf, nsAString& aMarkup); - void SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult& aError); + void SetInnerHTMLInternal(const nsAString& aInnerHTML, ErrorResult& aError, + bool aNeverSanitize = false); // Override from nsINode virtual nsINode::nsSlots* CreateSlots() override; diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index f93274280f7c..182a1686d5fe 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -155,6 +155,7 @@ #include "nsIObserverService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIParser.h" +#include "nsIParserUtils.h" #include "nsIParserService.h" #include "nsIPermissionManager.h" #include "nsIPluginHost.h" @@ -195,6 +196,7 @@ #include "nsTextFragment.h" #include "nsTextNode.h" #include "nsThreadUtils.h" +#include "nsTreeSanitizer.h" #include "nsUnicharUtilCIID.h" #include "nsUnicodeProperties.h" #include "nsViewManager.h" @@ -4576,6 +4578,7 @@ already_AddRefed<DocumentFragment> nsContentUtils::CreateContextualFragment(nsINode* aContextNode, const nsAString& aFragment, bool aPreventScriptExecution, + SanitizeFragments aSanitize, ErrorResult& aRv) { if (!aContextNode) { @@ -4611,14 +4614,16 @@ nsContentUtils::CreateContextualFragment(nsINode* aContextNode, contextAsContent->GetNameSpaceID(), (document->GetCompatibilityMode() == eCompatibility_NavQuirks), - aPreventScriptExecution); + aPreventScriptExecution, + aSanitize); } else { aRv = ParseFragmentHTML(aFragment, frag, nsGkAtoms::body, kNameSpaceID_XHTML, (document->GetCompatibilityMode() == eCompatibility_NavQuirks), - aPreventScriptExecution); + aPreventScriptExecution, + aSanitize); } return frag.forget(); @@ -4682,7 +4687,8 @@ nsContentUtils::CreateContextualFragment(nsINode* aContextNode, nsCOMPtr<nsIDOMDocumentFragment> frag; aRv = ParseFragmentXML(aFragment, document, tagStack, - aPreventScriptExecution, getter_AddRefs(frag)); + aPreventScriptExecution, getter_AddRefs(frag), + aSanitize); return frag.forget().downcast<DocumentFragment>(); } @@ -4709,7 +4715,8 @@ nsContentUtils::ParseFragmentHTML(const nsAString& aSourceBuffer, nsIAtom* aContextLocalName, int32_t aContextNamespace, bool aQuirks, - bool aPreventScriptExecution) + bool aPreventScriptExecution, + SanitizeFragments aSanitize) { AutoTimelineMarker m(aTargetNode->OwnerDoc()->GetDocShell(), "Parse HTML"); @@ -4723,13 +4730,39 @@ nsContentUtils::ParseFragmentHTML(const nsAString& aSourceBuffer, NS_ADDREF(sHTMLFragmentParser = new nsHtml5StringParser()); // Now sHTMLFragmentParser owns the object } + + nsIContent* target = aTargetNode; + + // If this is a chrome-privileged document, create a fragment first, and + // sanitize it before insertion. + RefPtr<DocumentFragment> fragment; + if (aSanitize != NeverSanitize && !aTargetNode->OwnerDoc()->AllowUnsafeHTML()) { + fragment = new DocumentFragment(aTargetNode->OwnerDoc()->NodeInfoManager()); + target = fragment; + } + nsresult rv = sHTMLFragmentParser->ParseFragment(aSourceBuffer, - aTargetNode, + target, aContextLocalName, aContextNamespace, aQuirks, aPreventScriptExecution); + NS_ENSURE_SUCCESS(rv, rv); + + if (fragment) { + // Don't fire mutation events for nodes removed by the sanitizer. + nsAutoScriptBlockerSuppressNodeRemoved scriptBlocker; + + nsTreeSanitizer sanitizer(nsIParserUtils::SanitizerAllowStyle | + nsIParserUtils::SanitizerAllowComments); + sanitizer.Sanitize(fragment); + + ErrorResult error; + aTargetNode->AppendChild(*fragment, error); + rv = error.StealNSResult(); + } + return rv; } @@ -4764,7 +4797,8 @@ nsContentUtils::ParseFragmentXML(const nsAString& aSourceBuffer, nsIDocument* aDocument, nsTArray<nsString>& aTagStack, bool aPreventScriptExecution, - nsIDOMDocumentFragment** aReturn) + nsIDOMDocumentFragment** aReturn, + SanitizeFragments aSanitize) { AutoTimelineMarker m(aDocument->GetDocShell(), "Parse XML"); @@ -4803,6 +4837,20 @@ nsContentUtils::ParseFragmentXML(const nsAString& aSourceBuffer, rv = sXMLFragmentSink->FinishFragmentParsing(aReturn); sXMLFragmentParser->Reset(); + NS_ENSURE_SUCCESS(rv, rv); + + // If this is a chrome-privileged document, sanitize the fragment before + // returning. + if (aSanitize != NeverSanitize && !aDocument->AllowUnsafeHTML()) { + // Don't fire mutation events for nodes removed by the sanitizer. + nsAutoScriptBlockerSuppressNodeRemoved scriptBlocker; + + RefPtr<DocumentFragment> fragment = static_cast<DocumentFragment*>(*aReturn); + + nsTreeSanitizer sanitizer(nsIParserUtils::SanitizerAllowStyle | + nsIParserUtils::SanitizerAllowComments); + sanitizer.Sanitize(fragment); + } return rv; } diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 08c5cbf02e25..f2de4a16be5d 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1344,6 +1344,11 @@ public: static bool IsValidNodeName(nsIAtom *aLocalName, nsIAtom *aPrefix, int32_t aNamespaceID); + enum SanitizeFragments { + SanitizeSystemPrivileged, + NeverSanitize, + }; + /** * Creates a DocumentFragment from text using a context node to resolve * namespaces. @@ -1357,6 +1362,8 @@ public: * @param aFragment the string which is parsed to a DocumentFragment * @param aReturn the resulting fragment * @param aPreventScriptExecution whether to mark scripts as already started + * @param aSanitize whether the fragment should be sanitized prior to + * injection */ static nsresult CreateContextualFragment(nsINode* aContextNode, const nsAString& aFragment, @@ -1365,7 +1372,16 @@ public: static already_AddRefed<mozilla::dom::DocumentFragment> CreateContextualFragment(nsINode* aContextNode, const nsAString& aFragment, bool aPreventScriptExecution, + SanitizeFragments aSanitize, mozilla::ErrorResult& aRv); + static already_AddRefed<mozilla::dom::DocumentFragment> + CreateContextualFragment(nsINode* aContextNode, const nsAString& aFragment, + bool aPreventScriptExecution, + mozilla::ErrorResult& aRv) + { + return CreateContextualFragment(aContextNode, aFragment, aPreventScriptExecution, + SanitizeSystemPrivileged, aRv); + } /** * Invoke the fragment parsing algorithm (innerHTML) using the HTML parser. @@ -1378,6 +1394,8 @@ public: * @param aPreventScriptExecution true to prevent scripts from executing; * don't set to false when parsing into a target node that has been * bound to tree. + * @param aSanitize whether the fragment should be sanitized prior to + * injection * @return NS_ERROR_DOM_INVALID_STATE_ERR if a re-entrant attempt to parse * fragments is made, NS_ERROR_OUT_OF_MEMORY if aSourceBuffer is too * long and NS_OK otherwise. @@ -1387,7 +1405,8 @@ public: nsIAtom* aContextLocalName, int32_t aContextNamespace, bool aQuirks, - bool aPreventScriptExecution); + bool aPreventScriptExecution, + SanitizeFragments aSanitize = SanitizeSystemPrivileged); /** * Invoke the fragment parsing algorithm (innerHTML) using the XML parser. @@ -1397,6 +1416,8 @@ public: * @param aTagStack the namespace mapping context * @param aPreventExecution whether to mark scripts as already started * @param aReturn the result fragment + * @param aSanitize whether the fragment should be sanitized prior to + * injection * @return NS_ERROR_DOM_INVALID_STATE_ERR if a re-entrant attempt to parse * fragments is made, a return code from the XML parser. */ @@ -1404,7 +1425,8 @@ public: nsIDocument* aDocument, nsTArray<nsString>& aTagStack, bool aPreventScriptExecution, - nsIDOMDocumentFragment** aReturn); + nsIDOMDocumentFragment** aReturn, + SanitizeFragments aSanitize = SanitizeSystemPrivileged); /** * Parse a string into a document using the HTML parser. diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 25e5d28d6c76..ba35493ad886 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -1315,7 +1315,8 @@ nsIDocument::nsIDocument() mFrameRequestCallbacksScheduled(false), mBidiOptions(IBMBIDI_DEFAULT_BIDI_OPTIONS), mPartID(0), - mUserHasInteracted(false) + mUserHasInteracted(false), + mAllowUnsafeHTML(false) { SetIsInDocument(); @@ -2659,7 +2660,7 @@ nsDocument::InitCSP(nsIChannel* aChannel) (cspSandboxFlags & SANDBOXED_ORIGIN) && !(mSandboxFlags & SANDBOXED_ORIGIN); mSandboxFlags |= cspSandboxFlags; - + if (needNewNullPrincipal) { principal = nsNullPrincipal::CreateWithInheritedAttributes(principal); principal->SetCsp(csp); @@ -5734,6 +5735,13 @@ nsDocument::CustomElementConstructor(JSContext* aCx, unsigned aArgc, JS::Value* } bool +nsIDocument::AllowUnsafeHTML() const +{ + return (!nsContentUtils::IsSystemPrincipal(NodePrincipal()) || + mAllowUnsafeHTML); +} + +bool nsDocument::IsWebComponentsEnabled(JSContext* aCx, JSObject* aObject) { JS::Rooted<JSObject*> obj(aCx, aObject); diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h index 5715fd233477..3ff69a6e8e1d 100644 --- a/dom/base/nsIDocument.h +++ b/dom/base/nsIDocument.h @@ -2660,6 +2660,8 @@ public: CreateAttributeNS(const nsAString& aNamespaceURI, const nsAString& aQualifiedName, mozilla::ErrorResult& rv); + void SetAllowUnsafeHTML(bool aAllow) { mAllowUnsafeHTML = aAllow; } + bool AllowUnsafeHTML() const; void GetInputEncoding(nsAString& aInputEncoding) const; already_AddRefed<mozilla::dom::Location> GetLocation() const; void GetReferrer(nsAString& aReferrer) const; @@ -3206,6 +3208,10 @@ protected: // UpdateFrameRequestCallbackSchedulingState. bool mFrameRequestCallbacksScheduled : 1; + // True if unsafe HTML fragments should be allowed in chrome-privileged + // documents. + bool mAllowUnsafeHTML : 1; + enum Type { eUnknown, // should never be used eHTML, diff --git a/dom/base/test/chrome.ini b/dom/base/test/chrome.ini index f7e67ef6b9cb..8d4a9cd09a9c 100644 --- a/dom/base/test/chrome.ini +++ b/dom/base/test/chrome.ini @@ -16,6 +16,7 @@ support-files = [test_copypaste.xul] subsuite = clipboard [test_domrequesthelper.xul] +[test_fragment_sanitization.xul] [test_messagemanager_principal.html] [test_messagemanager_send_principal.html] skip-if = buildapp == 'mulet' diff --git a/dom/base/test/chrome/test_bug683852.xul b/dom/base/test/chrome/test_bug683852.xul index cebc8f3583bc..e7e106f7a483 100644 --- a/dom/base/test/chrome/test_bug683852.xul +++ b/dom/base/test/chrome/test_bug683852.xul @@ -20,6 +20,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=683852 /** Test for Bug 683852 **/ SimpleTest.waitForExplicitFinish(); + const NS_HTML = "http://www.w3.org/1999/xhtml"; + function startTest() { is(document.contains(document), true, "Document should contain itself!"); @@ -48,7 +50,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=683852 document.documentElement.appendChild(pi); document.contains(pi, true, "Document should contain processing instruction"); - var df = document.createRange().createContextualFragment("<div>foo</div>"); + var df = document.createRange().createContextualFragment(`<div xmlns="${NS_HTML}">foo</div>`); is(df.contains(df.firstChild), true, "Document fragment should contain its child"); is(df.contains(df.firstChild.firstChild), true, "Document fragment should contain its descendant"); diff --git a/dom/base/test/test_fragment_sanitization.xul b/dom/base/test/test_fragment_sanitization.xul new file mode 100644 index 000000000000..0c91b210125c --- /dev/null +++ b/dom/base/test/test_fragment_sanitization.xul @@ -0,0 +1,101 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/css" href="chrome://global/skin"?> +<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?> + +<window title="Mozilla Bug 1432966" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/> + <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SpawnTask.js"/> + + <script type="application/javascript"><![CDATA[ + +var { classes: Cc, interfaces: Ci } = Components; + +const NS_HTML = "http://www.w3.org/1999/xhtml"; + +function awaitLoad(frame) { + return new Promise(resolve => { + frame.addEventListener("load", resolve, {once: true}); + }); +} + +async function testFrame(frame, html, expected = html) { + document.querySelector("body").appendChild(frame); + await awaitLoad(frame); + + // Remove the xmlns attributes that will be automatically added when we're + // in an XML document, and break the comparison. + function unNS(text) { + return text.replace(RegExp(` xmlns="${NS_HTML}"`, "g"), ""); + } + + let doc = frame.contentDocument; + let body = doc.body || doc.documentElement; + + let div = doc.createElementNS(NS_HTML, "div"); + body.appendChild(div); + + div.innerHTML = html; + is(unNS(div.innerHTML), expected, "innerHTML value"); + + div.innerHTML = "<div></div>"; + div.firstChild.outerHTML = html; + is(unNS(div.innerHTML), expected, "outerHTML value"); + + div.textContent = ""; + div.insertAdjacentHTML("beforeend", html); + is(unNS(div.innerHTML), expected, "insertAdjacentHTML('beforeend') value"); + + div.innerHTML = "<a>foo</a>"; + div.firstChild.insertAdjacentHTML("afterend", html); + is(unNS(div.innerHTML), "<a>foo</a>" + expected, "insertAdjacentHTML('afterend') value"); + + frame.remove(); +} + +add_task(async function test_fragment_sanitization() { + const XUL_URL = "chrome://global/content/win.xul"; + const HTML_URL = "chrome://mochitests/content/chrome/dom/base/test/file_empty.html"; + + const HTML = '<a onclick="foo()" href="javascript:foo"><script>bar()<\/script>Meh.</a><a href="http://foo/"></a>'; + const SANITIZED = '<a>Meh.</a><a href="http://foo/"></a>'; + + info("Test content HTML document"); + { + let frame = document.createElementNS(NS_HTML, "iframe"); + frame.src = "http://example.com/"; + + await testFrame(frame, HTML); + } + + info("Test chrome HTML document"); + { + let frame = document.createElementNS(NS_HTML, "iframe"); + frame.src = HTML_URL; + + await testFrame(frame, HTML, SANITIZED); + } + + info("Test chrome XUL document"); + { + let frame = document.createElementNS(NS_HTML, "iframe"); + frame.src = XUL_URL; + + await testFrame(frame, HTML, SANITIZED); + } +}); + + ]]></script> + + <description style="-moz-user-focus: normal; -moz-user-select: text;"><![CDATA[ + hello + world + ]]></description> + + <body xmlns="http://www.w3.org/1999/xhtml"> + <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1432966" + target="_blank">Mozilla Bug 1432966</a> + </body> +</window> diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl index c895fad39275..ed071cbbd375 100644 --- a/dom/webidl/Document.webidl +++ b/dom/webidl/Document.webidl @@ -95,6 +95,11 @@ interface Document : Node { Attr createAttribute(DOMString name); [NewObject, Throws] Attr createAttributeNS(DOMString? namespace, DOMString name); + + // Allows setting innerHTML without automatic sanitization. + // Do not use this. + [ChromeOnly] + attribute boolean allowUnsafeHTML; }; // http://www.whatwg.org/specs/web-apps/current-work/#the-document-object diff --git a/dom/webidl/Element.webidl b/dom/webidl/Element.webidl index ca5f1b35cd78..a66327ff96cd 100644 --- a/dom/webidl/Element.webidl +++ b/dom/webidl/Element.webidl @@ -216,6 +216,16 @@ partial interface Element { attribute DOMString outerHTML; [Throws] void insertAdjacentHTML(DOMString position, DOMString text); + + /** + * Like the innerHTML setter, but does not sanitize its values, even in + * chrome-privileged documents. + * + * If you're thinking about using this, don't. You have many, much better + * options. + */ + [ChromeOnly, Throws] + void unsafeSetInnerHTML(DOMString html); }; // http://www.w3.org/TR/selectors-api/#interface-definitions diff --git a/layout/style/test/chrome/bug418986-2.js b/layout/style/test/chrome/bug418986-2.js index 4336f4abdb2c..2fcad6d70e0b 100644 --- a/layout/style/test/chrome/bug418986-2.js +++ b/layout/style/test/chrome/bug418986-2.js @@ -222,13 +222,23 @@ var green = (function () { return getComputedStyle(temp).backgroundColor; })(); +// Injected HTML will automatically be sanitized when we're in a chrome +// document unless we use `unsafeSetInnerHTML`. That function doesn't +// exist in non-chrome documents, so add a stub to allow the same code +// to run in both. +if (!Element.prototype.unsafeSetInnerHTML) { + Element.prototype.unsafeSetInnerHTML = html => { + this.innerHTML = html; + }; +} + // __testCSS(resisting)__. // Creates a series of divs and CSS using media queries to set their // background color. If all media queries match as expected, then // all divs should have a green background color. var testCSS = function (resisting) { - document.getElementById("display").innerHTML = generateHtmlLines(resisting); - document.getElementById("test-css").innerHTML = generateCSSLines(resisting); + document.getElementById("display").unsafeSetInnerHTML(generateHtmlLines(resisting)); + document.getElementById("test-css").unsafeSetInnerHTML(generateCSSLines(resisting)); let cssTestDivs = document.querySelectorAll(".spoof,.suppress"); for (let div of cssTestDivs) { let color = window.getComputedStyle(div).backgroundColor; @@ -272,7 +282,7 @@ var testMediaQueriesInPictureElements = function* (resisting) { lines += "</picture><br/>\n"; } } - document.getElementById("pictures").innerHTML = lines; + document.getElementById("pictures").unsafeSetInnerHTML(lines); var testImages = document.getElementsByClassName("testImage"); yield sleep(0); for (let testImage of testImages) { diff --git a/mobile/android/chrome/content/config.js b/mobile/android/chrome/content/config.js index 2c868f175ee8..83f93a51c86a 100644 --- a/mobile/android/chrome/content/config.js +++ b/mobile/android/chrome/content/config.js @@ -599,7 +599,7 @@ Pref.prototype = { this.li.setAttribute("contextmenu", "prefs-context-menu"); // Create list item outline, bind to object actions - this.li.innerHTML = + this.li.unsafeSetInnerHTML( "<div class='pref-name' " + "onclick='AboutConfig.selectOrToggleBoolPref(event);'>" + this.name + @@ -623,7 +623,7 @@ Pref.prototype = { "<div class='pref-button down' " + "onclick='AboutConfig.incrOrDecrIntPref(event, -1);'>" + "</div>" + - "</div>"; + "</div>"); // Delay providing the list item values, until the LI is returned and added to the document setTimeout(this._valueSetup.bind(this), INNERHTML_VALUE_DELAY); diff --git a/toolkit/content/tests/chrome/test_bug570192.xul b/toolkit/content/tests/chrome/test_bug570192.xul index 09f73e932b5d..91c55805c9da 100644 --- a/toolkit/content/tests/chrome/test_bug570192.xul +++ b/toolkit/content/tests/chrome/test_bug570192.xul @@ -36,8 +36,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=570192 addLoadEvent(function() { try { var content = document.getElementById("content"); - content.innerHTML = '<textbox newlines="pasteintact" ' + - 'xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>'; + content.unsafeSetInnerHTML('<textbox newlines="pasteintact" ' + + 'xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"/>'); var textbox = content.firstChild; ok(textbox, "created the textbox"); ok(!textbox.editor, "do we have an editor?"); diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 1e5f33b0a251..771008ed3bf8 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -3078,7 +3078,7 @@ var gDetailView = { // plugins without having bug 624602 fixed yet, and intentionally ignores // localisation. if (aAddon.isGMPlugin) { - fullDesc.innerHTML = aAddon.fullDescription; + fullDesc.unsafeSetInnerHTML(aAddon.fullDescription); } else { fullDesc.textContent = aAddon.fullDescription; }

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 89614962f2ac1fa333b16c708a890167e9ec1b4e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 20 09:13:28 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes our bug 26424 (disabling UNC paths) and activates Mozilla's fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1413868. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 4289b7bcc5f9..cd901374ed9f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -250,6 +250,8 @@ pref("devtools.appmanager.enabled", false); pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); // Disable mozTCPSocket for sure (bug 18863) pref("dom.mozTCPSocket.enabled", false); +// Disable using UNC paths (bug 26424 and Mozilla's bug 1413868) +pref("network.file.disable_unc_paths", true); // Security slider pref("svg.in-content.enabled", true);

1 0