- tbb-commits - lists.torproject.org

[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

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 1542309 - Set firstPartyDomain to public suffix if getBaseDomain fails. r=baku
by gk＠torproject.org 23 Apr '19

23 Apr '19

commit c722d57604db58695140d95565a78433989fe9ca Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Apr 12 15:44:40 2019 +0000 Bug 1542309 - Set firstPartyDomain to public suffix if getBaseDomain fails. r=baku Right now the firstPartyDomain is not set when host is in the public suffix list. The patch fixes it by setting firstPartyDomain to eTLD.getPublicSuffix in these cases. Differential Revision: https://phabricator.services.mozilla.com/D26767 --HG-- extra : moz-landing-system : lando --- caps/OriginAttributes.cpp | 11 +++++++++++ caps/tests/gtest/TestOriginAttributes.cpp | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/caps/OriginAttributes.cpp b/caps/OriginAttributes.cpp index 8a501f18010c..7dc79e7c1b9a 100644 --- a/caps/OriginAttributes.cpp +++ b/caps/OriginAttributes.cpp @@ -78,6 +78,8 @@ void OriginAttributes::SetFirstPartyDomain(const bool aIsTopLevelDocument, return; } + // Saving isInsufficientDomainLevels before rv is overwritten. + bool isInsufficientDomainLevels = (rv == NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS); nsAutoCString scheme; rv = aURI->GetScheme(scheme); NS_ENSURE_SUCCESS_VOID(rv); @@ -96,6 +98,15 @@ void OriginAttributes::SetFirstPartyDomain(const bool aIsTopLevelDocument, } } } + + if (isInsufficientDomainLevels) { + nsAutoCString publicSuffix; + rv = tldService->GetPublicSuffix(aURI, publicSuffix); + if (NS_SUCCEEDED(rv)) { + mFirstPartyDomain = NS_ConvertUTF8toUTF16(publicSuffix); + } + return; + } } void OriginAttributes::SetFirstPartyDomain(const bool aIsTopLevelDocument, diff --git a/caps/tests/gtest/TestOriginAttributes.cpp b/caps/tests/gtest/TestOriginAttributes.cpp index ffa4349939e4..12090bbbf1a5 100644 --- a/caps/tests/gtest/TestOriginAttributes.cpp +++ b/caps/tests/gtest/TestOriginAttributes.cpp @@ -3,8 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "gtest/gtest.h" #include "mozilla/BasePrincipal.h" +#include "mozilla/Preferences.h" +#include "nsNetUtil.h" using mozilla::OriginAttributes; +using mozilla::Preferences; static void TestSuffix(const OriginAttributes& attrs) { nsAutoCString suffix; @@ -17,6 +20,14 @@ static void TestSuffix(const OriginAttributes& attrs) { EXPECT_EQ(attrs, attrsFromSuffix); } +static void TestFPD(const nsAString &spec, const nsAString &fpd) { + OriginAttributes attrs; + nsCOMPtr<nsIURI> url; + ASSERT_EQ(NS_NewURI(getter_AddRefs(url), spec), NS_OK); + attrs.SetFirstPartyDomain(true, url); + EXPECT_TRUE(attrs.mFirstPartyDomain.Equals(fpd)); +} + TEST(OriginAttributes, Suffix_default) { OriginAttributes attrs; TestSuffix(attrs); @@ -31,3 +42,20 @@ TEST(OriginAttributes, Suffix_maxAppId_inIsolatedMozBrowser) { OriginAttributes attrs(4294967295, true); TestSuffix(attrs); } + +TEST(OriginAttributes, FirstPartyDomain_default) { + static const char prefKey[] = "privacy.firstparty.isolate"; + bool oldPref = Preferences::GetBool(prefKey); + Preferences::SetBool(prefKey, true); + TestFPD(NS_LITERAL_STRING("http://www.example.com"), + NS_LITERAL_STRING("example.com")); + TestFPD(NS_LITERAL_STRING("http://s3.amazonaws.com"), + NS_LITERAL_STRING("s3.amazonaws.com")); + TestFPD(NS_LITERAL_STRING("http://com"), NS_LITERAL_STRING("com")); + TestFPD(NS_LITERAL_STRING("http://.com"), NS_LITERAL_STRING("")); + TestFPD(NS_LITERAL_STRING("http://..com"), NS_LITERAL_STRING("")); + TestFPD(NS_LITERAL_STRING("http://127.0.0.1"), + NS_LITERAL_STRING("127.0.0.1")); + TestFPD(NS_LITERAL_STRING("http://[::1]"), NS_LITERAL_STRING("[::1]")); + Preferences::SetBool(prefKey, oldPref); +}

1 0

[torbutton/master] Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate
by gk＠torproject.org 23 Apr '19

23 Apr '19

commit 053c98697a4b00171a31e86399137ecb6f47ddfc Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Apr 15 11:34:27 2019 +0200 Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate --- src/chrome/content/torbutton.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6ea51190..74d83734 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -141,15 +141,6 @@ var torbutton_unique_pref_observer = if (topic != "nsPref:changed") return; switch (data) { - case "network.cookie.cookieBehavior": - let val = m_tb_prefs.getIntPref("network.cookie.cookieBehavior"); - let firstparty_isolate = m_tb_prefs.getBoolPref("privacy.firstparty.isolate"); - if (val == 0 && firstparty_isolate) // Allow all cookies - m_tb_prefs.setBoolPref("privacy.firstparty.isolate", false); - else if (val == 1 && !firstparty_isolate) // Block third party cookies - m_tb_prefs.setBoolPref("privacy.firstparty.isolate", true); - break; - case "plugin.disable": torbutton_toggle_plugins( m_tb_prefs.getBoolPref("plugin.disable")); @@ -1587,12 +1578,6 @@ function torbutton_update_fingerprinting_prefs() { function torbutton_update_isolation_prefs() { let isolate = m_tb_prefs.getBoolPref("privacy.firstparty.isolate"); - if (isolate) { - m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 1); - } else { - m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0); - } - m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate); // Force prefs to be synced to disk

1 0

[tor-browser-build/master] Bug 30241: bump snowflake version to d11e55aabe
by boklm＠torproject.org 18 Apr '19

18 Apr '19

commit 2bb302e119da53c81297e66ca36de0b599f4f7fa Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Apr 18 20:16:04 2019 +0000 Bug 30241: bump snowflake version to d11e55aabe --- projects/snowflake/build | 3 +++ projects/snowflake/config | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 777d360..daeb185 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -31,6 +31,9 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" +ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" + cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the diff --git a/projects/snowflake/config b/projects/snowflake/config index 7043c12..2165f80 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 6077141f4affdab9b7ce97a9b1c6859825eaaa29 +git_hash: d11e55aabe3753dbddca18ae084c80ad09e282d3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Fix typos is Changelog
by boklm＠torproject.org 17 Apr '19

17 Apr '19

commit 06b52563c20d5322843b4dbf1d711e382f389bc1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 17 08:34:57 2019 +0200 Fix typos is Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c7ec712..f49c142 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 8.5a11 -- April 16 2019 * Bug 26498: Add locale: es-AR * Bug 29973: Remove remaining stopOpenSecuritySettingsObserver() pieces * Translations update - * Update NoScript to 10.6.1 XXX + * Update NoScript to 10.6.1 * Bug 29872: XSS popup with DuckDuckGo search on about:tor * Bug 29916: Make sure enterprise policies are disabled * Bug 26498: Add locale: es-AR @@ -41,7 +41,7 @@ Tor Browser 8.5a11 -- April 16 2019 * Bug 25623: Disable network during build * Linux * Bug 29966: Use archive.debian.org for Wheezy images - * Android: + * Android * Bug 30089: Use apksigner instead of jarsigner Tor Browser 8.5a10 -- March 24 2019

1 0

[tor-browser-build/master] Release preparations for 8.5a11
by gk＠torproject.org 12 Apr '19

12 Apr '19

commit 599971d072818ea9a56bd5aba76fb121bcb00aca Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 12 08:53:08 2019 +0000 Release preparations for 8.5a11 Versions bump and Changelog update --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 46 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 +-- 7 files changed, 54 insertions(+), 9 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 61d4dbd..395714d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 46651a3..c7ec712 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,49 @@ +Tor Browser 8.5a11 -- April 16 2019 + * All platforms + * Update Torbutton to 2.1.6 + * Bug 22538+22513: Fix new circuit button for error pages + * Bug 29825: Intelligently add new Security Level button to taskbar + * Bug 29903: No WebGL click-to-play on the standard security level + * Bug 27484: Improve navigation within onboarding (strings) + * Bug 29768: Introduce new features to users (strings) + * Bug 29943: Use locales in AB-CD scheme to match Mozilla + * Bug 26498: Add locale: es-AR + * Bug 29973: Remove remaining stopOpenSecuritySettingsObserver() pieces + * Translations update + * Update NoScript to 10.6.1 XXX + * Bug 29872: XSS popup with DuckDuckGo search on about:tor + * Bug 29916: Make sure enterprise policies are disabled + * Bug 26498: Add locale: es-AR + * Windows + OS X + Linux + * Update Tor to 0.4.0.4-rc + * Update Tor Launcher to 0.2.18.2 + * Bug 26498: Add locale es-AR + * Translations update + * Bug 29768: Introduce new features to users + * Bug 27484: Improve navigation within onboarding + * Bug 25658: Improve toolbar layout for new security settings + * Windows + * Bug 27503: Improve screen reader accessibility + * Android + * Bug 27609 (and child bugs): Use Tor Onion Proxy Library + * Bug 29312: Bump Tor to 0.3.5.8 + * Bug 29859: Disable HLS support for now + * Bug 28622: Update Tor Browser icon for mobile + * Bug 29238: Prevent crash on Android after update + * Bug 29982: Add additional safe guards against crashes during bootstrap + * Bug 29906: Fix crash on older devices due to missing API + * Bug 29858: Load onboarding panels after bootstrapping is done + * Bug 28329: Improve bootstrapping experience + * Bug 30016: Localize bootstrap-/bridge-related strings for mobile + * Build System + * All platforms + * Bug 29868: Fix installation of python-future package + * Bug 25623: Disable network during build + * Linux + * Bug 29966: Use archive.debian.org for Wheezy images + * Android: + * Bug 30089: Use apksigner instead of jarsigner + Tor Browser 8.5a10 -- March 24 2019 * All platforms * Update Firefox to 60.6.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c14b9d7..e8c0b23 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -91,9 +91,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e + sha256sum: b15047d0045d12f28b2e1e444bdb86800257b5ca6cc8f4c8022b20c550cd9727 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 600b048..151f836 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.18.1 +version: 0.2.18.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 9eb4c16..3e7c45f 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.0.2-alpha +version: 0.4.0.4-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index a834417..5f3bbce 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.5 +version: 2.1.6 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 89f6eaf..a3482ac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a10' + torbrowser_version: '8.5a11' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a8 - - 8.5a9 + - 8.5a10 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0