May 2020 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.8.0esr-9.5-1] fixup! Bug 34196: Update site info URL with the onion name
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 052d8a452a92a97b77130e60e28c1c02076d9db3 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 10:46:58 2020 +0200 fixup! Bug 34196: Update site info URL with the onion name --- browser/base/content/pageinfo/pageInfo.js | 2 +- browser/base/content/pageinfo/pageInfo.xul | 6 ++++++ browser/base/content/pageinfo/security.js | 17 ++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index ae228fb9bd61..c30c74dab752 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -412,7 +412,7 @@ function loadPageInfo(frameOuterWindowID, imageElement, browser) { ); } onLoadPermission(uri, principal); - securityOnLoad(uri, windowInfo); + securityOnLoad(uri, windowInfo, browser.currentOnionAliasURI); }); // Get the media elements from content script to setup the media tab. diff --git a/browser/base/content/pageinfo/pageInfo.xul b/browser/base/content/pageinfo/pageInfo.xul index c7de71c23048..9fbd8e54379a 100644 --- a/browser/base/content/pageinfo/pageInfo.xul +++ b/browser/base/content/pageinfo/pageInfo.xul @@ -294,6 +294,12 @@ control="security-identity-domain-value"/> <textbox id="security-identity-domain-value" readonly="true"/> </row> +  + <row id="security-view-identity-onionalias-row"> + <label id="security-view-identity-onionalias" + control="security-view-identity-onionalias-value"/> + <textbox id="security-view-identity-onionalias-value" readonly="true"/> + </row>  <row> <label id="security-identity-owner-label" diff --git a/browser/base/content/pageinfo/security.js b/browser/base/content/pageinfo/security.js index a0336a67ee42..555fd538d3a2 100644 --- a/browser/base/content/pageinfo/security.js +++ b/browser/base/content/pageinfo/security.js @@ -227,7 +227,7 @@ var security = { _cert: null, }; -function securityOnLoad(uri, windowInfo) { +function securityOnLoad(uri, windowInfo, onionAliasURI) { security.init(uri, windowInfo); var info = security._getSecurityInfo(); @@ -240,6 +240,21 @@ function securityOnLoad(uri, windowInfo) { } document.getElementById("securityTab").hidden = false; + if (onionAliasURI) { + setText( + "security-view-identity-onionalias", + gTorButtonBundle.GetStringFromName("pageInfo_OnionName") + ); + setText("security-view-identity-onionalias-value", onionAliasURI.host); + document.getElementById( + "security-view-identity-onionalias-row" + ).hidden = false; + } else { + document.getElementById( + "security-view-identity-onionalias-row" + ).hidden = true; + } + /* Set Identity section text */ setText("security-identity-domain-value", info.hostName);

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 8311c085334bb50cb58d0b60f8d0d987b5f111c5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 17:53:26 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 36f8182a2581..96321fdd1715 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 36f8182a25818548d62b7fbc6be4d2472773b820 +Subproject commit 96321fdd1715f52cab00f6654ebc8fb420a5489d

1 0

[torbutton/master] Merge remote-tracking branch 'acat/34196'
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 96321fdd1715f52cab00f6654ebc8fb420a5489d Merge: 36f8182a 62a78acd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 18 17:49:40 2020 +0000 Merge remote-tracking branch 'acat/34196' chrome/locale/en-US/torbutton.properties | 1 + 1 file changed, 1 insertion(+)

1 0

[torbutton/master] Bug 34196: add page info string for Onion Name
by sysrqb＠torproject.org 18 May '20

18 May '20

commit 62a78acdf5517c3cc5a08d9f419a5d3d3131cb44 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri May 15 10:29:07 2020 +0200 Bug 34196: add page info string for Onion Name --- chrome/locale/en-US/torbutton.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 507fa8d9..7b6c2d65 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -60,6 +60,7 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionName=Onion Name: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Learn more

1 0

