tbb-commits

Download

tbb-commits@lists.torproject.org

18606 discussions

[tor-browser-build/master] Bug 29981: Add yasm to the list of dependencies for android builds
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit f7ae040da39ac0009776802371e088f15531b9e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 30 17:06:00 2019 +0200 Bug 29981: Add yasm to the list of dependencies for android builds Note: yasm is only needed for android-x86 builds. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 1dc2cfd..6aa763e 100644 --- a/README +++ b/README @@ -208,7 +208,7 @@ with the following command: autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ automake autoconf libtool autopoint libssl-dev \ pkg-config zlib1g-dev libparallel-forkmanager-perl \ - libfile-slurp-perl bzip2 xz-utils apksigner + libfile-slurp-perl bzip2 xz-utils apksigner yasm Common Build Errors

1 0

[tor-browser-build/maint-8.5] Bug 30280: Wrong SHA-256 sum for j2objc-annotations-1.1.jar
by gk＠torproject.org 30 Apr '19

30 Apr '19

1 0

[tor-browser-build/master] Bug 30280: Wrong SHA-256 sum for j2objc-annotations-1.1.jar
by gk＠torproject.org 30 Apr '19

30 Apr '19

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 1532530 - Avoid loss of upload data by webRequest API r=kmag a=lizzard
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit 30a070eefe4c881a1804690b8983db2911c2c99b Author: Rob Wu <rob(a)robwu.nl> Date: Mon Mar 25 21:16:49 2019 +0000 Bug 1532530 - Avoid loss of upload data by webRequest API r=kmag a=lizzard When an extension requests access to the request body of a request, `nsConverterInputStream` is used to parse the input streams that make up a request body. These input streams are later (re)used to upload the form data to the original destination (server). `nsConverterInputStream`'s destructor does however close the input streams, which results in data loss when the object is garbage-collected before the upload completes. This patch fixes the issue by explicitly nulling the underlying stream before returning from the form parser. Differential Revision: https://phabricator.services.mozilla.com/D24539 --HG-- extra : source : 574c141c8dd619a00ffa90fc40c2ba614afb46da extra : intermediate-source : 85efc85e2cf3e5d3e26cfdf8a716bbb9ac3551b5 --- toolkit/modules/addons/WebRequestUpload.jsm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/toolkit/modules/addons/WebRequestUpload.jsm b/toolkit/modules/addons/WebRequestUpload.jsm index 10770d7ee771..294a394cd93f 100644 --- a/toolkit/modules/addons/WebRequestUpload.jsm +++ b/toolkit/modules/addons/WebRequestUpload.jsm @@ -192,6 +192,7 @@ function parseFormData(stream, channel, lenient = false) { const BUFFER_SIZE = 8192; let touchedStreams = new Set(); + let converterStreams = []; /** * Creates a converter input stream from the given raw input stream, @@ -210,10 +211,12 @@ function parseFormData(stream, channel, lenient = false) { } touchedStreams.add(stream); - return ConverterInputStream( + let converterStream = ConverterInputStream( stream, "UTF-8", 0, lenient ? Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER : 0); + converterStreams.push(converterStream); + return converterStream; } /** @@ -382,6 +385,12 @@ function parseFormData(stream, channel, lenient = false) { for (let stream of touchedStreams) { rewind(stream); } + for (let converterStream of converterStreams) { + // Release the reference to the underlying input stream, to prevent the + // destructor of nsConverterInputStream from closing the stream, which + // would cause uploads to break. + converterStream.init(null, null, 0, 0); + } } return null;

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 28369: stop shipping pingsender executable
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit c1262822e77cf26780d240646bacd14a67e6c301 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 10 17:52:51 2019 +0200 Bug 28369: stop shipping pingsender executable --- browser/app/macbuild/Contents/MacOS-files.in | 1 - browser/installer/package-manifest.in | 4 ---- browser/installer/windows/nsis/shared.nsh | 1 - python/mozbuild/mozbuild/artifacts.py | 2 -- toolkit/components/telemetry/TelemetrySend.jsm | 17 +---------------- toolkit/components/telemetry/moz.build | 1 - 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index bd87bc5116b7..cfa17eca813b 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -9,7 +9,6 @@ #if defined(MOZ_ASAN) || defined(MOZ_TSAN) /llvm-symbolizer #endif -/pingsender /pk12util /ssltunnel /webrtc-gtest diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ede92eca6e58..bc6082198b02 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -778,10 +778,6 @@ bin/libfreebl_32int64_3.so #endif #endif -; [ Ping Sender ] -; -@BINPATH@/pingsender@BIN_SUFFIX@ - @RESPATH@/components/dom_audiochannel.xpt ; Shutdown Terminator diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 4263f379db64..a0cd06cdae68 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1337,7 +1337,6 @@ Push "xpcom.dll" Push "crashreporter.exe" Push "minidump-analyzer.exe" - Push "pingsender.exe" Push "updater.exe" Push "${FileMainEXE}" !macroend diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index 2afe9c43fcb0..b2d560a713c9 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -278,7 +278,6 @@ class LinuxArtifactJob(ArtifactJob): 'firefox/firefox', 'firefox/firefox-bin', 'firefox/minidump-analyzer', - 'firefox/pingsender', 'firefox/platform.ini', 'firefox/plugin-container', 'firefox/updater', @@ -363,7 +362,6 @@ class MacArtifactJob(ArtifactJob): 'libmozavutil.dylib', 'libmozavcodec.dylib', 'libsoftokn3.dylib', - 'pingsender', 'plugin-container.app/Contents/MacOS/plugin-container', 'updater.app/Contents/MacOS/org.mozilla.updater', # 'xpcshell', diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm index 00992ebaa786..249d142d82cf 100644 --- a/toolkit/components/telemetry/TelemetrySend.jsm +++ b/toolkit/components/telemetry/TelemetrySend.jsm @@ -1339,21 +1339,6 @@ var TelemetrySendImpl = { }, runPingSender(url, pingPath) { - if (AppConstants.platform === "android") { - throw Cr.NS_ERROR_NOT_IMPLEMENTED; - } - - const exeName = AppConstants.platform === "win" ? "pingsender.exe" - : "pingsender"; - - let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile); - exe.append(exeName); - - let process = Cc["@mozilla.org/process/util;1"] - .createInstance(Ci.nsIProcess); - process.init(exe); - process.startHidden = true; - process.noShell = true; - process.run(/* blocking */ false, [url, pingPath], 2); + throw Cr.NS_ERROR_NOT_IMPLEMENTED; }, }; diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index c36296a13cb7..3ddd8625def5 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -12,7 +12,6 @@ FINAL_LIBRARY = 'xul' DIRS = [ 'hybrid-content', - 'pingsender', ] DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']

