- tbb-commits - lists.torproject.org

[tor-launcher/master] Merge remote-tracking branch 'richardgl/27476_rev2'
by sysrqb＠torproject.org 12 May '21

12 May '21

commit c366446e5eebb9e8acedae7ccef558dc541aedec Merge: f3cfdde e5b0e02 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed May 12 20:33:27 2021 +0000 Merge remote-tracking branch 'richardgl/27476_rev2' src/chrome/locale/en-US/network-settings.dtd | 9 +++++++++ src/chrome/locale/en-US/torlauncher.properties | 2 ++ src/components/tl-process.js | 6 +++++- src/modules/tl-util.jsm | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-)

1 0

[tor-launcher/master] Bug 27476: about:torconnect fixes and new strings
by sysrqb＠torproject.org 12 May '21

12 May '21

commit e5b0e027aa8879e6971b6afb75023a0b9e13c3bb Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Feb 15 16:21:26 2021 +0100 Bug 27476: about:torconnect fixes and new strings - torlauncher.properties::torlauncher.copiedNLogMessagesShort : reduced verbosity version of torlauncher.copiednLogMessages for Copy Log button tooltip - network-settings.dtd::torConnect.copyLog : label for 'Copy Log' button in about:torconnect - added various new strings for about:torconnect to en_US network-settings.dtd - disables legacy launcher unless "TOR_USE_LEGACY_LAUNCHER" environet variable is defined --- src/chrome/locale/en-US/network-settings.dtd | 9 +++++++++ src/chrome/locale/en-US/torlauncher.properties | 2 ++ src/components/tl-process.js | 6 +++++- src/modules/tl-util.jsm | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index d4c7def..81163a1 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -81,3 +81,12 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs…"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torConnect.tryAgain "Try Connecting Again"> +<!ENTITY torConnect.offline "Offline"> +<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect to the Tor Network"> +<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> +<!ENTITY torConnect.connectingConcise "Connecting…"> +<!ENTITY torConnect.connectedConcise "Connected"> +<!ENTITY torConnect.copyLog "Copy Tor Logs"> diff --git a/src/chrome/locale/en-US/torlauncher.properties b/src/chrome/locale/en-US/torlauncher.properties index 6ec8c40..7787698 100644 --- a/src/chrome/locale/en-US/torlauncher.properties +++ b/src/chrome/locale/en-US/torlauncher.properties @@ -93,3 +93,5 @@ torlauncher.bootstrapWarning.pt_missing=missing pluggable transport torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. + +torlauncher.copiedNLogMessages=Copied %S Logs diff --git a/src/components/tl-process.js b/src/components/tl-process.js index e9d7cde..a4374f9 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -583,6 +583,10 @@ TorProcessService.prototype = if (aIsRunningTor) this._monitorTorProcessStartup(); + if (!TorLauncherUtil.useLegacyLauncher) { + return; + } + var bridgeConfigIsBad = (this._defaultBridgesStatus == this.kDefaultBridgesStatus_BadConfig); if (TorLauncherUtil.shouldShowNetworkSettings || bridgeConfigIsBad) @@ -814,7 +818,7 @@ TorProcessService.prototype = this.mObsSvc.notifyObservers(errorObj, aNotifyTopic, null); } - if (!errorObj.handled) + if (TorLauncherUtil.useLegacyLauncher && !errorObj.handled) { let msg = aMessage; if (aDetails) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index b721372..76cdb5b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -366,6 +366,17 @@ let TorLauncherUtil = // Public return this.getBoolPref(kPrefPromptForLocale, true); */ }, + get useLegacyLauncher() { + const kEnvUseLegacyLauncher = "TOR_USE_LEGACY_LAUNCHER"; + const env = Cc["@mozilla.org/process/environment;1"].getService( + Ci.nsIEnvironment + ); + if (env.exists(kEnvUseLegacyLauncher)) { + return "1" == env.get(kEnvUseLegacyLauncher); + } + return false; + }, + get shouldShowNetworkSettings() { const kPrefPromptAtStartup = "extensions.torlauncher.prompt_at_startup"; @@ -379,6 +390,10 @@ let TorLauncherUtil = // Public return ("1" == env.get(kEnvForceShowNetConfig)); } catch(e) {} + if (!TorLauncherUtil.useLegacyLauncher) { + return true; + } + return this.getBoolPref(kPrefPromptAtStartup, true); },

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-89.0.0b5-10.5-1
by Matthew Finkel (＠sysrqb) 12 May '21

12 May '21

Matthew Finkel pushed new branch tor-browser-89.0.0b5-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[torbutton/master] Bug 40035: Localize Cryptocurrency Safety messages
by sysrqb＠torproject.org 12 May '21

12 May '21

commit a83f09e9208d4e2ea7a7a0c5f87fdac36a551309 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 3 14:14:37 2021 +0000 Bug 40035: Localize Cryptocurrency Safety messages --- chrome/locale/en-US/torbutton.properties | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 632605f7..4c153158 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -138,3 +138,13 @@ onionLocation.always=Always onionLocation.askEverytime=Ask every time onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=Onion Services + +# LOCALIZATION NOTE: %S will be replaced with the crytocurrency address. +cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. +cryptoSafetyPrompt.whatCanHeading=What can you do about it? +cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. +cryptoSafetyPrompt.learnMore=Learn more +cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit +cryptoSafetyPrompt.primaryActionAccessKey=R +cryptoSafetyPrompt.secondaryAction=Dismiss Warning +cryptoSafetyPrompt.secondaryActionAccessKey=B

1 0

[Git][tpo/applications/android-components][android-components-75.0.11-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel (＠sysrqb) 12 May '21

12 May '21

Matthew Finkel pushed to branch android-components-75.0.11-10.5-1 at The Tor Project / Applications / android-components Commits: f7375e03 by Matthew Finkel at 2021-05-12T17:02:11+02:00 Bug 40005: Modify Default toolbar menu - - - - - 62749239 by Alex Catarineu at 2021-05-12T17:02:24+02:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 17041b07 by Alex Catarineu at 2021-05-12T17:02:25+02:00 Bug 40002: Ensure system download manager is not used - - - - - bd25d30f by Alex Catarineu at 2021-05-12T17:02:27+02:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - fa24608e by Alex Catarineu at 2021-05-12T17:02:29+02:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - 92445e0f by Georg Koppen at 2021-05-12T17:02:30+02:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 9d43e371 by Alex Catarineu at 2021-05-12T17:02:32+02:00 Bug 40015: Port padlock states for .onion services - - - - - d90206b2 by Alex Catarineu at 2021-05-12T17:02:34+02:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - ebf4d5ce by Alex Catarineu at 2021-05-12T17:02:35+02:00 Bug 40022: Migrate Tor security level from Fennec - - - - - e5e4e2c3 by Matthew Finkel at 2021-05-12T17:02:37+02:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - ef982296 by Matthew Finkel at 2021-05-12T17:02:39+02:00 Bug 40023: Stop PrivateNotificationService - - - - - 24912519 by Matthew Finkel at 2021-05-12T17:02:41+02:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40296: Enable link_input_files in projects/release/config
by gk＠torproject.org 12 May '21

12 May '21

commit 2bf6670f3b5e34b3248ac36f79e2240f83069910 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 10 14:36:51 2021 +0200 Bug 40296: Enable link_input_files in projects/release/config --- projects/release/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/config b/projects/release/config index 8e0aebe..8c2974a 100644 --- a/projects/release/config +++ b/projects/release/config @@ -1,6 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' output_dir: release +link_input_files: 1 var: signed_status: unsigned

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-75.0.11-10.5-1
by boklm (＠boklm) 12 May '21

12 May '21

boklm pushed new branch android-components-75.0.11-10.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40289: Make the list of components updates for switch to mozilla89-based Fenix
by sysrqb＠torproject.org 11 May '21

11 May '21

commit 122aa939d2de4c6f18fd13c7dae1aef5eda1305f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 28 10:45:21 2021 +0200 Bug 40289: Make the list of components updates for switch to mozilla89-based Fenix --- projects/android-components/config | 6 +++--- projects/fenix/config | 6 +++--- projects/geckoview/config | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 998ffe1..3b709a6 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -57,9 +57,9 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v74.0.6 - #tag_gpg_id: 0 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v75.0.11 + tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/fenix/config b/projects/fenix/config index ce140c6..9a54715 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -55,9 +55,9 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v88.0.0-beta.4 - #tag_gpg_id: 0 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v89.0.0-beta.5 + tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/config b/projects/geckoview/config index 817a844..a48631b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,10 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 88.0b8 - #git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf - #tag_gpg_id: 0 + git_url: https://github.com/mozilla/gecko-dev.git + # 89.0b10 + git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + tag_gpg_id: 0 input_files: [] var: container:

1 0

[tor-browser-build/master] Pick up fix for rbm#40025
by gk＠torproject.org 10 May '21

10 May '21

commit caaa3bea22d77de1cca6d244bba33c6d6671a74a Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 10 08:51:06 2021 +0000 Pick up fix for rbm#40025 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index b7f534d..c700693 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b7f534d6bdbaba7ee83fdf8d7068ec349470e8c7 +Subproject commit c700693be807efa2a1f944798a49edf021087cdf

1 0

[rbm/master] Bug 40025: Use hard link to prepare input_files
by gk＠torproject.org 10 May '21

10 May '21

commit c700693be807efa2a1f944798a49edf021087cdf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 23 15:45:17 2021 +0200 Bug 40025: Use hard link to prepare input_files When using remote_exec, we collect input_files in a temporary directory, before copying them to the "remote" (for example a container). As we don't normally modify the files inside this temporary directory, it is safe to use hard link rather than copies of the files. When remote_exec is not used, we don't use hard links by default, but link_input_files can be set to 1 to use hard links. --- doc/rbm_config.asc | 9 +++++++++ doc/rbm_remote.asc | 4 +++- lib/RBM.pm | 15 ++++++++++----- lib/RBM/DefaultConfig.pm | 1 + 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 4c65a73..eaec60f 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -232,6 +232,15 @@ input_files_paths:: current project and its dependencies. This is useful when cleaning old build files, to find which ones are still used. +link_input_files:: + When building a project, input files are collected in a + temporary directory. If this option is set to 1, we try to use + hard links instead of copies. You should only enable this if + you don't modify the input files during the build, or if you + are using +remote_exec+ (in which case the temporary directory + is only used to copy files to the remote). This option is + disabled by default, unless +remote_exec+ is used. + timestamp:: This is the UNIX timestamp, set as modification time on files created such as the sources tarball. The default is to use the diff --git a/doc/rbm_remote.asc b/doc/rbm_remote.asc index 81de98f..7f4c3d8 100644 --- a/doc/rbm_remote.asc +++ b/doc/rbm_remote.asc @@ -46,7 +46,9 @@ remote_start:: we can access it. This can be useful for instance if you need to start a VM, or fetch a container. If access to an input file is needed, the +remote_srcdir+ option is pointing to a temporary - directory containing the input files. + directory containing the input files. The input files are hard + links to their original location, if it is on the same + filesystem, and +link_input_files+ has not been set to 0. remote_finish:: the template of a command that will stop the remote host after diff --git a/lib/RBM.pm b/lib/RBM.pm index bc509cb..b93488f 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -766,7 +766,10 @@ sub input_file_id { } sub recursive_copy { - my ($fname, $name, $dest_dir) = @_; + my ($fname, $name, $dest_dir, $action) = @_; + if (-f $fname && $action eq 'link') { + return ($name) if link $fname, "$dest_dir/$name"; + } if (-f $fname || -l $fname) { fcopy($fname, "$dest_dir/$name"); return ($name); @@ -774,7 +777,7 @@ sub recursive_copy { my @copied; mkdir "$dest_dir/$name"; foreach my $f (map { $_->basename } path($fname)->children) { - push @copied, recursive_copy("$fname/$f", "$name/$f", $dest_dir); + push @copied, recursive_copy("$fname/$f", "$name/$f", $dest_dir, $action); } return @copied; } @@ -978,12 +981,12 @@ sub input_files { my $file_type = -d $fname ? 'directory' : 'file'; print "Using $file_type $fname\n"; mkdir dirname("$dest_dir/$name"); - push @res_copy, recursive_copy($fname, $name, $dest_dir); + push @res_copy, recursive_copy($fname, $name, $dest_dir, $action); } chdir $old_cwd; RETURN_RES: return sha256_hex($input_files_id) if $action eq 'input_files_id'; - return @res_copy if $action eq 'copy'; + return @res_copy if ($action eq 'copy' || $action eq 'link'); return \%res_getfnames if $action eq 'getfnames'; return \@res_getfpaths if $action eq 'getfpaths'; } @@ -1034,7 +1037,9 @@ sub build_run { my $srcdir = $tmpdir->dirname; my @cfiles; push @cfiles, copy_files($project, $srcdir); - push @cfiles, input_files('copy', $project, $options, $srcdir); + my $if_action = project_config($project, 'link_input_files', $options) ? + 'link' : 'copy'; + push @cfiles, input_files($if_action, $project, $options, $srcdir); my $tarfile = maketar($project, $options, $srcdir); push @cfiles, $tarfile if $tarfile; my ($remote_tmp_src, $remote_tmp_dst, %build_script); diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index c19d160..408044e 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -444,6 +444,7 @@ ZIP_END input_files_by_name => sub { RBM::input_files('getfnames', @_); }, input_files_id => sub { RBM::input_files('input_files_id', @_); }, input_files_paths => sub { RBM::input_files('getfpaths', @_); }, + link_input_files => '[% IF c("remote_exec") %]1[% END %]', steps => { }, suexec => 'sudo -- [% c("suexec_cmd") %]',

1 0