[tor-browser-build/master] Bug 34247: Update and fix errors in README
by gk＠torproject.org 18 May '20

18 May '20

commit 2c48c7178644bc4ba219791ed56e4078ed9e9d18 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 18 07:22:16 2020 +0000 Bug 34247: Update and fix errors in README --- README | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 8e97e2f..a95f466 100644 --- a/README +++ b/README @@ -5,9 +5,7 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. On Debian -stretch, the runc package is available in the main repository. +for runc (such as Debian Buster, Ubuntu 16.04, Fedora 30, etc ...). Your user account should have sudo access, which is required to be able to extract container file systems, start containers and copy files to and @@ -71,6 +69,7 @@ name to the makefile target: $ make nightly-linux-x86_64 $ make nightly-linux-i686 $ make nightly-windows-i686 + $ make nightly-windows-x86_64 $ make nightly-osx-x86_64 $ make nightly-android-armv7 $ make nightly-android-aarch64 @@ -81,13 +80,15 @@ When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. The build will be the same as regular alpha builds, except that in order to make the build faster, only the en-US locale will be built, and no -mar file will be created. +mar file will be created. If you want to base your testbuild on the latest +nightly code insted, rename rbm.local.conf.example to rbm.local.conf +and adapt the torbrowser-testbuild option accordingly. Updating git sources -------------------- -You can run "make fetch" to fetch the latest sources from git for all +You can run `make fetch` to fetch the latest sources from git for all components included in Tor Browser. You should run this if you want to make a nightly build with the latest commits, and you disabled automatic fetching of new commits for nightly builds in rbm.local.conf. @@ -122,14 +123,14 @@ option. You can look at the Makefile to find the rbm command for what you want to build, and add the --output-dir option. For example, if you want to build Tor Browser nightly for linux-x86_64: - ./rbm/rbm build release --output-dir=/var/builds/nightly/2017-01-23 \ + ./rbm/rbm build release --output-dir=/var/builds/nightly/2020-05-23 \ --target nightly --target torbrowser-linux-x86_64 The files will be put in the directory selected by --output-dir in a subdirectory named as the version number (or current date for nightly). To remove this version subdirectory, add the noversiondir target: - ./rbm/rbm build release --output-dir=/var/builds/nightly/2017-01-23 \ + ./rbm/rbm build release --output-dir=/var/builds/nightly/2020-05-23 \ --target nightly --target torbrowser-linux-x86_64 \ --target noversiondir @@ -166,14 +167,14 @@ in the rbm.local.conf file. Cleaning obsolete files and containers images --------------------------------------------- -You can run 'make clean' to clean old build files and containers that +You can run `make clean` to clean old build files and containers that are no longer used in current builds. Before doing that, you need to configure the branches and build targets you are using in the rbm.local.conf file. The cleaning script will check out all the configured branches to create a list of used build files, and delete the files from the 'out' directory that are not used. If you want to see the list of files and containers that would be removed without doing it, you can -use 'make clean-dry-run'. +use `make clean-dry-run`. Building without containers (Android builds only) @@ -181,12 +182,10 @@ Building without containers (Android builds only) By default the build is done inside containers. Adding the no_containers target will disable the use of containers. The following commands can -be used to build the alpha version for android-armv7 and android-x86: +be used to build the alpha version for e.g. android-armv7: ./rbm/rbm build release --target no_containers --target testbuild \ --target torbrowser-android-armv7 - ./rbm/rbm build release --target no_containers --target testbuild \ - --target torbrowser-android-x86 Note: the logs will still show the use and creation of a container image called "containers_disabled". This is due to the way we disable the use @@ -198,7 +197,7 @@ builds, and will require that you run Debian Stretch and install build dependencies for all the components that are built. This can be done with the following command: - # apt-get install build-essential python automake libtool zip unzip + # apt-get install build-essential python automake libtool zip unzip \ autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ automake autoconf libtool autopoint libssl-dev \ pkg-config zlib1g-dev libparallel-forkmanager-perl \ @@ -218,9 +217,10 @@ Hacking on the Tor Browser build The file README.HACKING tries to list the main things to know when making changes to the Tor Browser build. + Description of makefile rules ----------------------------- -You can find a description of the makefile rules in the README.MAKEFILE +You can find a description of the Makefile rules in the README.MAKEFILE file.

1 0

[tor-browser-build/master] Bug 33113: Bump NSIS version to 3.05
by sysrqb＠torproject.org 15 May '20

15 May '20

commit c6ef475b9388e935d77722a4d5fec860b372a6a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 2 09:36:54 2020 +0000 Bug 33113: Bump NSIS version to 3.05 --- projects/nsis/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/nsis/config b/projects/nsis/config index 0e6f7ad..ed9823d 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.04 +version: 3.05 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,7 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: 609536046c50f35cfd909dd7df2ab38f2e835d0da3c1048aa0d48c59c5a4f4f5 + sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_33113_v2'
by sysrqb＠torproject.org 15 May '20

15 May '20

commit a4bf4b8a4fee918852c098edde7c89f784720d5b Merge: 8547db1 c6ef475 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 15 23:27:50 2020 +0000 Merge remote-tracking branch 'gktpo/bug_33113_v2' projects/nsis/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] (ESR68) Bug 1511941 - Don't expose PerformanceNavigationTiming in RFP mode
by sysrqb＠torproject.org 15 May '20

15 May '20

commit 6d7f6ea31a7629d3df6fd09fc579b5a60e599c35 Author: sanketh <sgmenda(a)uwaterloo.ca> Date: Sun May 10 16:50:41 2020 +0000 (ESR68) Bug 1511941 - Don't expose PerformanceNavigationTiming in RFP mode In RFP mode, we do not support PerformanceNavigationTiming, so don't expose it. In particular, window.PerformanceNavigationTiming should return undefined. Added a new method PerformanceNavigationTiming::Enabled which when used with the WebIDL Func attribute allows us to toggle whether window.PerformanceNavigationTiming is exposed. Created dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html to test whether the toggling works. Updated browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js to create a new window each time privacy.resistFingerprinting is flipped so this behavior does not leak into other tests. --- .../test/browser/browser_performanceAPI.js | 62 ++++++++-------------- dom/performance/PerformanceMainThread.cpp | 3 +- dom/performance/PerformanceNavigationTiming.cpp | 6 +++ dom/performance/PerformanceNavigationTiming.h | 6 +++ dom/tests/mochitest/general/mochitest.ini | 1 + ...est_toggling_performance_navigation_timing.html | 47 ++++++++++++++++ dom/webidl/PerformanceNavigationTiming.webidl | 2 + 7 files changed, 85 insertions(+), 42 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js index b4c6b4f9d461..eb51a98e7364 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js +++ b/browser/components/resistfingerprinting/test/browser/browser_performanceAPI.js @@ -78,7 +78,6 @@ let isRounded = (x, expectedPrecision) => { }; let setupTest = async function( - tab, resistFingerprinting, reduceTimerPrecision, expectedPrecision, @@ -95,6 +94,13 @@ let setupTest = async function( ], ], }); + + let win = await BrowserTestUtils.openNewBrowserWindow(); + let tab = await BrowserTestUtils.openNewForegroundTab( + win.gBrowser, + TEST_PATH + "file_dummy.html" + ); + // No matter what we set the precision to, if we're in ResistFingerprinting mode // we use the larger of the precision pref and the constant 100ms if (resistFingerprinting) { @@ -110,15 +116,11 @@ let setupTest = async function( }, runTests ); + await BrowserTestUtils.closeWindow(win); }; // ================================================================================================ // ================================================================================================ add_task(async function runRPTests() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - let runTests = async function(data) { let timerlist = data.list; let expectedPrecision = data.precision; @@ -165,21 +167,14 @@ add_task(async function runRPTests() { ); }; - await setupTest(tab, true, true, 100, runTests); - await setupTest(tab, true, false, 13, runTests); - await setupTest(tab, true, false, 0.13, runTests); - - BrowserTestUtils.removeTab(tab); + await setupTest(true, true, 100, runTests); + await setupTest(true, false, 13, runTests); + await setupTest(true, false, 0.13, runTests); }); // ================================================================================================ // ================================================================================================ add_task(async function runRTPTests() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - let runTests = async function(data) { let timerlist = data.list; let expectedPrecision = data.precision; @@ -215,6 +210,7 @@ add_task(async function runRTPTests() { content.performance.getEntries().length, 4, "For reduceTimerPrecision, there should be 4 entries for performance.getEntries()" + // PerformanceNavigationTiming, PerformanceMark, PerformanceMark, PerformanceMeasure ); for (var i = 0; i < 4; i++) { let startTime = content.performance.getEntries()[i].startTime; @@ -253,11 +249,9 @@ add_task(async function runRTPTests() { content.performance.clearResourceTimings(); }; - await setupTest(tab, false, true, 100, runTests); - await setupTest(tab, false, true, 13, runTests); - await setupTest(tab, false, true, 0.13, runTests); - - BrowserTestUtils.removeTab(tab); + await setupTest(false, true, 100, runTests); + await setupTest(false, true, 13, runTests); + await setupTest(false, true, 0.13, runTests); }); // ================================================================================================ @@ -284,27 +278,13 @@ let runWorkerTest = async function(data) { }; add_task(async function runRPTestsForWorker() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - - await setupTest(tab, true, true, 100, runWorkerTest, "runRPTests"); - await setupTest(tab, true, false, 13, runWorkerTest, "runRPTests"); - await setupTest(tab, true, true, 0.13, runWorkerTest, "runRPTests"); - - BrowserTestUtils.removeTab(tab); + await setupTest(true, true, 100, runWorkerTest, "runRPTests"); + await setupTest(true, false, 13, runWorkerTest, "runRPTests"); + await setupTest(true, true, 0.13, runWorkerTest, "runRPTests"); }); add_task(async function runRTPTestsForWorker() { - let tab = await BrowserTestUtils.openNewForegroundTab( - gBrowser, - TEST_PATH + "file_dummy.html" - ); - - await setupTest(tab, false, true, 100, runWorkerTest, "runRTPTests"); - await setupTest(tab, false, true, 13, runWorkerTest, "runRTPTests"); - await setupTest(tab, false, true, 0.13, runWorkerTest, "runRTPTests"); - - BrowserTestUtils.removeTab(tab); + await setupTest(false, true, 100, runWorkerTest, "runRTPTests"); + await setupTest(false, true, 13, runWorkerTest, "runRTPTests"); + await setupTest(false, true, 0.13, runWorkerTest, "runRTPTests"); }); diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp index 7c39b9350646..bfcbea4e1148 100644 --- a/dom/performance/PerformanceMainThread.cpp +++ b/dom/performance/PerformanceMainThread.cpp @@ -305,7 +305,8 @@ DOMHighResTimeStamp PerformanceMainThread::CreationTime() const { void PerformanceMainThread::CreateNavigationTimingEntry() { MOZ_ASSERT(!mDocEntry, "mDocEntry should be null."); - if (!StaticPrefs::dom_enable_performance_navigation_timing()) { + if (!StaticPrefs::dom_enable_performance_navigation_timing() || + StaticPrefs::privacy_resistFingerprinting()) { return; } diff --git a/dom/performance/PerformanceNavigationTiming.cpp b/dom/performance/PerformanceNavigationTiming.cpp index dbc6aa78c4d5..fb18b91aabe6 100644 --- a/dom/performance/PerformanceNavigationTiming.cpp +++ b/dom/performance/PerformanceNavigationTiming.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/PerformanceNavigationTiming.h" #include "mozilla/dom/PerformanceNavigationTimingBinding.h" +#include "mozilla/StaticPrefs.h" using namespace mozilla::dom; @@ -138,3 +139,8 @@ void PerformanceNavigationTiming::UpdatePropertiesFromHttpChannel( nsIHttpChannel* aHttpChannel, nsITimedChannel* aChannel) { mTimingData->SetPropertiesFromHttpChannel(aHttpChannel, aChannel); } + +bool PerformanceNavigationTiming::Enabled(JSContext* aCx, JSObject* aGlobal) { + return (StaticPrefs::dom_enable_performance_navigation_timing() && + !StaticPrefs::privacy_resistFingerprinting()); +} diff --git a/dom/performance/PerformanceNavigationTiming.h b/dom/performance/PerformanceNavigationTiming.h index 8ef79999a1bc..7bf76ee3d670 100644 --- a/dom/performance/PerformanceNavigationTiming.h +++ b/dom/performance/PerformanceNavigationTiming.h @@ -65,6 +65,12 @@ class PerformanceNavigationTiming final : public PerformanceResourceTiming { void UpdatePropertiesFromHttpChannel(nsIHttpChannel* aHttpChannel, nsITimedChannel* aChannel); + /* + * For use with the WebIDL Func attribute to determine whether + * window.PerformanceNavigationTiming is exposed. + */ + static bool Enabled(JSContext* aCx, JSObject* aGlobal); + private: ~PerformanceNavigationTiming() {} }; diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini index cb233881397d..36f955500c09 100644 --- a/dom/tests/mochitest/general/mochitest.ini +++ b/dom/tests/mochitest/general/mochitest.ini @@ -141,6 +141,7 @@ skip-if = toolkit == 'android' # bug 1230232 - Mouse doesn't select in the same [test_storagePermissionsReject.html] [test_storagePermissionsRejectForeign.html] [test_stylesheetPI.html] +[test_toggling_performance_navigation_timing.html] [test_vibrator.html] [test_WebKitCSSMatrix.html] [test_windowedhistoryframes.html] diff --git a/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html b/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html new file mode 100644 index 000000000000..88f7154286cd --- /dev/null +++ b/dom/tests/mochitest/general/test_toggling_performance_navigation_timing.html @@ -0,0 +1,47 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta charset="utf-8"> + <title>Test for Bug 1511941 - Don't expose PerformanceNavigationTiming when it is disabled</title> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body> + <div id="content"> </div> + <script type="application/javascript"> + async function testWhetherExposed(resistFingerprinting, enable_performance_navigation_timing) { + await SpecialPowers.pushPrefEnv({ + "set": [["privacy.resistFingerprinting", resistFingerprinting], + ["dom.enable_performance_navigation_timing", enable_performance_navigation_timing]], + }); + var iframe = document.createElement("iframe"); + document.body.append(iframe); + var p = iframe.contentWindow.PerformanceNavigationTiming; + if (resistFingerprinting) + is(p, undefined, "window.PerformanceNavigationTiming should not be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + if (!enable_performance_navigation_timing) + is(p, undefined, "window.PerformanceNavigationTiming should not be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + if (enable_performance_navigation_timing && !resistFingerprinting) { + isnot(p, undefined, "window.PerformanceNavigationTiming should be exposed when" + + " dom.enable_performance_navigation_timing=" + enable_performance_navigation_timing + + " and privacy.resistFingerprinting="+ resistFingerprinting +"."); + } + } + + async function start() { + await testWhetherExposed(true,true); + await testWhetherExposed(true,false); + await testWhetherExposed(false,true); + await testWhetherExposed(false,false); + SimpleTest.finish(); + } + + SimpleTest.waitForExplicitFinish(); + start(); + </script> +</body> +</html> diff --git a/dom/webidl/PerformanceNavigationTiming.webidl b/dom/webidl/PerformanceNavigationTiming.webidl index b26e1c18f688..cf029972304f 100644 --- a/dom/webidl/PerformanceNavigationTiming.webidl +++ b/dom/webidl/PerformanceNavigationTiming.webidl @@ -17,6 +17,8 @@ enum NavigationType { "prerender" }; +[Exposed=Window, + Func="mozilla::dom::PerformanceNavigationTiming::Enabled"] interface PerformanceNavigationTiming : PerformanceResourceTiming { readonly attribute DOMHighResTimeStamp unloadEventStart; readonly attribute DOMHighResTimeStamp unloadEventEnd;

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] Bug 34196: Update site info URL with the onion name
by sysrqb＠torproject.org 14 May '20

14 May '20

commit 00f5a4c995a911423e10af5a2bbeceef1ae76be6 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed May 13 11:13:24 2020 +0200 Bug 34196: Update site info URL with the onion name --- browser/base/content/browser-siteIdentity.js | 12 +++++++----- browser/base/content/browser.js | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 32e939787fb7..d1cbf8708dfc 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -464,13 +464,13 @@ var gIdentityHandler = { * nsIURI for which the identity UI should be displayed, already * processed by nsIURIFixup.createExposableURI. */ - updateIdentity(state, uri) { + updateIdentity(state, uri, onionAliasURI) { let shouldHidePopup = this._uri && this._uri.spec != uri.spec; this._state = state; // Firstly, populate the state properties required to display the UI. See // the documentation of the individual properties for details. - this.setURI(uri); + this.setURI(uri, onionAliasURI); this._secInfo = gBrowser.securityUI.secInfo; // Then, update the user interface with the available data. @@ -549,17 +549,18 @@ var gIdentityHandler = { * Attempt to provide proper IDN treatment for host names */ getEffectiveHost() { + let uri = this._onionAliasURI || this._uri; if (!this._IDNService) { this._IDNService = Cc["@mozilla.org/network/idn-service;1"].getService( Ci.nsIIDNService ); } try { - return this._IDNService.convertToDisplayIDN(this._uri.host, {}); + return this._IDNService.convertToDisplayIDN(uri.host, {}); } catch (e) { // If something goes wrong (e.g. host is an IP address) just fail back // to the full domain. - return this._uri.host; + return uri.host; } }, @@ -984,8 +985,9 @@ var gIdentityHandler = { ContentBlocking.toggleReportBreakageButton(); }, - setURI(uri) { + setURI(uri, onionAliasURI) { this._uri = uri; + this._onionAliasURI = onionAliasURI; try { // Account for file: urls and catch when "" is the value diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 67a1977fef6a..251b11dda03f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6083,6 +6083,7 @@ var XULBrowserWindow = { // Don't need to do anything if the data we use to update the UI hasn't // changed let uri = gBrowser.currentURI; + let onionAliasURI = gBrowser.selectedBrowser.currentOnionAliasURI; let spec = uri.spec; if (this._state == aState && this._lastLocation == spec) { // Switching to a tab of the same URL doesn't change most security @@ -6100,7 +6101,7 @@ var XULBrowserWindow = { try { uri = Services.uriFixup.createExposableURI(uri); } catch (e) {} - gIdentityHandler.updateIdentity(this._state, uri); + gIdentityHandler.updateIdentity(this._state, uri, onionAliasURI); }, // simulate all change notifications after switching tabs

1 0

[tor-browser/tor-browser-68.8.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34196+1' into tor-browser-68.8.0esr-9.5-1
by sysrqb＠torproject.org 14 May '20

14 May '20

commit 2e16915ff1a6933090dfb47e6fc876ea056cf07c Merge: 4acec7610371 00f5a4c995a9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 14 22:55:43 2020 +0000 Merge remote-tracking branch 'acatgh/34196+1' into tor-browser-68.8.0esr-9.5-1 browser/base/content/browser-siteIdentity.js | 12 +++++++----- browser/base/content/browser.js | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-)

1 0