1 0

[tor-browser-build/master] Bug 29981: Fix some reproducibility issue in the android build
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit 0fc15a39f2adcf029676810c2ec37c566886879e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 10 18:45:51 2019 +0200 Bug 29981: Fix some reproducibility issue in the android build Add files to the apk in sorted order, to avoid reproducibility issues. --- projects/tor-browser/build.android | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 7592c6b..be36abc 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -12,16 +12,25 @@ mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b [% c("var/touch") %] $ext_dir $ext_dir/* zip -d $apk META-INF/\* -zip -r -X $apk $ext_dir +[% c('zip', { + zip_src => [ '$ext_dir' ], + zip_args => '$apk', + }) %] unzip $apk lib/* zip -d $apk lib/\* [% IF c("var/android-x86") %] - zip $apk lib/x86/* + [% c('zip', { + zip_src => [ 'lib/x86/*' ], + zip_args => '$apk', + }) %] [% END %] [% IF c("var/android-armv7") %] - zip $apk lib/armeabi-v7a/* + [% c('zip', { + zip_src => [ 'lib/armeabi-v7a/*' ], + zip_args => '$apk', + }) %] [% END %] rm -fR lib

1 0

[tor-browser-build/master] Bug 29981: Add option to build without using containers
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit 9072578261fc2e4198e39b81313683bf2674c5b4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 14:35:37 2019 +0200 Bug 29981: Add option to build without using containers We do that by adding support for a no_containers target which defines the new option var/container/global_disable in rbm.conf. We already had the option var/container/use_container doing something similar to this new option, however it can not be overriden in rbm.conf as we define it in each project's configuration, which has priority over rbm.conf. --- README | 29 +++++++++++++++++++++++++++++ projects/container-image/config | 9 +++++++++ projects/firefox/build | 4 ++-- projects/release/config | 7 +++++++ rbm.conf | 19 +++++++++++++------ 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/README b/README index 2b09ab1..1dc2cfd 100644 --- a/README +++ b/README @@ -182,6 +182,35 @@ of files and containers that would be removed without doing it, you can use 'make clean-dry-run'. +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: + + ./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 +of containers: the container-image project is still called, but it will +just create an empty file instead of a real container image. + +The build without containers is currently only supported for the Android +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 + autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ + automake autoconf libtool autopoint libssl-dev \ + pkg-config zlib1g-dev libparallel-forkmanager-perl \ + libfile-slurp-perl bzip2 xz-utils apksigner + + Common Build Errors ------------------- diff --git a/projects/container-image/config b/projects/container-image/config index 68c401a..effcdf3 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -13,6 +13,15 @@ lsb_release: codename: wheezy release: 7.11 +targets: + no_containers: + filename: containers_disabled + pre: '' + input_files: [] + build: | + mkdir -p [% dest_dir %] + touch [% dest_dir _ '/' _ c('filename') %] + pre: | #!/bin/sh # [% c('var/container/suite') %] diff --git a/projects/firefox/build b/projects/firefox/build index c070770..aace388 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -98,8 +98,8 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] - export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" - gradle_repo=/var/tmp/gradle-dependencies + gradle_repo=/var/tmp/dist/gradle-dependencies + export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" # Move Gradle Repo to hard-coded location. This location is embedded in the file # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo diff --git a/projects/release/config b/projects/release/config index 52a416a..ddb17d1 100644 --- a/projects/release/config +++ b/projects/release/config @@ -6,6 +6,7 @@ var: signed_status: unsigned today: '[% USE date; date.format(format = "%Y-%m-%d") %]' publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' + containers_target: with_containers targets: torbrowser-all: @@ -85,6 +86,10 @@ targets: build_target: torbrowser-testbuild publish_dir: '' + no_containers: + var: + containers_target: no_containers + signed: var: signed_status: signed @@ -100,6 +105,7 @@ input_files: project: tor-browser enable: '[% c("var/torbrowser-android-armv7") %]' target: + - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - torbrowser-android-armv7 @@ -107,6 +113,7 @@ input_files: project: tor-browser enable: '[% c("var/torbrowser-android-x86") %]' target: + - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - torbrowser-android-x86 diff --git a/rbm.conf b/rbm.conf index a3482ac..9e4fc78 100644 --- a/rbm.conf +++ b/rbm.conf @@ -40,7 +40,7 @@ var: build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] - [% IF c("var/container/use_container") -%] + [% IF c("var/container/use_container") && ! c("var/container/global_disable") -%] [% c("var/container/suite") %] [% c("var/container/arch") %] [% END -%] @@ -118,6 +118,9 @@ var: export SHELL=/bin/bash export HOME=$rootdir umask 0022 + [% IF c("var/container/global_disable") -%] + rm -Rf /var/tmp/build /var/tmp/dist + [% END -%] DOCSDIR_project: '[% project %]' set_PTDIR_DOCSDIR: | @@ -351,6 +354,10 @@ targets: var: build_id: 1 + no_containers: + var: + container: + global_disable: 1 # change the default gpg_wrapper to allow git tag signed using an # expired key. @@ -376,11 +383,11 @@ gpg_wrapper: | exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" fi -remote_start: '[% IF c("var/container/use_container") %][% c("runc/remote_start") %][% END %]' -remote_exec: '[% IF c("var/container/use_container") %][% c("runc/remote_exec") %][% END %]' -remote_put: '[% IF c("var/container/use_container") %][% c("runc/remote_put") %][% END %]' -remote_get: '[% IF c("var/container/use_container") %][% c("runc/remote_get") %][% END %]' -remote_finish: '[% IF c("var/container/use_container") %][% c("runc/remote_finish") %][% END %]' +remote_start: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_start") %][% END %]' +remote_exec: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_exec") %][% END %]' +remote_put: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_put") %][% END %]' +remote_get: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_get") %][% END %]' +remote_finish: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_finish") %][% END %]' runc: remote_start: |

1 0

[torbutton/master] Bug 30115: map browser + domain -> credentials to fix UI issues.
by gk＠torproject.org 26 Apr '19

26 Apr '19

commit 095cf9496fbf4ae12d499bb21d00d1dc84af0147 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 25 20:56:58 2019 +0200 Bug 30115: map browser + domain -> credentials to fix UI issues. Should also fix #27749 and #25145. --- src/chrome/content/tor-circuit-display.js | 29 +++++++++++++++--------- src/chrome/content/torbutton.js | 37 +++++++------------------------ src/modules/utils.js | 35 +++++++++++++++++++++++++++-- 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 5fc92e48..5ecbe7d7 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -33,7 +33,7 @@ Cu.import("resource://gre/modules/Services.jsm"); let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit, observe, getLocale } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe, getLocale, getDomainForBrowser } = Cu.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -43,12 +43,12 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] // A mutable map that stores the current nodes for each // SOCKS username/password pair. -let credentialsToNodeDataMap = {}, +let credentialsToNodeDataMap = new Map(), // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}, + knownCircuitIDs = new Map(), // A mutable map that records the SOCKS credentials for the - // latest channels for each browser. + // latest channels for each browser + domain. browserToCredentialsMap = new Map(); // __trimQuotes(s)__. @@ -139,9 +139,9 @@ let collectIsolationData = function (aController, updateUI) { "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", async (streamEvent) => { - if (!knownCircuitIDs[streamEvent.CircuitID]) { + if (!knownCircuitIDs.get(streamEvent.CircuitID)) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); - knownCircuitIDs[streamEvent.CircuitID] = true; + knownCircuitIDs.set(streamEvent.CircuitID, true); let circuitStatus = await getCircuitStatusByID(aController, streamEvent.CircuitID), credentials = circuitStatus ? (trimQuotes(circuitStatus.SOCKS_USERNAME) + "|" + @@ -149,7 +149,7 @@ let collectIsolationData = function (aController, updateUI) { null; if (credentials) { let nodeData = await nodeDataForCircuit(aController, circuitStatus); - credentialsToNodeDataMap[credentials] = nodeData; + credentialsToNodeDataMap.set(credentials, nodeData); updateUI(); } } @@ -183,8 +183,12 @@ let collectBrowserCredentials = function () { let proxyInfo = chan.QueryInterface(Ci.nsIProxiedChannel).proxyInfo; let browser = browserForChannel(chan); if (browser && proxyInfo) { - browserToCredentialsMap.set(browser, [proxyInfo.username, - proxyInfo.password]); + if (!browserToCredentialsMap.has(browser)) { + browserToCredentialsMap.set(browser, new Map()); + } + let domainMap = browserToCredentialsMap.get(browser); + domainMap.set(proxyInfo.username, [proxyInfo.username, + proxyInfo.password]); } } catch (e) { logger.eclog(3, `Error collecting browser credentials: ${e.message}, ${chan.URI.spec}`); @@ -264,10 +268,13 @@ let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); // Obtains the circuit used by the given browser. let currentCircuitData = function (browser) { if (browser) { - let credentials = browserToCredentialsMap.get(browser); + let firstPartyDomain = getDomainForBrowser(browser); + let domain = firstPartyDomain || "--unknown--"; + let domainMap = browserToCredentialsMap.get(browser); + let credentials = domainMap && domainMap.get(domain); if (credentials) { let [SOCKS_username, SOCKS_password] = credentials; - let nodeData = credentialsToNodeDataMap[`${SOCKS_username}|${SOCKS_password}`]; + let nodeData = credentialsToNodeDataMap.get(`${SOCKS_username}|${SOCKS_password}`); let domain = SOCKS_username; return { domain, nodeData }; } diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6ea51190..50f758c4 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -9,16 +9,19 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); -let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { + showDialog, + show_torbrowser_manual, + unescapeTorString, + bindPrefAndInit, + getDomainForBrowser, +} = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; var m_tb_prefs = Services.prefs; @@ -860,31 +863,7 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let firstPartyDomain = gBrowser.contentPrincipal.originAttributes - .firstPartyDomain; - // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param - if (firstPartyDomain === k_tb_about_uri_first_party_domain) { - let knownErrors = ["about:neterror", "about:certerror"]; - let origin = gBrowser.contentPrincipal.origin || ''; - if (knownErrors.some(x => origin.startsWith(x))) { - try { - let urlOrigin = new URL(origin); - let { hostname } = new URL(urlOrigin.searchParams.get('u')); - if (hostname) { - try { - firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname); - } catch (e) { - if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || - e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { - firstPartyDomain = hostname; - } - } - } - } catch (e) { - torbutton_log(4, "Exception on new circuit" +e); - } - } - } + let firstPartyDomain = getDomainForBrowser(gBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/src/modules/utils.js b/src/modules/utils.js index 5af071ec..d7baca6e 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -2,11 +2,17 @@ // Various helpful utility functions. // ### Shortcut -const Cu = Components.utils; +const { Cu: utils, Cr: results } = Components; // ### Import Mozilla Services Cu.import("resource://gre/modules/Services.jsm"); +// ### Import global URL +Cu.importGlobalProperties(["URL"]); + +// ### About firstPartyDomain literal +const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; + // ## Pref utils // __prefs__. A shortcut to Mozilla Services.prefs. @@ -212,7 +218,32 @@ var show_torbrowser_manual = () => { return availableLocales.indexOf(shortLocale) >= 0; } +var getDomainForBrowser = (browser) => { + let firstPartyDomain = browser.contentPrincipal.originAttributes.firstPartyDomain; + // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param + if (firstPartyDomain === k_tb_about_uri_first_party_domain) { + let knownErrors = ["about:neterror", "about:certerror"]; + let origin = browser.contentPrincipal.origin || ''; + if (knownErrors.some(x => origin.startsWith(x))) { + try { + let urlOrigin = new URL(origin); + let { hostname } = new URL(urlOrigin.searchParams.get('u')); + if (hostname) { + try { + firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname); + } catch (e) { + if (e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || + e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) { + firstPartyDomain = hostname; + } + } + } + } catch (e) {} + } + } + return firstPartyDomain; +}; // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", +let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", "getDomainForBrowser", "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString"];

1 0

[torbutton/master] Merge remote-tracking branch 'acat/30115+1'
by gk＠torproject.org 26 Apr '19

26 Apr '19

commit e44be49b35060f6ae17230bbc63bd617126843ee Merge: 053c9869 095cf949 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 26 09:32:49 2019 +0000 Merge remote-tracking branch 'acat/30115+1' src/chrome/content/tor-circuit-display.js | 29 +++++++++++++++--------- src/chrome/content/torbutton.js | 37 +++++++------------------------ src/modules/utils.js | 35 +++++++++++++++++++++++++++-- 3 files changed, 59 insertions(+), 42 deletions(-)

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 30086 - Prevent Sync-related crashes on Android
by gk＠torproject.org 25 Apr '19

25 Apr '19

commit 128f8ebdc9d460f4df550b5977ef30bd6ff4e302 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 24 16:37:03 2019 +0000 Bug 30086 - Prevent Sync-related crashes on Android --- .../java/org/mozilla/gecko/home/CombinedHistoryPanel.java | 14 ++++++++++---- .../gecko/overlays/service/sharemethods/SendTab.java | 6 ++++-- mobile/android/base/locales/en-US/torbrowser_strings.dtd | 2 ++ mobile/android/base/strings.xml.in | 2 ++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java index 6d00268432a5..a35b3ab53e87 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java @@ -234,10 +234,16 @@ public class CombinedHistoryPanel extends HomeFragment implements RemoteClientsD syncSetupButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.BUTTON, "history_syncsetup"); - // This Activity will redirect to the correct Activity as needed. - final Intent intent = new Intent(FxAccountConstants.ACTION_FXA_GET_STARTED); - startActivity(intent); + // Tell the user this action is not supported + final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity()); + dialogBuilder.setMessage(R.string.sync_not_supported); + dialogBuilder.setNegativeButton(R.string.button_cancel, new AlertDialog.OnClickListener() { + @Override + public void onClick(final DialogInterface dialog, final int which) { + dialog.dismiss(); + } + }); + dialogBuilder.show(); } }); diff --git a/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java b/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java index 9382c2ec15f9..5babb74c4f88 100644 --- a/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java +++ b/mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java @@ -165,7 +165,8 @@ public class SendTab extends ShareMethod { } // Have registered UIs offer to set up a Firefox Account. - setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED); + // Comment for Tor Browser + //setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED); } /** @@ -187,7 +188,8 @@ public class SendTab extends ShareMethod { if (validGUIDs.isEmpty()) { // Guess we'd better override. We have no clients. // This does the broadcast for us. - setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED); + // Comment for Tor Browser + //setOverrideIntentAction(FxAccountConstants.ACTION_FXA_GET_STARTED); return; } diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd index 44b4a44ff93c..36cff09ee3c3 100644 --- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -55,3 +55,5 @@ <!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge."> <!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information."> + +<!ENTITY sync_not_supported "Sync is not currently supported in Tor Browser on Android"> diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index eaa902b95060..327755ef68f3 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -111,6 +111,8 @@ <string name="pref_tor_network_using_multiple_provided_bridges">&pref_tor_network_using_multiple_provided_bridges;</string> <string name="pref_tor_network_using_a_provided_bridge">&pref_tor_network_using_a_provided_bridge;</string> + <string name="sync_not_supported">&sync_not_supported;</string> + <string name="bookmarks_title">&bookmarks_title;</string> <string name="history_title">&history_title;</string>

1 0

Jump to page: