September 2019 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 31448: Disable firefox debug-symbols for linux-i686
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 8cc9eaf22abf0c9d98b88bb60aaa1476e4a6555c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 12 11:06:39 2019 +0200 Bug 31448: Disable firefox debug-symbols for linux-i686 This allows us to switch back to ld.gold as the linker, and fix #31618. ld.gold fails when we build with debug symbols for linux-i686: 30:31.20 toolkit/library/symverscript.stub 30:31.26 toolkit/library/libxul.so 30:39.58 /var/tmp/dist/binutils/bin/ld.gold.real: internal error in relocate_section, at i386.cc:3684 --- projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 8 +++----- projects/tor-browser/build | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 13e70f5..ac63c84 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -199,7 +199,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir -[% IF c("var/linux") %] +[% IF c("var/linux-x86_64") %] mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) @@ -240,7 +240,7 @@ END; tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', }) %] -[% IF c("var/linux") %] +[% IF c("var/linux-x86_64") %] [% c('tar', { tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index c8f19a4..0a05864 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -18,9 +18,6 @@ export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --target=i686-linux-gnu -# XXX: gold and lld break when linking libxul, resort to bfd -ac_add_options --enable-linker=bfd - ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding @@ -32,8 +29,6 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar -ac_add_options --disable-strip -ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter @@ -42,3 +37,6 @@ ac_add_options --disable-webrtc ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection #ac_add_options --disable-ctypes + +# Bug 31448: ld.gold fails if we don't disable debug-symbols +ac_add_options --disable-debug-symbols diff --git a/projects/tor-browser/build b/projects/tor-browser/build index aeb77de..ed69f19 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,8 +274,10 @@ rm -rf $distdir/${PKG_DIR} SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ -[% IF c("var/linux") -%] +[% IF c("var/linux-x86_64") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz +[% END -%] +[% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%]

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 21431: Clean-up system extensions shipped in Firefox 52
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 63655f7a4c9575c5ab7828f49a9814c3ff157bda Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 18 12:19:39 2019 +0200 fixup! Bug 21431: Clean-up system extensions shipped in Firefox 52 --- browser/components/BrowserGlue.jsm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index a99a29a014ad..d22f9512184d 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1844,6 +1844,9 @@ BrowserGlue.prototype = { const ID = "screenshots(a)mozilla.org"; const _checkScreenshotsPref = async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let disabled = Services.prefs.getBoolPref(PREF, false); if (disabled) { await addon.disable({ allowSystemAddons: true }); @@ -1860,6 +1863,9 @@ BrowserGlue.prototype = { const ID = "webcompat-reporter(a)mozilla.org"; Services.prefs.addObserver(PREF, async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let enabled = Services.prefs.getBoolPref(PREF, false); if (enabled && !addon.isActive) { await addon.enable({ allowSystemAddons: true });

1 0

[tor-launcher/master] Bug 31303: Do not launch tor in browser toolbox
by gk＠torproject.org 18 Sep '19

18 Sep '19

commit 810ba7e93981511765ec1be667689ae2992e8c49 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 18 10:19:00 2019 +0200 Bug 31303: Do not launch tor in browser toolbox --- src/modules/tl-util.jsm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index bac5eae..14ac76f 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -333,10 +333,13 @@ let TorLauncherUtil = // Public const kPrefStartTor = "extensions.torlauncher.start_tor"; try { + const kBrowserToolboxPort = "MOZ_BROWSER_TOOLBOX_PORT"; const kEnvSkipLaunch = "TOR_SKIP_LAUNCH"; var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); + if (env.exists(kBrowserToolboxPort)) + return false; if (env.exists(kEnvSkipLaunch)) return ("1" != env.get(kEnvSkipLaunch)); } catch(e) {}

1 0

[tor-browser-build/master] Bug 31538: Make Windows builds reproducible again
by boklm＠torproject.org 18 Sep '19

18 Sep '19

commit a7a90d35e55bb8f9886fd9d827b01eba2060c74b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 06:51:04 2019 +0000 Bug 31538: Make Windows builds reproducible again Updating CMake to the latest stable version as done in the previous commit solves the reproducibility issue only partly. We need to patch the code that merges libc++abi.a into libc++.a to get the order in the merged archive deterministic. The code doing the merging is: `files = glob.glob(os.path.join(temp_directory_root, '*.o*'))` Regarding `glob` there is following in the Python docs: "The glob module finds all the pathnames matching a specified pattern according to the rules used by the Unix shell, although results are returned in *arbitrary* order." (emphasis mine) (https://docs.python.org/2/library/glob.html) --- projects/mingw-w64-clang/build | 1 + projects/mingw-w64-clang/config | 1 + projects/mingw-w64-clang/sort.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 86c3c6e..fa059da 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -173,6 +173,7 @@ make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx cd $builddir/libcxx +patch -p1 < $rootdir/sort.patch mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 3d209ea..32d18a8 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -36,3 +36,4 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch + - filename: sort.patch diff --git a/projects/mingw-w64-clang/sort.patch b/projects/mingw-w64-clang/sort.patch new file mode 100644 index 0000000..e9143b0 --- /dev/null +++ b/projects/mingw-w64-clang/sort.patch @@ -0,0 +1,22 @@ +From 9eeb3b9ea13b25591c9081a5f05a1904d367d523 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 11 Sep 2019 13:25:54 +0000 +Subject: [PATCH] sorted + + +diff --git a/utils/merge_archives.py b/utils/merge_archives.py +index 58d92f0e2..597ca2471 100755 +--- a/utils/merge_archives.py ++++ b/utils/merge_archives.py +@@ -124,7 +124,7 @@ def main(): + execute_command_verbose([ar_exe, 'x', arc], cwd=temp_directory_root, + verbose=args.verbose) + +- files = glob.glob(os.path.join(temp_directory_root, '*.o*')) ++ files = sorted(glob.glob(os.path.join(temp_directory_root, '*.o*'))) + if not files: + print_and_exit('Failed to glob for %s' % temp_directory_root) + cmd = [ar_exe, 'qcs', args.output] + files +-- +2.23.0 +

1 0

[tor-browser-build/master] Bug 31538: Bump CMake version
by boklm＠torproject.org 18 Sep '19

18 Sep '19

commit cd111df46540c3727697bac62898a4c141752080 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 13 06:50:07 2019 +0000 Bug 31538: Bump CMake version The old CMake version built libraries like libc++.a and libc++abi.a in a non-reproducible way. Using the latest CMake version solves that. We need to use our own GCC for Linux as the shippped one is too old. --- projects/cmake/build | 6 +++++- projects/cmake/config | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/cmake/build b/projects/cmake/build index a5eca23..e8613a2 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -1,7 +1,11 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/build +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] +[% END -%] +mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir diff --git a/projects/cmake/config b/projects/cmake/config index 492b99c..fd8d186 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.4.3 +version: 3.15.3 git_url: https://cmake.org/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 @@ -11,3 +11,6 @@ var: input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]'

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26345: Hide tracking protection UI
by gk＠torproject.org 17 Sep '19

17 Sep '19

commit ea79fd5825ed9ea4e148baa473da3b97356bb38f Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 17 11:24:46 2019 +0200 fixup! Bug 26345: Hide tracking protection UI --- browser/components/customizableui/content/panelUI.inc.xul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index b2c70b9f041d..2b56e7301153 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -257,7 +257,7 @@ </hbox> </toolbaritem> <toolbarseparator class="sync-ui-item"/> - <toolbaritem> + <toolbaritem hidden="true"> <toolbarbutton id="appMenu-tp-button" class="subviewbutton subviewbutton-iconic" oncommand="ContentBlocking.openPreferences('appMenu-trackingprotection');"> @@ -266,7 +266,7 @@ <label id="appMenu-tp-category"/> </toolbarbutton> </toolbaritem> - <toolbarseparator id="appMenu-tp-separator"/> + <toolbarseparator hidden="true" id="appMenu-tp-separator"/> <toolbarbutton id="appMenu-new-window-button" class="subviewbutton subviewbutton-iconic" label="&newNavigatorCmd.label;"

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24653: merge securityLevel.properties into torbutton.dtd
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 7baed647f56e5d3e7c92eaffadb1c18c07aabe7f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 16 13:01:32 2019 +0200 fixup! Bug 24653: merge securityLevel.properties into torbutton.dtd --- browser/components/securitylevel/content/securityLevel.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 9dc23d97855d..9965046a7d15 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -9,7 +9,11 @@ XPCOMUtils.defineLazyModuleGetters(this, { }); XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); +XPCOMUtils.defineLazyGetter(this, "domParser", () => { + const parser = new DOMParser(); + parser.forceEnableDTD(); + return parser; +}); /* Security Level Strings

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 467035 - Add new internal DTD content types r=ckerschb
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 93c30885b92760fcdf6bd06b235ddd3c87b09b97 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jul 3 17:28:25 2019 +0000 Bug 467035 - Add new internal DTD content types r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D35232 --HG-- extra : moz-landing-system : lando --- dom/base/nsContentPolicyUtils.h | 2 ++ dom/base/nsContentUtils.h | 4 ++++ dom/base/nsIContentPolicy.idl | 12 ++++++++++++ dom/cache/DBSchema.cpp | 4 +++- dom/fetch/InternalRequest.cpp | 2 ++ dom/security/nsCSPUtils.cpp | 2 ++ extensions/permissions/nsContentBlocker.cpp | 2 ++ 7 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dom/base/nsContentPolicyUtils.h b/dom/base/nsContentPolicyUtils.h index 9af71cb85b3f..50767baa3637 100644 --- a/dom/base/nsContentPolicyUtils.h +++ b/dom/base/nsContentPolicyUtils.h @@ -137,6 +137,8 @@ inline const char* NS_CP_ContentTypeName(uint32_t contentType) { CASE_RETURN(TYPE_SPECULATIVE); CASE_RETURN(TYPE_INTERNAL_MODULE); CASE_RETURN(TYPE_INTERNAL_MODULE_PRELOAD); + CASE_RETURN(TYPE_INTERNAL_DTD); + CASE_RETURN(TYPE_INTERNAL_FORCE_ALLOWED_DTD); default: return "<Unknown Type>"; } diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 9c409099c9af..b80c6c91093b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -3467,6 +3467,10 @@ nsContentUtils::InternalContentPolicyTypeToExternal(nsContentPolicyType aType) { case nsIContentPolicy::TYPE_INTERNAL_STYLESHEET_PRELOAD: return nsIContentPolicy::TYPE_STYLESHEET; + case nsIContentPolicy::TYPE_INTERNAL_DTD: + case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: + return nsIContentPolicy::TYPE_DTD; + default: return aType; } diff --git a/dom/base/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl index 5acbf9b8d9d2..13137cee7bc6 100644 --- a/dom/base/nsIContentPolicy.idl +++ b/dom/base/nsIContentPolicy.idl @@ -364,6 +364,18 @@ interface nsIContentPolicy : nsISupports */ const nsContentPolicyType TYPE_INTERNAL_MODULE_PRELOAD = 46; + /** + * Indicates a DTD loaded by an XML document the URI of which could + * not be mapped to a known local DTD. + */ + const nsContentPolicyType TYPE_INTERNAL_DTD = 47; + + /** + * Indicates a TYPE_INTERNAL_DTD which will not be blocked no matter + * what principal is being loaded from. + */ + const nsContentPolicyType TYPE_INTERNAL_FORCE_ALLOWED_DTD = 48; + /* When adding new content types, please update nsContentBlocker, * NS_CP_ContentTypeName, nsCSPContext, CSP_ContentTypeToDirective, * DoContentSecurityChecks, all nsIContentPolicy implementations, the diff --git a/dom/cache/DBSchema.cpp b/dom/cache/DBSchema.cpp index 540c12424925..670acb28b555 100644 --- a/dom/cache/DBSchema.cpp +++ b/dom/cache/DBSchema.cpp @@ -333,7 +333,9 @@ static_assert(nsIContentPolicy::TYPE_INVALID == 0 && nsIContentPolicy::TYPE_SAVEAS_DOWNLOAD == 43 && nsIContentPolicy::TYPE_SPECULATIVE == 44 && nsIContentPolicy::TYPE_INTERNAL_MODULE == 45 && - nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD == 46, + nsIContentPolicy::TYPE_INTERNAL_MODULE_PRELOAD == 46 && + nsIContentPolicy::TYPE_INTERNAL_DTD == 47 && + nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD == 48, "nsContentPolicyType values are as expected"); namespace { diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp index dada8d6df418..6456fe55c9aa 100644 --- a/dom/fetch/InternalRequest.cpp +++ b/dom/fetch/InternalRequest.cpp @@ -254,6 +254,8 @@ RequestDestination InternalRequest::MapContentPolicyTypeToRequestDestination( destination = RequestDestination::_empty; break; case nsIContentPolicy::TYPE_DTD: + case nsIContentPolicy::TYPE_INTERNAL_DTD: + case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: destination = RequestDestination::_empty; break; case nsIContentPolicy::TYPE_FONT: diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp index dc6b0f9b2025..cf30ba9e36f3 100644 --- a/dom/security/nsCSPUtils.cpp +++ b/dom/security/nsCSPUtils.cpp @@ -235,6 +235,8 @@ CSPDirective CSP_ContentTypeToDirective(nsContentPolicyType aType) { case nsIContentPolicy::TYPE_DTD: case nsIContentPolicy::TYPE_OTHER: case nsIContentPolicy::TYPE_SPECULATIVE: + case nsIContentPolicy::TYPE_INTERNAL_DTD: + case nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD: return nsIContentSecurityPolicy::DEFAULT_SRC_DIRECTIVE; // csp shold not block top level loads, e.g. in case diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp index bd98eb5aa5a7..3c4246b2ecc2 100644 --- a/extensions/permissions/nsContentBlocker.cpp +++ b/extensions/permissions/nsContentBlocker.cpp @@ -71,6 +71,8 @@ static const nsLiteralCString kTypeString[] = { NS_LITERAL_CSTRING("speculative"), NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_MODULE NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_MODULE_PRELOAD + NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_DTD + NS_LITERAL_CSTRING(""), // TYPE_INTERNAL_FORCE_ALLOWED_DTD }; #define NUMBER_OF_TYPES MOZ_ARRAY_LENGTH(kTypeString)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 467035 - Avoid leaking browser language via DTD r=Gijs, bzbarsky
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 2fe57c62af9706be45fc2085796a9398c3b10763 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 8 10:47:05 2019 +0000 Bug 467035 - Avoid leaking browser language via DTD r=Gijs,bzbarsky Differential Revision: https://phabricator.services.mozilla.com/D34187 --HG-- extra : moz-landing-system : lando --- .../browser_misused_characters_in_strings.js | 1 + .../test/mochitest/formautofill/mochitest.ini | 1 + dom/base/DOMParser.cpp | 11 +++++- dom/base/DOMParser.h | 8 +++- dom/base/Document.cpp | 39 ++----------------- dom/base/Document.h | 10 +++++ dom/base/nsContentUtils.cpp | 28 ++++++++++++++ dom/base/nsContentUtils.h | 7 ++++ dom/security/nsContentSecurityManager.cpp | 16 +++++++- dom/tests/mochitest/bugs/mochitest.ini | 1 + dom/tests/mochitest/bugs/test_bug467035.html | 45 ++++++++++++++++++++++ dom/webidl/DOMParser.webidl | 5 +++ parser/htmlparser/nsExpatDriver.cpp | 6 ++- testing/marionette/l10n.js | 6 ++- .../firefox/firefox_puppeteer/api/l10n.py | 1 + toolkit/content/widgets/datetimebox.js | 1 + toolkit/content/widgets/pluginProblem.js | 1 + toolkit/content/widgets/videocontrols.js | 4 ++ 18 files changed, 150 insertions(+), 41 deletions(-) diff --git a/browser/base/content/test/static/browser_misused_characters_in_strings.js b/browser/base/content/test/static/browser_misused_characters_in_strings.js index eb17e92c7b59..4b1d9a75d3bb 100644 --- a/browser/base/content/test/static/browser_misused_characters_in_strings.js +++ b/browser/base/content/test/static/browser_misused_characters_in_strings.js @@ -272,6 +272,7 @@ add_task(async function checkAllTheFluents() { {} ); let domParser = new DOMParser(); + domParser.forceEnableDTD(); for (let uri of uris) { let rawContents = await fetchFile(uri.spec); let resource = FluentResource.fromString(rawContents); diff --git a/browser/components/payments/test/mochitest/formautofill/mochitest.ini b/browser/components/payments/test/mochitest/formautofill/mochitest.ini index c58cdb9eefb3..9740f9e3e88f 100644 --- a/browser/components/payments/test/mochitest/formautofill/mochitest.ini +++ b/browser/components/payments/test/mochitest/formautofill/mochitest.ini @@ -6,4 +6,5 @@ support-files = ../../../../../../browser/extensions/formautofill/content/editCreditCard.xhtml ../../../../../../browser/extensions/formautofill/content/editAddress.xhtml +skip-if = true # Bug 1446164 [test_editCreditCard.html] diff --git a/dom/base/DOMParser.cpp b/dom/base/DOMParser.cpp index 6f0d30fd75a7..3f12ef8d7c69 100644 --- a/dom/base/DOMParser.cpp +++ b/dom/base/DOMParser.cpp @@ -33,7 +33,8 @@ DOMParser::DOMParser(nsIGlobalObject* aOwner, nsIPrincipal* aDocPrincipal, mPrincipal(aDocPrincipal), mDocumentURI(aDocumentURI), mBaseURI(aBaseURI), - mForceEnableXULXBL(false) { + mForceEnableXULXBL(false), + mForceEnableDTD(false) { MOZ_ASSERT(aDocPrincipal); MOZ_ASSERT(aDocumentURI); } @@ -69,6 +70,10 @@ already_AddRefed<Document> DOMParser::ParseFromString(const nsAString& aStr, document->ForceEnableXULXBL(); } + if (mForceEnableDTD) { + document->ForceSkipDTDSecurityChecks(); + } + nsresult rv = nsContentUtils::ParseDocumentHTML(aStr, document, false); if (NS_WARN_IF(NS_FAILED(rv))) { aRv.Throw(rv); @@ -183,6 +188,10 @@ already_AddRefed<Document> DOMParser::ParseFromStream(nsIInputStream* aStream, document->ForceEnableXULXBL(); } + if (mForceEnableDTD) { + document->ForceSkipDTDSecurityChecks(); + } + // Have to pass false for reset here, else the reset will remove // our event listener. Should that listener addition move to later // than this call? diff --git a/dom/base/DOMParser.h b/dom/base/DOMParser.h index 0a2db0ef4e2b..9a6545ad7f33 100644 --- a/dom/base/DOMParser.h +++ b/dom/base/DOMParser.h @@ -53,7 +53,12 @@ class DOMParser final : public nsISupports, public nsWrapperCache { SupportedType aType, ErrorResult& aRv); - void ForceEnableXULXBL() { mForceEnableXULXBL = true; } + void ForceEnableXULXBL() { + mForceEnableXULXBL = true; + ForceEnableDTD(); + } + + void ForceEnableDTD() { mForceEnableDTD = true; } nsIGlobalObject* GetParentObject() const { return mOwner; } @@ -78,6 +83,7 @@ class DOMParser final : public nsISupports, public nsWrapperCache { nsCOMPtr<nsIURI> mBaseURI; bool mForceEnableXULXBL; + bool mForceEnableDTD; }; } // namespace dom diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index a0823a6e457f..eebeada1c63c 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -1263,6 +1263,7 @@ Document::Document(const char* aContentType) mType(eUnknown), mDefaultElementType(0), mAllowXULXBL(eTriUnset), + mSkipDTDSecurityChecks(false), mBidiOptions(IBMBIDI_DEFAULT_BIDI_OPTIONS), mSandboxFlags(0), mPartID(0), @@ -1987,38 +1988,6 @@ void Document::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup) { mChannel = aChannel; } -/** - * Determine whether the principal is allowed access to the localization system. - * We don't want the web to ever see this but all our UI including in content - * pages should pass this test. - */ -bool PrincipalAllowsL10n(nsIPrincipal* principal) { - // The system principal is always allowed. - if (nsContentUtils::IsSystemPrincipal(principal)) { - return true; - } - - nsCOMPtr<nsIURI> uri; - nsresult rv = principal->GetURI(getter_AddRefs(uri)); - NS_ENSURE_SUCCESS(rv, false); - - bool hasFlags; - - // Allow access to uris that cannot be loaded by web content. - rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DANGEROUS_TO_LOAD, - &hasFlags); - NS_ENSURE_SUCCESS(rv, false); - if (hasFlags) { - return true; - } - - // UI resources also get access. - rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_IS_UI_RESOURCE, - &hasFlags); - NS_ENSURE_SUCCESS(rv, false); - return hasFlags; -} - void Document::DisconnectNodeTree() { // Delete references to sub-documents and kill the subdocument map, // if any. This is not strictly needed, but makes the node tree @@ -3256,11 +3225,11 @@ DocumentL10n* Document::GetL10n() { return mDocumentL10n; } bool Document::DocumentSupportsL10n(JSContext* aCx, JSObject* aObject) { nsCOMPtr<nsIPrincipal> callerPrincipal = nsContentUtils::SubjectPrincipal(aCx); - return PrincipalAllowsL10n(callerPrincipal); + return nsContentUtils::PrincipalAllowsL10n(callerPrincipal); } void Document::LocalizationLinkAdded(Element* aLinkElement) { - if (!PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { return; } @@ -3291,7 +3260,7 @@ void Document::LocalizationLinkAdded(Element* aLinkElement) { } void Document::LocalizationLinkRemoved(Element* aLinkElement) { - if (!PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { return; } diff --git a/dom/base/Document.h b/dom/base/Document.h index 82b7d66753ef..e65bb95d94c9 100644 --- a/dom/base/Document.h +++ b/dom/base/Document.h @@ -2764,8 +2764,16 @@ class Document : public nsINode, : mAllowXULXBL == eTriFalse ? false : InternalAllowXULXBL(); } + /** + * Returns true if this document is allowed to load DTDs from UI resources + * no matter what. + */ + bool SkipDTDSecurityChecks() { return mSkipDTDSecurityChecks; } + void ForceEnableXULXBL() { mAllowXULXBL = eTriTrue; } + void ForceSkipDTDSecurityChecks() { mSkipDTDSecurityChecks = true; } + /** * Returns the template content owner document that owns the content of * HTMLTemplateElement. @@ -4401,6 +4409,8 @@ class Document : public nsINode, Tri mAllowXULXBL; + bool mSkipDTDSecurityChecks; + // The document's script global object, the object from which the // document can get its script context and scope. This is the // *inner* window object. diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 2b416828e8c1..66134cdb691f 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -1676,6 +1676,34 @@ bool nsContentUtils::OfflineAppAllowed(nsIPrincipal* aPrincipal) { return NS_SUCCEEDED(rv) && allowed; } +/* static */ +bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal) { + // The system principal is always allowed. + if (IsSystemPrincipal(aPrincipal)) { + return true; + } + + nsCOMPtr<nsIURI> uri; + nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri)); + NS_ENSURE_SUCCESS(rv, false); + + bool hasFlags; + + // Allow access to uris that cannot be loaded by web content. + rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_DANGEROUS_TO_LOAD, + &hasFlags); + NS_ENSURE_SUCCESS(rv, false); + if (hasFlags) { + return true; + } + + // UI resources also get access. + rv = NS_URIChainHasFlags(uri, nsIProtocolHandler::URI_IS_UI_RESOURCE, + &hasFlags); + NS_ENSURE_SUCCESS(rv, false); + return hasFlags; +} + bool nsContentUtils::MaybeAllowOfflineAppByDefault(nsIPrincipal* aPrincipal) { if (!Preferences::GetRootBranch()) return false; diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index b80c6c91093b..46818cc43a1b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1984,6 +1984,13 @@ class nsContentUtils { static bool OfflineAppAllowed(nsIPrincipal* aPrincipal); /** + * Determine whether the principal is allowed access to the localization + * system. We don't want the web to ever see this but all our UI including in + * content pages should pass this test. + */ + static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal); + + /** * If offline-apps.allow_by_default is true, we set offline-app permission * for the principal and return true. Otherwise false. */ diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index d7724ff496ff..e7a0a9d1a72b 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -329,8 +329,20 @@ static bool IsImageLoadInEditorAppType(nsILoadInfo* aLoadInfo) { } static nsresult DoCheckLoadURIChecks(nsIURI* aURI, nsILoadInfo* aLoadInfo) { - // Bug 1228117: determine the correct security policy for DTD loads - if (aLoadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_DTD) { + // In practice, these DTDs are just used for localization, so applying the + // same principal check as Fluent. + if (aLoadInfo->InternalContentPolicyType() == + nsIContentPolicy::TYPE_INTERNAL_DTD) { + return nsContentUtils::PrincipalAllowsL10n(aLoadInfo->TriggeringPrincipal()) + ? NS_OK + : NS_ERROR_DOM_BAD_URI; + } + + // This is used in order to allow a privileged DOMParser to parse documents + // that need to access localization DTDs. We just allow through + // TYPE_INTERNAL_FORCE_ALLOWED_DTD no matter what the triggering principal is. + if (aLoadInfo->InternalContentPolicyType() == + nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD) { return NS_OK; } diff --git a/dom/tests/mochitest/bugs/mochitest.ini b/dom/tests/mochitest/bugs/mochitest.ini index 571ca80e6339..26ce4e2b8c47 100644 --- a/dom/tests/mochitest/bugs/mochitest.ini +++ b/dom/tests/mochitest/bugs/mochitest.ini @@ -152,5 +152,6 @@ skip-if = toolkit == 'android' [test_bug1171215.html] support-files = window_bug1171215.html [test_bug1530292.html] +[test_bug467035.html] [test_no_find_showDialog.html] skip-if = toolkit == 'android' # Bug 1358633 - window.find doesn't work for Android diff --git a/dom/tests/mochitest/bugs/test_bug467035.html b/dom/tests/mochitest/bugs/test_bug467035.html new file mode 100644 index 000000000000..ffcfe03e7c61 --- /dev/null +++ b/dom/tests/mochitest/bugs/test_bug467035.html @@ -0,0 +1,45 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="utf-8"> + <title>Test for Bug 467035</title> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> + <script type="application/javascript"> + + /** Test for Bug 467035 **/ + SimpleTest.waitForExplicitFinish(); + addLoadEvent(() => { + const s = `<!DOCTYPE html SYSTEM \"chrome://branding/locale/brand.dtd\"> + <html xmlns=\"http://www.w3.org/1999/xhtml\"> + <head> + <meta charset=\"utf-8\"/> + <title>&brandShortName;</title> + </head> + </html>`; + + const parser = new DOMParser(); + let doc = parser.parseFromString(s, 'application/xhtml+xml'); + is(doc.getElementsByTagName('parsererror').length, 1, 'parseFromString cannot access locale DTD'); + + SpecialPowers.wrap(parser).forceEnableDTD(); + doc = parser.parseFromString(s, 'application/xhtml+xml'); + const isTitleLocalized = doc.getElementsByTagName('parsererror').length === 0 && + typeof doc.title === 'string' && + !!doc.title; + ok(isTitleLocalized, 'parseFromString can access locale DTD with forceEnableDTD'); + + SimpleTest.finish(); + }); + </script> +</head> +<body> +<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=467035">Mozilla Bug 467035</a> +<p id="display"></p> +<pre id="test"> +</pre> +</body> +</html> diff --git a/dom/webidl/DOMParser.webidl b/dom/webidl/DOMParser.webidl index 8afff03da225..6497374aff16 100644 --- a/dom/webidl/DOMParser.webidl +++ b/dom/webidl/DOMParser.webidl @@ -36,5 +36,10 @@ interface DOMParser { // principal it's using for the document. [ChromeOnly] void forceEnableXULXBL(); + + // Can be used to allow a DOMParser to load DTDs from URLs that + // normally would not be allowed based on the document principal. + [Func="IsChromeOrXBLOrUAWidget"] + void forceEnableDTD(); }; diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index dd09ba67d67e..9f2321cd2831 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -633,12 +633,16 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, mSink == nsCOMPtr<nsIExpatSink>(do_QueryInterface(mOriginalSink)), "In nsExpatDriver::OpenInputStreamFromExternalDTD: " "mOriginalSink not the same object as mSink?"); + nsContentPolicyType policyType = nsIContentPolicy::TYPE_INTERNAL_DTD; nsCOMPtr<nsIPrincipal> loadingPrincipal; if (mOriginalSink) { nsCOMPtr<Document> doc; doc = do_QueryInterface(mOriginalSink->GetTarget()); if (doc) { loadingPrincipal = doc->NodePrincipal(); + if (doc->SkipDTDSecurityChecks()) { + policyType = nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD; + } } } if (!loadingPrincipal) { @@ -648,7 +652,7 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, rv = NS_NewChannel(getter_AddRefs(channel), uri, loadingPrincipal, nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | nsILoadInfo::SEC_ALLOW_CHROME, - nsIContentPolicy::TYPE_DTD); + policyType); } NS_ENSURE_SUCCESS(rv, rv); diff --git a/testing/marionette/l10n.js b/testing/marionette/l10n.js index ebbe071f483b..b4c6a98b9c14 100644 --- a/testing/marionette/l10n.js +++ b/testing/marionette/l10n.js @@ -21,7 +21,11 @@ const { XPCOMUtils } = ChromeUtils.import( ); XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); +XPCOMUtils.defineLazyGetter(this, "domParser", () => { + const parser = new DOMParser(); + parser.forceEnableDTD(); + return parser; +}); const { NoSuchElementError } = ChromeUtils.import( "chrome://marionette/content/error.js" diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py index 159f8dc29e46..9a61bf89439d 100644 --- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py +++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/l10n.py @@ -75,6 +75,7 @@ class L10n(BaseLib): value = self.marionette.execute_script(""" Cu.importGlobalProperties(["DOMParser"]); var parser = new DOMParser(); + parser.forceEnableDTD(); var doc = parser.parseFromString(arguments[0], "text/xml"); var node = doc.querySelector("elem[id='entity']"); diff --git a/toolkit/content/widgets/datetimebox.js b/toolkit/content/widgets/datetimebox.js index 1865007a23ad..5153c3cfaf53 100644 --- a/toolkit/content/widgets/datetimebox.js +++ b/toolkit/content/widgets/datetimebox.js @@ -143,6 +143,7 @@ this.DateTimeInputBaseImplWidget = class { * Remove it when migrate to Fluent (bug 1504363). */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % datetimeboxDTD SYSTEM "chrome://global/locale/datetimebox.dtd"> diff --git a/toolkit/content/widgets/pluginProblem.js b/toolkit/content/widgets/pluginProblem.js index e2cd6a0b6138..aee9942daa5a 100644 --- a/toolkit/content/widgets/pluginProblem.js +++ b/toolkit/content/widgets/pluginProblem.js @@ -17,6 +17,7 @@ this.PluginProblemWidget = class { onsetup() { const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( ` <!DOCTYPE bindings [ diff --git a/toolkit/content/widgets/videocontrols.js b/toolkit/content/widgets/videocontrols.js index 991c01534229..a32d3e2261ae 100644 --- a/toolkit/content/widgets/videocontrols.js +++ b/toolkit/content/widgets/videocontrols.js @@ -2472,6 +2472,7 @@ this.VideoControlsImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd"> @@ -2719,6 +2720,7 @@ this.NoControlsMobileImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd"> @@ -2769,6 +2771,7 @@ this.NoControlsPictureInPictureImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd"> @@ -2875,6 +2878,7 @@ this.NoControlsDesktopImplWidget = class { * Remove it when migrate to Fluent. */ const parser = new this.window.DOMParser(); + parser.forceEnableDTD(); let parserDoc = parser.parseFromString( `<!DOCTYPE bindings [ <!ENTITY % videocontrolsDTD SYSTEM "chrome://global/locale/videocontrols.dtd">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 26345: Hide tracking protection UI
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit cbf4dfb66958590b64cf5b2fc63ff0ed9e2d7d0e Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 10 16:29:31 2019 +0200 Bug 26345: Hide tracking protection UI --- browser/components/controlcenter/content/identityPanel.inc.xul | 3 ++- browser/themes/shared/identity-block/identity-block.inc.css | 4 ++++ browser/themes/shared/incontentprefs/privacy.css | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xul b/browser/components/controlcenter/content/identityPanel.inc.xul index 73cb3968c7fb..88d5074589e3 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xul +++ b/browser/components/controlcenter/content/identityPanel.inc.xul @@ -73,7 +73,8 @@  <hbox id="tracking-protection-container" class="identity-popup-section" - when-connection="not-secure secure secure-ev secure-cert-user-overridden extension"> + when-connection="not-secure secure secure-ev secure-cert-user-overridden extension" + hidden="true"> <vbox id="identity-popup-content-blocking-content" flex="1"> <hbox align="start"> <label id="content-blocking-label" diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index d8233077be69..e1911fd47305 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -173,6 +173,10 @@ toolbar[brighttext] #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > # /* TRACKING PROTECTION ICON */ #tracking-protection-icon-box { + display: none; +} + +#tracking-protection-icon-box { visibility: collapse; overflow: hidden; width: 20px; diff --git a/browser/themes/shared/incontentprefs/privacy.css b/browser/themes/shared/incontentprefs/privacy.css index 5cb165d7d48d..ce9614bcd677 100644 --- a/browser/themes/shared/incontentprefs/privacy.css +++ b/browser/themes/shared/incontentprefs/privacy.css @@ -88,6 +88,10 @@ /* Content Blocking */ +#trackingGroup { + display: none; +} + /* Override styling that sets descriptions as grey */ #trackingGroup description.indent, #trackingGroup .indent > description {

1 0