- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 847ff5d3 by Pier Angelo Vendrame at 2023-01-12T14:17:24+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41569: Launch directly the real tor also on macOS, rather than the shim script Bug 41570: Do not customize environment variables for tor anymore - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.jsm - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.jsm ===================================== @@ -144,9 +144,10 @@ class TorFile { // Anyway, that macro is also available in AppConstants. if (TorFile.isUserDataOutsideOfAppDir) { if (TorLauncherUtil.isMac) { - torPath = "Contents/Resources/"; + torPath = "Contents/MacOS/Tor"; + } else { + torPath = "TorBrowser/Tor"; } - torPath += "TorBrowser/Tor"; } else { torPath = "Tor"; dataDir = "Data/"; @@ -154,17 +155,16 @@ class TorFile { switch (this.fileType) { case "tor": - if (TorLauncherUtil.isMac) { - this.path = `${torPath}/tor`; - } else { - this.path = - torPath + "/tor" + (TorLauncherUtil.isWindows ? ".exe" : ""); + this.path = `${torPath}/tor`; + if (TorLauncherUtil.isWindows) { + this.path += ".exe"; } break; case "torrc-defaults": - this.path = TorFile.isUserDataOutsideOfAppDir - ? `${torPath}/torrc-defaults` - : `${dataDir}Tor/torrc-defaults`; + this.path = TorLauncherUtil.isMac + ? "Contents/Resources/TorBrowser/Tor" + : `${dataDir}Tor`; + this.path += "/torrc-defaults"; break; case "torrc": this.path = `${dataDir}Tor/torrc`; ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -93,27 +93,6 @@ class TorProcess { this._args.push("1"); } - // Set an environment variable that points to the Tor data directory. - // This is used by meek-client-torbrowser to find the location for - // the meek browser profile. - const environment = { - TOR_BROWSER_TOR_DATA_DIR: this._dataDir.path, - }; - - // On Windows, prepend the Tor program directory to PATH. This is needed - // so that pluggable transports can find OpenSSL DLLs, etc. - // See https://trac.torproject.org/projects/tor/ticket/10845 - if (TorLauncherUtil.isWindows) { - let path = this._exeFile.parent.path; - const env = Cc["@mozilla.org/process/environment;1"].getService( - Ci.nsIEnvironment - ); - if (env.exists("PATH")) { - path += ";" + env.get("PATH"); - } - environment.PATH = path; - } - this._status = TorProcessStatus.Starting; this._didConnectToTorControlPort = false; @@ -131,10 +110,13 @@ class TorProcess { const options = { command: this._exeFile.path, arguments: this._args, - environment, - environmentAppend: true, stderr: "stdout", }; + if (TorLauncherUtil.isMac) { + // On macOS, we specify pluggable transport relative to the tor + // executable. + options.workdir = this._exeFile.parent.path; + } this._subprocess = await Subprocess.call(options); this._dumpStdout(); this._watchProcess(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/847ff5d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/847ff5d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40695: Do not ship the macOS tor shim anymore
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6da7839e by Pier Angelo Vendrame at 2023-01-12T14:14:50+01:00 Bug 40695: Do not ship the macOS tor shim anymore We moved the requested operations to Tor Browser side. - - - - - 2 changed files: - − projects/browser/Bundle-Data/mac-tor.sh - projects/browser/build Changes: ===================================== projects/browser/Bundle-Data/mac-tor.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/sh -# Compiled Python modules require a compatible Python, which means 32-bit 2.6. -export VERSIONER_PYTHON_VERSION=2.6 -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH -# Set the current working directory to the directory containing this executable, -# so that pluggable transport executables can be given with relative paths. This -# works around a change in OS X 10.9, where the current working directory is -# otherwise set to "/" when an application bundle is started from Finder.. -# https://trac.torproject.org/projects/tor/ticket/10030 -cd "$(dirname "$0")" -if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then - # On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.. - cd ../../../MacOS/Tor -fi -exec ./tor.real "$@" ===================================== projects/browser/build ===================================== @@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac - [% IF c("var/tor-browser") -%] - # Install a "tor" shim that sets the working directory. See #10030. - for tbdir in "${TBDIRS[@]}" - do - mv "$tbdir/$TORBINPATH/tor" "$tbdir/$TORBINPATH/tor.real" - cp Bundle-Data/mac-tor.sh "$tbdir/$TORCONFIGPATH/tor" - done - [% END -%] - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update `Release Prep - Stable`
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c027f7cb by Nicolas Vigier at 2023-01-12T13:10:42+01:00 Update `Release Prep - Stable` Following changes from tor-browser-build#40734 and tor-browser-build#40735 - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -131,10 +131,12 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation-base-browser/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] Update `projects/translation-base-browser-fluent/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-release` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch + - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch - [ ] ***(Optional)*** Update Android-specific build configs - [ ] ***(Optional)*** Update `projects/geckoview/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2ec04e75 by Dan Ballard at 2023-01-12T12:53:35+00:00 fixup! Firefox preference overrides. bug 40565: lock security.tls.version.enable-deprecated - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -83,6 +83,9 @@ pref("security.ssl3.ecdhe_rsa_aes_256_sha", false, locked); pref("security.ssl3.rsa_aes_128_sha", false, locked); pref("security.ssl3.rsa_aes_256_sha", false, locked); +// Wrapping a static pref to lock it and prevent changing. +// See tor-browser#40565. +pref("security.tls.version.enable-deprecated", false, locked); // Misc privacy: Remote pref("browser.send_pings", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2ec04e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2ec04e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40735: Add command to list which translation components need to be updated
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: fe869201 by Nicolas Vigier at 2023-01-12T13:00:48+01:00 Bug 40735: Add command to list which translation components need to be updated - - - - - 3 changed files: - Makefile - projects/translation/config - − tools/get-translation-hashes Changes: ===================================== Makefile ===================================== @@ -223,6 +223,12 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 ===================================== projects/translation/config ===================================== @@ -30,3 +30,17 @@ steps: targets: nightly: git_hash: 'fenix-torbrowserstringsxml' + list_updates: + list_updates: | + [% + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); + commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); + IF commit_hash == pc(project, "git_hash", { step => component }); + GET '* ' _ component _ " is up to date\n"; + ELSE; + GET '* ' _ component _ ' can be updated: ' _ commit_hash _ "\n"; + END; + END; + -%] + fetch: 1 ===================================== tools/get-translation-hashes deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")/../git_clones/translation" -git fetch > /dev/null 2>&1 - -echo -n "base-browser: " -git rev-parse origin/base-browser -echo -n "base-browser-fluent: " -git rev-parse origin/basebrowser-newidentityftl -echo -n "tor-browser: " -git rev-parse origin/tor-browser -echo -n "fenix: " -git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40735: Add command to list which translation components need to be updated
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eda7d2c8 by Nicolas Vigier at 2023-01-12T12:29:55+01:00 Bug 40735: Add command to list which translation components need to be updated - - - - - 4 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - Makefile - projects/translation/config - − tools/get-translation-hashes Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -121,7 +121,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - [ ] Update `projects/translation/config`: - - [ ] run `tools/get-translation-hashes` to get updated hashes + - [ ] run `make list_translation_updates-alpha` to get updated hashes - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch ===================================== Makefile ===================================== @@ -223,6 +223,12 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 ===================================== projects/translation/config ===================================== @@ -30,3 +30,17 @@ steps: targets: nightly: git_hash: 'fenix-torbrowserstringsxml' + list_updates: + list_updates: | + [% + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); + commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); + IF commit_hash == pc(project, "git_hash", { step => component }); + GET '* ' _ component _ " is up to date\n"; + ELSE; + GET '* ' _ component _ ' can be updated: ' _ commit_hash _ "\n"; + END; + END; + -%] + fetch: 1 ===================================== tools/get-translation-hashes deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")/../git_clones/translation" -git fetch > /dev/null 2>&1 - -echo -n "base-browser: " -git rev-parse origin/base-browser -echo -n "base-browser-fluent: " -git rev-parse origin/basebrowser-newidentityftl -echo -n "tor-browser: " -git rev-parse origin/tor-browser -echo -n "fenix: " -git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40713: Inject torbutton translations during the build
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 68b589f8 by Pier Angelo Vendrame at 2023-01-12T08:53:32+01:00 Bug 40713: Inject torbutton translations during the build Co-authored-by: Nicolas Vigier <boklm(a)torproject.org> - - - - - 12 changed files: - projects/fenix/build - projects/fenix/config - projects/firefox/build - projects/firefox/config - − projects/tba-translation/config - − projects/translation-base-browser-fluent/build - − projects/translation-base-browser-fluent/config - − projects/translation-base-browser/build - − projects/translation-base-browser/config - projects/tba-translation/build → projects/translation/build - + projects/translation/config - + tools/get-translation-hashes Changes: ===================================== projects/fenix/build ===================================== @@ -32,7 +32,7 @@ EOF nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus mkdir -p $nimbusdir cp $distdir/application-services/nimbus-fml $nimbusdir/ - tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %] + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -60,7 +60,7 @@ v=[% c("variant") %] [% FOREACH lang = c('var/locales_mobile'); SET lang = tmpl(lang); %] # Copy our torbrowser_strings.xml at the right place - cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ + cp /var/tmp/dist/translation-fenix/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ [% END %] # Prepare Glean dependencies for offline build ===================================== projects/fenix/config ===================================== @@ -46,8 +46,9 @@ input_files: project: geckoview pkg_type: merge_aars enable: '[% !c("var/android_single_arch") %]' - - name: tba-translation - project: tba-translation + - name: translation-fenix + project: translation + pkg_type: fenix - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/firefox/build ===================================== @@ -62,6 +62,10 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %] transl_base_browser=$rootdir/translation-base-browser +[% IF c("var/tor-browser") -%] + tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %] + transl_tor_browser=$rootdir/translation-tor-browser +[% END -%] cd /var/tmp/build/[% project %]-[% c("version") %] cat > .mozconfig << 'MOZCONFIG_EOF' @@ -108,11 +112,6 @@ add_translation () { component=$2 lang=$3 filename=$4 - [% IF c("var/macos") -%] - if [ "$lang" == "ja-JP-mac" ]; then - lang="ja" - fi - [% END-%] mkdir "browser/components/$component/locale/$lang" cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/" @@ -121,9 +120,25 @@ add_translation () { } supported_locales="[% tmpl(c('var/locales').join(' ')) %]" +[% IF c("var/tor-browser") -%] + torbutton_locales="toolkit/torbutton/chrome/locale/" + torbutton_jar="toolkit/torbutton/jar.mn" +[% END -%] for lang in $supported_locales; do + [% IF c("var/macos") -%] + if [ "$lang" == "ja-JP-mac" ]; then + lang="ja" + fi + [% END-%] + add_translation $transl_base_browser newidentity $lang newIdentity.properties add_translation $transl_base_browser securitylevel $lang securityLevel.properties + + [% IF c("var/tor-browser") -%] + mv "$transl_tor_browser/$lang" "$torbutton_locales/" + echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" + echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" + [% END -%] done rm -f configure ===================================== projects/firefox/config ===================================== @@ -181,11 +181,17 @@ input_files: enable: '[% c("var/linux") %]' - filename: start-firefox enable: '[% c("var/linux") %]' - - project: translation-base-browser + - project: translation name: translation-base-browser - - project: translation-base-browser-fluent + pkg_type: base-browser + - project: translation name: translation-base-browser-fluent + pkg_type: base-browser-fluent enable: '[% !c("var/testbuild") %]' + - project: translation + name: translation-tor-browser + pkg_type: tor-browser + enable: '[% c("var/tor-browser") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin ===================================== projects/tba-translation/config deleted ===================================== @@ -1,7 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -# We need to bump the commit before releasing but just pointing to a branch -# might cause too much rebuidling of the Firefox part. -git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35 -version: '[% c("abbrev") %]' ===================================== projects/translation-base-browser-fluent/build deleted ===================================== @@ -1,10 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -# We do not need new identity for now, only languageNotification.ftl -find [% project %] -name new-identity.ftl -delete -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser-fluent/config deleted ===================================== @@ -1,9 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: e1bb5278668e71317ccbf1fdd21cf25c4d56b95c -version: '[% c("abbrev") %]' - -targets: - nightly: - git_hash: 'basebrowser-newidentityftl' ===================================== projects/translation-base-browser/build deleted ===================================== @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser/config deleted ===================================== @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc -version: '[% c("abbrev") %]' ===================================== projects/tba-translation/build → projects/translation/build ===================================== @@ -1,8 +1,9 @@ #!/bin/bash [% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] +mv [% project %]-[% c("version") %] [% project %]-[% c("step") %] +[% SET tar_source = project _ '-' _ c('step') -%] [% c('tar', { - tar_src => [ project ], + tar_src => [ tar_source ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), }) %] ===================================== projects/translation/config ===================================== @@ -0,0 +1,32 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("step") %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +git_url: https://gitlab.torproject.org/tpo/translation.git +version: '[% c("abbrev") %]' + +steps: + base-browser: + base-browser: '[% INCLUDE build %]' + git_hash: d1aa584f3da4c2fc6bfe5d289e2783705ee7e015 + targets: + nightly: + git_hash: 'base-browser' + base-browser-fluent: + base-browser-fluent: '[% INCLUDE build %]' + git_hash: d771fd689978f52053e8a14bb622c936aa938769 + targets: + nightly: + git_hash: 'basebrowser-newidentityftl' + tor-browser: + tor-browser: '[% INCLUDE build %]' + git_hash: a73ed9756f5d9a753fb7c3c7676174e4d9b68dee + targets: + nightly: + git_hash: 'tor-browser' + fenix: + fenix: '[% INCLUDE build %]' + # We need to bump the commit before releasing but just pointing to a branch + # might cause too much rebuidling of the Firefox part. + git_hash: 5e1d058123f3a5d34a59799bd6f80db5d71e563e + targets: + nightly: + git_hash: 'fenix-torbrowserstringsxml' ===================================== tools/get-translation-hashes ===================================== @@ -0,0 +1,13 @@ +#!/bin/bash + +cd "$(dirname "$0")/../git_clones/translation" +git fetch > /dev/null 2>&1 + +echo -n "base-browser: " +git rev-parse origin/base-browser +echo -n "base-browser-fluent: " +git rev-parse origin/basebrowser-newidentityftl +echo -n "tor-browser: " +git rev-parse origin/tor-browser +echo -n "fenix: " +git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40733: Use the new branding directories
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 49af2a8d by Pier Angelo Vendrame at 2023-01-11T12:02:45+01:00 Bug 40733: Use the new branding directories In tor-browser#41428 we decided not to change contents of Firefox branding directories anymore, but to create ours. This commit updates the build files to use the new branding directories. - - - - - 1 changed file: - projects/firefox/config Changes: ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.5-1' browser_build: 1 - branding_directory: 'browser/branding/alpha' + branding_directory: 'browser/branding/tb-alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' deps: @@ -67,13 +67,13 @@ targets: release: var: - branding_directory: 'browser/branding/official' + branding_directory: 'browser/branding/tb-release' nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 var: - branding_directory: 'browser/branding/nightly' + branding_directory: 'browser/branding/tb-nightly' linux-x86_64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_102_7_0esr_BUILD1
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

Richard Pospesel pushed new tag FIREFOX_102_7_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.7.0esr-12.0-1
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

Richard Pospesel pushed new branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] 3 commits: fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: fb0ac5b2 by Pier Angelo Vendrame at 2023-01-11T19:03:00+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41428: Do not change Firefox branding, but create Tor Browser's branding directories. This commit restores the original Firefox branding files. - - - - - 74b66022 by Pier Angelo Vendrame at 2023-01-11T19:03:09+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41428: Do not change Firefox branding, but create Tor Browser's branding directories. This commit adds the new files for Tor Browser release and nightly. Then it renames alpha to tb-alpha and cleans unused files. - - - - - af8d56a3 by Pier Angelo Vendrame at 2023-01-11T19:03:10+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41428: Use Tor Browser's branding directory for dev builds - - - - - 30 changed files: - − browser/branding/alpha/background.png - − browser/branding/alpha/bgstub.jpg - − browser/branding/alpha/bgstub_2x.jpg - − browser/branding/alpha/branding.nsi - − browser/branding/alpha/content/aboutlogins.svg - − browser/branding/alpha/default512.png - − browser/branding/alpha/disk.icns - − browser/branding/alpha/dsstore - − browser/branding/alpha/firefox64.ico - − browser/branding/alpha/stubinstaller/bgstub.jpg - − browser/branding/alpha/stubinstaller/installing_page.css - − browser/branding/alpha/stubinstaller/profile_cleanup_page.css - − browser/branding/alpha/wizHeader.bmp - − browser/branding/alpha/wizHeaderRTL.bmp - − browser/branding/alpha/wizWatermark.bmp - browser/branding/branding-common.mozbuild - browser/branding/nightly/VisualElements_150.png - browser/branding/nightly/VisualElements_70.png - browser/branding/nightly/configure.sh - browser/branding/nightly/content/jar.mn - browser/branding/nightly/default128.png - browser/branding/nightly/default16.png - browser/branding/nightly/default22.png - browser/branding/nightly/default24.png - browser/branding/nightly/default256.png - browser/branding/nightly/default32.png - browser/branding/nightly/default48.png - − browser/branding/nightly/default512.png - browser/branding/nightly/default64.png - browser/branding/nightly/document.icns The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/84e066… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/84e066… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 11 commits: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 83bd811c by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Removed the torbutton submodule - - - - - 465fc665 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Checked out toolkit/torbutton/ from dbaaa5df. - - - - - 1a3dda31 by Alex Catarineu at 2023-01-11T17:55:35+00:00 fixup! Add TorStrings module for localization Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Cherry-picked the new TorStrings commit. - - - - - 750d8085 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Add TorStrings module for localization Bug 41563: Fix old placeholders in TorStrings.jsm - - - - - 9b8cdc2c by hackademix at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41561: fix maximize warning notifications. - - - - - 67d5b272 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 Revert "Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore" This reverts commit 8825bcad66f9ad96c29258cc57bfdb92a6437b1b. - - - - - 556068cd by hackademix at 2023-01-11T17:55:35+00:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop - - - - - 3b425ef2 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Changed placeholders for strings as we switched from dtd to .properties. - - - - - 3203dab0 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Changed placeholders for strings as we switched from dtd to .properties. - - - - - 7c6101a6 by Henry Wilkes at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Fixed a problem with linting - - - - - c0a310eb by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Restore crypto safety strings. - - - - - 30 changed files: - .gitmodules - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/moz.build - + toolkit/torbutton/CREDITS - + toolkit/torbutton/LICENSE - + toolkit/torbutton/chrome/content/aboutTor/aboutTor-content.js - + toolkit/torbutton/chrome/content/aboutTor/aboutTor.xhtml - + toolkit/torbutton/chrome/content/aboutTor/resources/aboutTor.js - + toolkit/torbutton/chrome/content/tor-circuit-display.js - + toolkit/torbutton/chrome/content/torbutton.js - + toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd - + toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd - + toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd - + toolkit/torbutton/chrome/locale/en-US/brand.dtd - + toolkit/torbutton/chrome/locale/en-US/brand.properties - + toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl - + toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties - + toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties - + toolkit/torbutton/chrome/locale/en-US/onboarding.properties - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/rulesets.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - + toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - + toolkit/torbutton/chrome/locale/en-US/torbutton.properties - + toolkit/torbutton/chrome/locale/en-US/torlauncher.properties - + toolkit/torbutton/chrome/skin/about-wordmark.png - + toolkit/torbutton/chrome/skin/aboutDialog.css The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/be0f1d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/be0f1d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 40209: Implement Basic Crypto Safety
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: be0f1dcb by Henry Wilkes at 2023-01-11T17:22:14+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41539: Remove all whitespace from copied text before testing if it looks like a crypto address. (cherry picked from commit 221b7a494351e853bae3aa4878573829e7f7015a) - - - - - 1 changed file: - browser/actors/CryptoSafetyChild.jsm Changes: ===================================== browser/actors/CryptoSafetyChild.jsm ===================================== @@ -74,7 +74,7 @@ class CryptoSafetyChild extends JSWindowActorChild { if (event.type == "copy" || event.type == "cut") { this.contentWindow.navigator.clipboard.readText().then(clipText => { - const selection = clipText.trim(); + const selection = clipText.replace(/\s+/g, ""); if (looksLikeCryptoAddress(selection)) { this.sendAsyncMessage("CryptoSafety:CopiedText", { selection, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/be0f1dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/be0f1dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 84e066a2 by hackademix at 2023-01-11T11:10:14+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 41560: fix turning off letterboxing causes content not rendering in the current window. - - - - - 2 changed files: - browser/base/content/browser.css - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/base/content/browser.css ===================================== @@ -111,7 +111,7 @@ body { outline: initial; } -:root:not([inDOMFullscreen]) .letterboxing-ready .browserStack:not(.exclude-letterboxing) { +:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserStack:not(.exclude-letterboxing) { place-content: start center; } ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -601,7 +601,7 @@ class _RFPHelper { _detachWindow(aWindow) { let tabBrowser = aWindow.gBrowser; tabBrowser.removeTabsProgressListener(this); - aWindow._rfpResizeObserver.disconnect(); + aWindow._rfpResizeObserver?.disconnect(); delete aWindow._rfpResizeObserver; aWindow.removeEventListener("TabOpen", this); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/84e066a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/84e066a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 60e9699e by Pier Angelo Vendrame at 2023-01-11T09:26:34+00:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41567: Do not customize MOZ_APP_BASENAME in Tor Browser. That variable renames a lot of "firefox"es to "torbrowser". It could be desirable, but it will break a lot of legacy, including links generated with the Windows installer. - - - - - 1 changed file: - browser/config/mozconfigs/tor-browser Changes: ===================================== browser/config/mozconfigs/tor-browser ===================================== @@ -1,6 +1,5 @@ . $topsrcdir/browser/config/mozconfigs/base-browser -export MOZ_APP_BASENAME="TorBrowser" mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60e9699… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60e9699… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 56d4c3f6 by hackademix at 2023-01-10T23:42:13+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41561: fix maximize warning notifications. - - - - - 1 changed file: - toolkit/torbutton/chrome/content/torbutton.js Changes: ===================================== toolkit/torbutton/chrome/content/torbutton.js ===================================== @@ -871,6 +871,13 @@ var torbutton_new_circuit; onLocationChange(aProgress, aRequest, aURI) {}, onStateChange(aProgress, aRequest, aFlag, aStatus) { if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { + window.promiseDocumentFlushed(() => { + // Here we're guaranteed to read the "final" (!) initial size, rather than [1, 1]. + torbutton_resizelistener.originalSize = { + width: window.outerWidth, + height: window.outerHeight, + }; + }); m_tb_resize_handler = async function() { // Wait for end of execution queue to ensure we have correct windowState. await new Promise(resolve => setTimeout(resolve, 0)); @@ -878,17 +885,18 @@ var torbutton_new_circuit; window.windowState === window.STATE_MAXIMIZED || window.windowState === window.STATE_FULLSCREEN ) { + const kRemainingWarnings = + "extensions.torbutton.maximize_warnings_remaining"; if ( - m_tb_prefs.getBoolPref( + Services.prefs.getBoolPref( "extensions.torbutton.resize_new_windows" ) && - m_tb_prefs.getIntPref( - "extensions.torbutton.maximize_warnings_remaining" - ) > 0 + Services.prefs.getIntPref(kRemainingWarnings) > 0 ) { // Do not add another notification if one is already showing. const kNotificationName = "torbutton-maximize-notification"; - let box = gBrowser.getNotificationBox(); + + const box = gNotificationBox; if (box.getNotificationWithValue(kNotificationName)) { return; } @@ -908,38 +916,53 @@ var torbutton_new_circuit; } // No need to get "OK" translated again. - let sbSvc = Services.strings; - let bundle = sbSvc.createBundle( + const bundle = Services.strings.createBundle( "chrome://global/locale/commonDialogs.properties" ); - let button_label = bundle.GetStringFromName("OK"); + + const decreaseWarningsCount = () => { + const currentCount = Services.prefs.getIntPref( + kRemainingWarnings + ); + if (currentCount > 0) { + Services.prefs.setIntPref( + kRemainingWarnings, + currentCount - 1 + ); + } + }; let buttons = [ { - label: button_label, + label: bundle.GetStringFromName("OK"), accessKey: "O", popup: null, callback() { - m_tb_prefs.setIntPref( - "extensions.torbutton.maximize_warnings_remaining", - m_tb_prefs.getIntPref( - "extensions.torbutton.maximize_warnings_remaining" - ) - 1 - ); + // reset notification timer to work-around resize race conditions + m_tb_resize_date = Date.now(); + // restore the original (rounded) size we had stored on window startup + let { originalSize } = torbutton_resizelistener; + window.resizeTo(originalSize.width, originalSize.height); }, }, ]; - let priority = box.PRIORITY_WARNING_LOW; - let message = torbutton_get_property_string( + const label = torbutton_get_property_string( "torbutton.maximize_warning" ); box.appendNotification( - message, kNotificationName, - null, - priority, + { + label, + priority: box.PRIORITY_WARNING_LOW, + eventCallback(event) { + if (event === "dismissed") { + // user manually dismissed the notification + decreaseWarningsCount(); + } + }, + }, buttons ); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56d4c3f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56d4c3f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.6.0esr-12.5-1] fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch base-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: cc5f2fcd by Pier Angelo Vendrame at 2023-01-10T19:59:42+00:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Bug 20497: Make it possible to disable portable mode 9173 is the patch that enables portable mode for Tor Browser. We modified it to make it optional, but it still used to remove a few important parts that made it compulsory to define a profile directory in the application.ini (through the mozconfig). This commit restores these parts, and makes it hopefully possible to disable portable mode without filling the home directory with TBB files. A few parts are then disabled in a following commit, since they are TBB-legacy behavior, but we might not want them for base-browser and for privacy-browser. Also, this commit changes the configure flag from --with-relative-profile-directory to --with-relative-data-dir, because the data directories can contain the profile and the local data such as caches, not only the profile. Still, we are assuming we are using the same data directory for the profile and for the caches, which is not the case on Windows (where the profile is roaming, and the caches are local) and on Linux (where the profile is in the home, and the cache is in ~/.cache). - - - - - 5 changed files: - browser/config/mozconfigs/base-browser - moz.configure - mozconfig-macos-x86_64 - toolkit/xre/nsXREDirProvider.cpp - xpcom/io/nsAppFileLocationProvider.cpp Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -42,4 +42,4 @@ if test -z "$WASI_SYSROOT"; then ac_add_options --without-wasm-sandboxed-libraries fi -ac_add_options --with-relative-profile=BaseBrowser/Data/Browser +ac_add_options --with-relative-data-dir=BaseBrowser/Data/Browser ===================================== moz.configure ===================================== @@ -1026,22 +1026,22 @@ set_define("BASE_BROWSER", True, when="--enable-base-browser") option( - "--with-relative-profile", + "--with-relative-data-dir", nargs=1, - help="Sets the directory of the profile, relative to the application directory" + help="Sets the data directories to be relative to the application directory" ) -@depends("--with-relative-profile", target) +@depends("--with-relative-data-dir", target) @imports("json") -def relative_profile(value, target): +def relative_data_dir(value, target): if value and target.os == "Android": - die("--with-relative-profile is not supported on Android") + die("--with-relative-data-dir is not supported on Android") if value: return json.dumps(value[0]) -set_define("RELATIVE_PROFILE_DIRECTORY", relative_profile) +set_define("RELATIVE_DATA_DIR", relative_data_dir) # Please do not add configure checks from here on. ===================================== mozconfig-macos-x86_64 ===================================== @@ -4,3 +4,6 @@ ac_add_options --enable-strip # See bug #41131 ac_add_options --disable-update-agent + +# For base-browser we do not enable portable mode on macOS. +ac_add_options --without-relative-data-dir ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -234,6 +234,9 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false); if (NS_SUCCEEDED(rv)) { +#if !defined(XP_UNIX) || defined(XP_MACOSX) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -249,6 +252,9 @@ nsresult nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true); if (NS_SUCCEEDED(rv)) { +#if !defined(XP_UNIX) || defined(XP_MACOSX) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -1332,14 +1338,14 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, return gDataDirHome->Clone(aFile); } -#if defined(RELATIVE_PROFILE_DIRECTORY) +#if defined(RELATIVE_DATA_DIR) RefPtr<nsXREDirProvider> singleton = GetSingleton(); if (!singleton) { return NS_ERROR_OUT_OF_MEMORY; } rv = singleton->GetAppRootDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); NS_ENSURE_SUCCESS(rv, rv); if (aLocal) { @@ -1502,7 +1508,7 @@ nsresult nsXREDirProvider::GetAppRootDir(nsIFile** aFile) { #endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); file = appRootDir; } return appRootDir->Clone(aFile); @@ -1559,8 +1565,13 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { } nsAutoCString profile; + nsAutoCString appName; + nsAutoCString vendor; if (gAppData->profile) { profile = gAppData->profile; + } else { + appName = gAppData->name; + vendor = gAppData->vendor; } nsresult rv = NS_OK; @@ -1568,12 +1579,27 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { #if defined(XP_MACOSX) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + // Note that MacOS ignores the vendor when creating the profile hierarchy - + // all application preferences directories live alongside one another in + // ~/Library/Application Support/ + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + rv = aFile->AppendNative(vendor); + NS_ENSURE_SUCCESS(rv, rv); + } + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); @@ -1585,21 +1611,48 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) + nsAutoCString folder; + // Make it hidden (by starting with "."), except when local (the + // profile is already under ~/.cache or XDG_CACHE_HOME). +# ifndef RELATIVE_DATA_DIR + if (!aLocal) folder.Assign('.'); +# endif + if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); while (*profileStart == '/' || *profileStart == '\\') profileStart++; +# ifndef RELATIVE_DATA_DIR // On the off chance that someone wanted their folder to be hidden don't // let it become ".." - if (*profileStart == '.') profileStart++; + if (*profileStart == '.' && !aLocal) profileStart++; +# endif - // Make it hidden (by starting with "."). - nsAutoCString folder("."); folder.Append(profileStart); ToLowerCase(folder); rv = AppendProfileString(aFile, folder.BeginReading()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + folder.Append(vendor); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + NS_ENSURE_SUCCESS(rv, rv); + + folder.Truncate(); + } + + // This can be the case in tests. + if (!appName.IsEmpty()) { + folder.Append(appName); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + } +# endif } NS_ENSURE_SUCCESS(rv, rv); ===================================== xpcom/io/nsAppFileLocationProvider.cpp ===================================== @@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; -#if defined(RELATIVE_PROFILE_DIRECTORY) +#if defined(RELATIVE_DATA_DIR) nsCOMPtr<nsIProperties> directoryService( do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); @@ -260,9 +260,9 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, rv = file->Normalize(); NS_ENSURE_SUCCESS(rv, rv); int levelsToRemove = 1; -#if defined(XP_MACOSX) +# if defined(XP_MACOSX) levelsToRemove += 2; -#endif +# endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); @@ -270,7 +270,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, } localDir = appRootDir; - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); NS_ENSURE_SUCCESS(rv, rv); @@ -318,6 +318,12 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, # error dont_know_how_to_get_product_dir_on_your_platform #endif +#if !defined(RELATIVE_DATA_DIR) + rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); + if (NS_FAILED(rv)) { + return rv; + } +#endif rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { @@ -351,6 +357,23 @@ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot( return rv; } +#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) + // These 3 platforms share this part of the path - do them as one + rv = localDir->AppendRelativeNativePath("Profiles"_ns); + if (NS_FAILED(rv)) { + return rv; + } + + bool exists; + rv = localDir->Exists(&exists); + if (NS_SUCCEEDED(rv) && !exists) { + rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775); + } + if (NS_FAILED(rv)) { + return rv; + } +#endif + localDir.forget(aLocalFile); return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc5f2fc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc5f2fc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 40933: Add tor-launcher functionality
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: dca7ddb7 by Pier Angelo Vendrame at 2023-01-10T19:18:47+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41549: Correctly handle tor's stdout Subprocess.jsm manages stdout through a pipe, which we never emptied. As a result, it tor filled it completely, a lot of other stuff stalled. The previous implementation dumped tor's stdout to the browser's one, so this commit restores this behavior. (cherry picked from commit c20e9ad7c04325c67c7259d7bf69a7ff3e160466) - - - - - 1 changed file: - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -133,9 +133,10 @@ class TorProcess { arguments: this._args, environment, environmentAppend: true, - stderr: "pipe", + stderr: "stdout", }; this._subprocess = await Subprocess.call(options); + this._dumpStdout(); this._watchProcess(); this._status = TorProcessStatus.Running; this._torProcessStartTime = Date.now(); @@ -173,6 +174,16 @@ class TorProcess { this._didConnectToTorControlPort = true; } + async _dumpStdout() { + let string; + while ( + this._subprocess && + (string = await this._subprocess.stdout.readString()) + ) { + dump(string); + } + } + async _watchProcess() { const watched = this._subprocess; if (!watched) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dca7ddb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dca7ddb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c20e9ad7 by Pier Angelo Vendrame at 2023-01-10T19:17:03+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41549: Correctly handle tor's stdout Subprocess.jsm manages stdout through a pipe, which we never emptied. As a result, it tor filled it completely, a lot of other stuff stalled. The previous implementation dumped tor's stdout to the browser's one, so this commit restores this behavior. - - - - - 1 changed file: - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -133,9 +133,10 @@ class TorProcess { arguments: this._args, environment, environmentAppend: true, - stderr: "pipe", + stderr: "stdout", }; this._subprocess = await Subprocess.call(options); + this._dumpStdout(); this._watchProcess(); this._status = TorProcessStatus.Running; this._torProcessStartTime = Date.now(); @@ -173,6 +174,16 @@ class TorProcess { this._didConnectToTorControlPort = true; } + async _dumpStdout() { + let string; + while ( + this._subprocess && + (string = await this._subprocess.stdout.readString()) + ) { + dump(string); + } + } + async _watchProcess() { const watched = this._subprocess; if (!watched) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c20e9ad… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c20e9ad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] 5 commits: dropme! Partial revert of Bug 13252
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5858c308 by Pier Angelo Vendrame at 2023-01-10T18:10:55+01:00 dropme! Partial revert of Bug 13252 I need to modify Bug 9173. So, I am removing a few changes from 13252 to make both the modifications and the rebase easier. - - - - - acdcfcae by Pier Angelo Vendrame at 2023-01-10T18:11:04+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser This commit adds TorProject as the vendor of Tor Browser. This should be visible both in the Windows binaries, and will be used to create the profile directory if we disable the portable mode. - - - - - 5c5e44d0 by Pier Angelo Vendrame at 2023-01-10T18:13:36+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Bug 20497: Make it possible to disable portable mode 9173 is the patch that enables portable mode for Tor Browser. We modified it to make it optional, but it still used to remove a few important parts that made it compulsory to define a profile directory in the application.ini (through the mozconfig). This commit restores these parts, and makes it hopefully possible to disable portable mode without filling the home directory with TBB files. A few parts are then disabled in a following commit, since they are TBB-legacy behavior, but we might not want them for base-browser and for privacy-browser. Also, this commit changes the configure flag from --with-relative-profile-directory to --with-relative-data-dir, because the data directories can contain the profile and the local data such as caches, not only the profile. Still, we are assuming we are using the same data directory for the profile and for the caches, which is not the case on Windows (where the profile is roaming, and the caches are local) and on Linux (where the profile is in the home, and the cache is in ~/.cache). - - - - - 458fbecf by Pier Angelo Vendrame at 2023-01-10T18:13:44+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Change relative-profile-directory with relative-data-dir. - - - - - a958edce by Pier Angelo Vendrame at 2023-01-10T18:13:45+01:00 fixup! Bug 13252: Do not store data in the app bundle Bug 20497: Make it possible to use Tor Browser in non-portable mode Add back some legacy Tor Browser-specific behaviors that we restored in 9173. Bug 41535: Remove the old, unused and undocumented "-invisible" macOS CLI flag - - - - - 6 changed files: - browser/config/mozconfigs/tor-browser - browser/confvars.sh - moz.configure - toolkit/xre/nsAppRunner.cpp - toolkit/xre/nsXREDirProvider.cpp - xpcom/io/nsAppFileLocationProvider.cpp Changes: ===================================== browser/config/mozconfigs/tor-browser ===================================== @@ -1,8 +1,15 @@ . $topsrcdir/browser/config/mozconfigs/base-browser +export MOZ_APP_BASENAME="TorBrowser" mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -ac_add_options --with-relative-profile=TorBrowser/Data/Browser +ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser +# This is not needed with the relative data directory, but it is when you +# disable it, otherwise it is "Mozilla" (on Windows and macOS) or ".mozilla" on +# Unix systems. +# It is used, for example, for GetProductDirectory. +# ac_add_options --with-user-appdir=TorProject +# ac_add_options --with-user-appdir=.torproject ac_add_options --enable-tor-browser-update ac_add_options --enable-verify-mar ===================================== browser/confvars.sh ===================================== @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_VENDOR=Mozilla +MOZ_APP_VENDOR="Tor Project" BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml ===================================== moz.configure ===================================== @@ -1026,22 +1026,22 @@ set_define("BASE_BROWSER", True, when="--enable-base-browser") option( - "--with-relative-profile", + "--with-relative-data-dir", nargs=1, - help="Sets the directory of the profile, relative to the application directory" + help="Sets the data directories to be relative to the application directory" ) -@depends("--with-relative-profile", target) +@depends("--with-relative-data-dir", target) @imports("json") -def relative_profile(value, target): +def relative_data_dir(value, target): if value and target.os == "Android": - die("--with-relative-profile is not supported on Android") + die("--with-relative-data-dir is not supported on Android") if value: return json.dumps(value[0]) -set_define("RELATIVE_PROFILE_DIRECTORY", relative_profile) +set_define("RELATIVE_DATA_DIR", relative_data_dir) # Tor additions. ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -4158,14 +4158,6 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { if (PR_GetEnv("XRE_MAIN_BREAK")) NS_BREAK(); #endif -#if defined(XP_MACOSX) && defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) - bool hideDockIcon = (CheckArg("invisible") == ARG_FOUND); - if (hideDockIcon) { - ProcessSerialNumber psn = {0, kCurrentProcess}; - TransformProcessType(&psn, kProcessTransformToBackgroundApplication); - } -#endif - mozilla::startup::IncreaseDescriptorLimits(); #ifdef USE_GLX_TEST @@ -5222,6 +5214,14 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { if (CheckArg("test-process-updates")) { SaveToEnv("MOZ_TEST_PROCESS_UPDATES=1"); } +# ifndef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + nsCOMPtr<nsIFile> exeFile, exeDir; + rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, + getter_AddRefs(exeFile)); + NS_ENSURE_SUCCESS(rv, 1); + rv = exeFile->GetParent(getter_AddRefs(exeDir)); +# endif + # ifdef TOR_BROWSER_UPDATE nsAutoCString compatVersion(TOR_BROWSER_VERSION_QUOTED); # endif ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -236,6 +236,11 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false); if (NS_SUCCEEDED(rv)) { + // For some reason, we have decided not to append "Profiles" in Tor Browser. + // So, let's keep removing it, or we should somehow migrate the profile. +#if !defined(TOR_BROWSER_VERSION) && (!defined(XP_UNIX) || defined(XP_MACOSX)) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -251,6 +256,9 @@ nsresult nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true); if (NS_SUCCEEDED(rv)) { +#if !defined(TOR_BROWSER_VERSION) && (!defined(XP_UNIX) || defined(XP_MACOSX)) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -1366,8 +1374,7 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, return gDataDirHome->Clone(aFile); } -#if defined(RELATIVE_PROFILE_DIRECTORY) || \ - defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) +#if defined(RELATIVE_DATA_DIR) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) # ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); @@ -1379,10 +1386,10 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, } rv = singleton->GetAppRootDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); NS_ENSURE_SUCCESS(rv, rv); -#endif +# endif if (aLocal) { rv = localDir->AppendNative("Caches"_ns); NS_ENSURE_SUCCESS(rv, rv); @@ -1555,7 +1562,7 @@ nsresult nsXREDirProvider::GetAppRootDir(nsIFile** aFile) { #endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); file = appRootDir; } return appRootDir->Clone(aFile); @@ -1612,8 +1619,13 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { } nsAutoCString profile; + nsAutoCString appName; + nsAutoCString vendor; if (gAppData->profile) { profile = gAppData->profile; + } else { + appName = gAppData->name; + vendor = gAppData->vendor; } nsresult rv = NS_OK; @@ -1621,12 +1633,27 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { #if defined(XP_MACOSX) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + // Note that MacOS ignores the vendor when creating the profile hierarchy - + // all application preferences directories live alongside one another in + // ~/Library/Application Support/ + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + rv = aFile->AppendNative(vendor); + NS_ENSURE_SUCCESS(rv, rv); + } + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); @@ -1638,21 +1665,48 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) + nsAutoCString folder; + // Make it hidden (by starting with "."), except when local (the + // profile is already under ~/.cache or XDG_CACHE_HOME). +# ifndef RELATIVE_DATA_DIR + if (!aLocal) folder.Assign('.'); +# endif + if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); while (*profileStart == '/' || *profileStart == '\\') profileStart++; +# ifndef RELATIVE_DATA_DIR // On the off chance that someone wanted their folder to be hidden don't // let it become ".." - if (*profileStart == '.') profileStart++; + if (*profileStart == '.' && !aLocal) profileStart++; +# endif - // Make it hidden (by starting with "."). - nsAutoCString folder("."); folder.Append(profileStart); ToLowerCase(folder); rv = AppendProfileString(aFile, folder.BeginReading()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + folder.Append(vendor); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + NS_ENSURE_SUCCESS(rv, rv); + + folder.Truncate(); + } + + // This can be the case in tests. + if (!appName.IsEmpty()) { + folder.Append(appName); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + } +# endif } NS_ENSURE_SUCCESS(rv, rv); ===================================== xpcom/io/nsAppFileLocationProvider.cpp ===================================== @@ -249,8 +249,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; -#if defined(RELATIVE_PROFILE_DIRECTORY) || \ - defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) +#if defined(RELATIVE_DATA_DIR) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) nsCOMPtr<nsIProperties> directoryService( do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); @@ -263,26 +262,24 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, rv = file->Normalize(); NS_ENSURE_SUCCESS(rv, rv); int levelsToRemove = 1; -#if defined(XP_MACOSX) +# if defined(XP_MACOSX) levelsToRemove += 2; -#endif +# endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); file = appRootDir; } -#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR +# ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR rv = TorBrowser_GetUserDataDir(appRootDir, getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); rv = localDir->AppendNative("Browser"_ns); -#else +# else localDir = appRootDir; - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); - NS_ENSURE_SUCCESS(rv, rv); -#endif - +# endif NS_ENSURE_SUCCESS(rv, rv); if (aLocal) { @@ -329,6 +326,12 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, # error dont_know_how_to_get_product_dir_on_your_platform #endif +#if !defined(RELATIVE_DATA_DIR) && !defined(TOR_BROWSER_VERSION) + rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); + if (NS_FAILED(rv)) { + return rv; + } +#endif rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { @@ -362,6 +365,26 @@ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot( return rv; } +#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) + // These 3 platforms share this part of the path - do them as one +# ifndef TOR_BROWSER_VERSION + // Legacy: we do not use "Profiles" on Tor Browser. + rv = localDir->AppendRelativeNativePath("Profiles"_ns); + if (NS_FAILED(rv)) { + return rv; + } +# endif + + bool exists; + rv = localDir->Exists(&exists); + if (NS_SUCCEEDED(rv) && !exists) { + rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775); + } + if (NS_FAILED(rv)) { + return rv; + } +#endif + localDir.forget(aLocalFile); return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/060e2d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/060e2d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 10 Jan '23

10 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 060e2d72 by Pier Angelo Vendrame at 2023-01-10T16:38:50+00:00 fixup! Add TorStrings module for localization Bug 41563: Fix old placeholders in TorStrings.jsm - - - - - 1 changed file: - browser/modules/TorStrings.jsm Changes: ===================================== browser/modules/TorStrings.jsm ===================================== @@ -137,7 +137,7 @@ const Loader = { bridgeCurrent: "Your Current Bridges", bridgeCurrentDescription: "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.", - bridgeId: "#1 bridge: #2", + bridgeId: "%1$S bridge: %2$S", remove: "Remove", bridgeDisableBuiltIn: "Disable built-in bridges", bridgeShare: @@ -247,16 +247,16 @@ const Loader = { couldNotConnect: "Tor Browser could not connect to Tor", configureConnection: "configure your connection", assistDescription: - "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead.", + "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can %S manually instead.", tryingBridge: "Trying a bridge…", tryingBridgeAgain: "Trying one more time…", errorLocation: "Tor Browser couldn’t locate you", errorLocationDescription: - "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead.", + "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, %S manually instead.", isLocationCorrect: "Are these location settings correct?", isLocationCorrectDescription: - "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead.", + "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or %S instead.", finalError: "Tor Browser still cannot connect", finalErrorDescription: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/060e2d7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/060e2d7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40209: Implement Basic Crypto Safety
by Pier Angelo Vendrame (＠pierov) 10 Jan '23

10 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 221b7a49 by Henry Wilkes at 2023-01-10T10:21:09+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41539: Remove all whitespace from copied text before testing if it looks like a crypto address. - - - - - 1 changed file: - browser/actors/CryptoSafetyChild.jsm Changes: ===================================== browser/actors/CryptoSafetyChild.jsm ===================================== @@ -74,7 +74,7 @@ class CryptoSafetyChild extends JSWindowActorChild { if (event.type == "copy" || event.type == "cut") { this.contentWindow.navigator.clipboard.readText().then(clipText => { - const selection = clipText.trim(); + const selection = clipText.replace(/\s+/g, ""); if (looksLikeCryptoAddress(selection)) { this.sendAsyncMessage("CryptoSafety:CopiedText", { selection, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/221b7a4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/221b7a4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 10 Jan '23

10 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1340b399 by hackademix at 2023-01-09T22:50:42+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 45162: do not force letterboxing on API-initiated fullscreen. - - - - - 2 changed files: - browser/base/content/browser.css - layout/style/res/ua.css Changes: ===================================== browser/base/content/browser.css ===================================== @@ -111,8 +111,8 @@ body { outline: initial; } -.letterboxing-ready .browserStack:not(.exclude-letterboxing) { - place-content: start center; +:root:not([inDOMFullscreen]) .letterboxing-ready .browserStack:not(.exclude-letterboxing) { + place-content: start center; } /* extend down the toolbar's colors when letterboxing is enabled */ ===================================== layout/style/res/ua.css ===================================== @@ -356,8 +356,8 @@ left: 0 !important; right: 0 !important; bottom: 0 !important; - width: 100%; - height: 100%; + width: 100% !important; + height: 100% !important; margin: 0 !important; min-width: 0 !important; max-width: none !important; @@ -368,11 +368,6 @@ transform: none !important; } -*|*:fullscreen:not(:root, .letterboxing .browserStack:not(.exclude-letterboxing) > browser) { - width: 100% !important; - height: 100% !important; -} - xul|*:fullscreen:not(:root, [hidden="true"]) { /* The position: fixed; property above used to force the computed display * value to block. It is no longer the case now, so we manually set it here to View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1340b39… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1340b39… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40925: Implemented the Security Level component
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 90395b29 by Henry Wilkes at 2023-01-09T20:41:54+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 32274: Make the security level settings more accessible: + We remove the "Restore Defaults" link that was between each radio option and place it separately as a button, with some notification text. + We set the `aria-describedby` attribute on the radio options to point to the description. + We change the security level popup's button text from "Change" to "Change Setting" to give users more of a hint that clicking the button will land them in the middle of about:preferences. We also tidied up the javascript, CSS and xhtml. - - - - - 5 changed files: - browser/components/preferences/privacy.js - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelPreferences.css - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - browser/components/securitylevel/locale/en-US/securityLevel.properties Changes: ===================================== browser/components/preferences/privacy.js ===================================== @@ -341,11 +341,9 @@ var gPrivacyPane = { */ _initSecurityLevel() { SecurityLevelPreferences.init(); - let unload = () => { - window.removeEventListener("unload", unload); - SecurityLevelPreferences.uninit(); - }; - window.addEventListener("unload", unload); + window.addEventListener("unload", () => SecurityLevelPreferences.uninit(), { + once: true, + }); }, /** ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -17,13 +17,14 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { security_level_restore: "Restore Defaults", security_level_learn_more: "Learn more", // Panel - security_level_change: "Change…", + security_level_change_setting: "Change Setting…", security_level_standard_summary: "All browser and website features are enabled.", security_level_safer_summary: "Disables website features that are often dangerous, causing some sites to lose functionality.", security_level_safest_summary: "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.", + security_level_custom_heading: "Warning!", security_level_custom_summary: "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.", // Security level section in about:preferences#privacy @@ -259,7 +260,7 @@ var SecurityLevelPanel = { this._elements.restoreDefaultsButton.textContent = SecurityLevelStrings.security_level_restore; this._elements.settingsButton.textContent = - SecurityLevelStrings.security_level_change; + SecurityLevelStrings.security_level_change_setting; this._elements.restoreDefaultsButton.addEventListener("command", () => { this.restoreDefaults(); @@ -367,120 +368,112 @@ var SecurityLevelPanel = { var SecurityLevelPreferences = { _securityPrefsBranch: null, + /** + * The notification box shown when the user has a custom security setting. + * + * @type {Element} + */ + _customNotification: null, + /** + * The radiogroup for this preference. + * + * @type {Element} + */ + _radiogroup: null, + /** + * A list of radio options and their containers. + * + * @type {Array<Object>} + */ + _radioOptions: null, _populateXUL() { - const groupbox = document.querySelector("#securityLevel-groupbox"); - const radiogroup = groupbox.querySelector("#securityLevel-radiogroup"); - radiogroup.addEventListener( - "command", - SecurityLevelPreferences.selectSecurityLevel + this._customNotification = document.getElementById( + "securityLevel-customNotification" ); + this._radiogroup = document.getElementById("securityLevel-radiogroup"); - groupbox.querySelector("h2").textContent = + document.querySelector("#securityLevel-groupbox h2").textContent = SecurityLevelStrings.security_level; - groupbox.querySelector("#securityLevel-overview").textContent = + document.getElementById("securityLevel-overview").textContent = SecurityLevelStrings.security_level_overview; - groupbox - .querySelector("#securityLevel-learnMore") + document + .getElementById("securityLevel-learnMore") .setAttribute("value", SecurityLevelStrings.security_level_learn_more); - const populateRadioElements = (level, descr) => { - const vbox = groupbox.querySelector(`#securityLevel-vbox-${level}`); - vbox - .querySelector("radio") - .setAttribute("label", SecurityLevelStrings[`security_level_${level}`]); - vbox - .querySelector(".securityLevel-customWarning") - .setAttribute("value", SecurityLevelStrings.security_level_custom); - vbox.querySelector(".summary").textContent = - SecurityLevelStrings[`security_level_${level}_summary`]; - const labelRestoreDefaults = vbox.querySelector( - ".securityLevel-restoreDefaults" - ); - labelRestoreDefaults.setAttribute( - "value", - SecurityLevelStrings.security_level_restore + document.getElementById("securityLevel-customHeading").textContent = + SecurityLevelStrings.security_level_custom_heading; + document.getElementById("securityLevel-customDescription").textContent = + SecurityLevelStrings.security_level_custom_summary; + const restoreDefaultsButton = document.getElementById( + "securityLevel-restoreDefaults" + ); + restoreDefaultsButton.textContent = + SecurityLevelStrings.security_level_restore; + + this._radioOptions = Array.from( + this._radiogroup.querySelectorAll(".securityLevel-radio-option"), + container => { + return { container, radio: container.querySelector("radio") }; + } + ); + const descListItemsMap = { + safer: [ + SecurityLevelStrings.security_level_js_https_only, + SecurityLevelStrings.security_level_limit_typography, + SecurityLevelStrings.security_level_limit_media, + ], + safest: [ + SecurityLevelStrings.security_level_js_disabled, + SecurityLevelStrings.security_level_limit_typography_svg, + SecurityLevelStrings.security_level_limit_media, + ], + }; + for (const { container, radio } of this._radioOptions) { + const level = radio.value; + radio.setAttribute( + "label", + SecurityLevelStrings[`security_level_${level}`] ); - labelRestoreDefaults.addEventListener( - "click", - SecurityLevelStrings.restoreDefaults + container.querySelector(".summary").textContent = + SecurityLevelStrings[`security_level_${level}_summary`]; + const descListItems = descListItemsMap[level]; + if (!descListItems) { + continue; + } + const descrList = container.querySelector( + ".securityLevel-descriptionList" ); - if (descr) { - const descrList = vbox.querySelector(".securityLevel-descriptionList"); - // TODO: Add the elements in securityLevelPreferences.inc.xhtml again - // when we switch to Fluent - for (const text of descr) { - let elem = document.createXULElement("description"); - elem.textContent = text; - elem.className = "indent"; - descrList.append(elem); - } + // TODO: Add the elements in securityLevelPreferences.inc.xhtml again + // when we switch to Fluent + for (const text of descListItems) { + let elem = document.createXULElement("description"); + elem.textContent = text; + elem.className = "indent"; + descrList.append(elem); } - }; - populateRadioElements("standard"); - populateRadioElements("safer", [ - SecurityLevelStrings.security_level_js_https_only, - SecurityLevelStrings.security_level_limit_typography, - SecurityLevelStrings.security_level_limit_media, - ]); - populateRadioElements("safest", [ - SecurityLevelStrings.security_level_js_disabled, - SecurityLevelStrings.security_level_limit_typography_svg, - SecurityLevelStrings.security_level_limit_media, - ]); + } + + restoreDefaultsButton.addEventListener("command", () => { + SecurityLevelPrefs.securityCustom = false; + }); + this._radiogroup.addEventListener("select", () => { + SecurityLevelPrefs.securityLevel = this._radiogroup.value; + }); }, _configUIFromPrefs() { - // read our prefs - const securityLevel = SecurityLevelPrefs.securityLevel; - const securityCustom = SecurityLevelPrefs.securityCustom; - - // get our elements - const groupbox = document.querySelector("#securityLevel-groupbox"); - let radiogroup = groupbox.querySelector("#securityLevel-radiogroup"); - let labelStandardCustom = groupbox.querySelector( - "#securityLevel-vbox-standard label.securityLevel-customWarning" - ); - let labelSaferCustom = groupbox.querySelector( - "#securityLevel-vbox-safer label.securityLevel-customWarning" - ); - let labelSafestCustom = groupbox.querySelector( - "#securityLevel-vbox-safest label.securityLevel-customWarning" - ); - let labelStandardRestoreDefaults = groupbox.querySelector( - "#securityLevel-vbox-standard label.securityLevel-restoreDefaults" - ); - let labelSaferRestoreDefaults = groupbox.querySelector( - "#securityLevel-vbox-safer label.securityLevel-restoreDefaults" - ); - let labelSafestRestoreDefaults = groupbox.querySelector( - "#securityLevel-vbox-safest label.securityLevel-restoreDefaults" - ); - - // hide custom label by default until we know which level we're at - labelStandardCustom.hidden = true; - labelSaferCustom.hidden = true; - labelSafestCustom.hidden = true; - - labelStandardRestoreDefaults.hidden = true; - labelSaferRestoreDefaults.hidden = true; - labelSafestRestoreDefaults.hidden = true; - - radiogroup.value = securityLevel; - - switch (securityLevel) { - case "standard": - labelStandardCustom.hidden = !securityCustom; - labelStandardRestoreDefaults.hidden = !securityCustom; - break; - case "safer": - labelSaferCustom.hidden = !securityCustom; - labelSaferRestoreDefaults.hidden = !securityCustom; - break; - case "safest": - labelSafestCustom.hidden = !securityCustom; - labelSafestRestoreDefaults.hidden = !securityCustom; - break; + this._radiogroup.value = SecurityLevelPrefs.securityLevel; + const isCustom = SecurityLevelPrefs.securityCustom; + this._radiogroup.disabled = isCustom; + this._customNotification.hidden = !isCustom; + // Have the container's selection CSS class match the selection state of the + // radio elements. + for (const { container, radio } of this._radioOptions) { + container.classList.toggle( + "securityLevel-radio-option-selected", + radio.selected + ); } }, @@ -514,17 +507,4 @@ var SecurityLevelPreferences = { break; } }, - - selectSecurityLevel() { - // radio group elements - let radiogroup = document.getElementById("securityLevel-radiogroup"); - - // update pref based on selected radio option - SecurityLevelPrefs.securityLevel = radiogroup.value; - SecurityLevelPreferences.restoreDefaults(); - }, - - restoreDefaults() { - SecurityLevelPrefs.securityCustom = false; - }, }; /* SecurityLevelPreferences */ ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -1,51 +1,58 @@ -label.securityLevel-customWarning { - border-radius: 4px; - background-color: var(--yellow-50); - color: black; - font-size: 1em; - height: 1.6em; - padding: 0.4em 0.5em; +#securityLevel-groupbox { + --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +} + +#securityLevel-customNotification { + /* Spacing similar to #fpiIncompatibilityWarning. */ + margin-block: 16px; +} + +.info-icon.securityLevel-custom-warning-icon { + list-style-image: url("chrome://global/skin/icons/warning.svg"); +} + +#securityLevel-customHeading { + font-weight: bold; } -radiogroup#securityLevel-radiogroup description { - color: var(--in-content-page-color)!important; +/* Overwrite indent rule from preferences.css */ +#securityLevel-radiogroup description.indent { + color: var(--in-content-page-color); } -radiogroup#securityLevel-radiogroup radio { +#securityLevel-radiogroup radio { font-weight: bold; } -radiogroup#securityLevel-radiogroup > vbox { +#securityLevel-radiogroup[disabled] { + opacity: 0.5; +} + +/* Overwrite the rule in common-shared.css so we don't get 0.25 opacity overall + * on the radio text. */ +#securityLevel-radiogroup[disabled] radio[disabled] { + opacity: 1.0; +} + +.securityLevel-radio-option { border: 1px solid var(--in-content-box-border-color); border-radius: 4px; margin: 3px 0; padding: 9px; } -radiogroup#securityLevel-radiogroup[value=standard] > vbox#securityLevel-vbox-standard, -radiogroup#securityLevel-radiogroup[value=safer] > vbox#securityLevel-vbox-safer, -radiogroup#securityLevel-radiogroup[value=safest] > vbox#securityLevel-vbox-safest { - --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +.securityLevel-radio-option.securityLevel-radio-option-selected { background-color: var(--section-highlight-background-color); border: 1px solid var(--in-content-accent-color); } -vbox.securityLevel-descriptionList { +.securityLevel-radio-option:not( + .securityLevel-radio-option-selected +) .securityLevel-descriptionList { display: none; } -radiogroup#securityLevel-radiogroup[value=safer] vbox#securityLevel-vbox-safer vbox.securityLevel-descriptionList, -radiogroup#securityLevel-radiogroup[value=safest] vbox#securityLevel-vbox-safest vbox.securityLevel-descriptionList { - display: inherit; -} - -vbox.securityLevel-descriptionList description { +.securityLevel-descriptionList description { display: list-item; } - -vbox#securityLevel-vbox-standard, -vbox#securityLevel-vbox-safer, -vbox#securityLevel-vbox-safest { - margin-top: 0.4em; -} ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -2,62 +2,58 @@ data-category="panePrivacy" data-subcategory="securitylevel" hidden="true"> - <label><html:h2/></label> + <label><html:h2></html:h2></label> <vbox flex="1"> <description flex="1"> - <html:span id="securityLevel-overview" class="tail-with-learn-more"/> + <html:span id="securityLevel-overview" class="tail-with-learn-more"> + </html:span> <label id="securityLevel-learnMore" class="learnMore text-link" is="text-link" href="about:manual#security-settings" useoriginprincipal="true"/> </description> + <hbox id="securityLevel-customNotification" + class="info-box-container" + flex="1"> + <hbox class="info-icon-container"> + <image class="info-icon securityLevel-custom-warning-icon"/> + </hbox> + <vbox flex="1"> + <label id="securityLevel-customHeading"/> + <description id="securityLevel-customDescription" flex="1"/> + </vbox> + <hbox align="center"> + <button id="securityLevel-restoreDefaults"/> + </hbox> + </hbox> <radiogroup id="securityLevel-radiogroup"> - <vbox id="securityLevel-vbox-standard"> - <hbox> - <radio value="standard"/> - <vbox> - <spacer flex="1"/> - <label class="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> - <spacer flex="1"/> - </hbox> - <description flex="1" class="indent"> - <html:span class="summary tail-with-learn-more"/> - <label class="securityLevel-restoreDefaults learnMore text-link"/> - </description> + <vbox class="securityLevel-radio-option"> + <radio value="standard" + aria-describedby="securityLevelSummary-standard"/> + <vbox id="securityLevelSummary-standard"> + <description class="summary indent" flex="1"/> + </vbox> </vbox> - <vbox id="securityLevel-vbox-safer"> - <hbox> - <radio value="safer"/> - <vbox> - <spacer flex="1"/> - <label class="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> - </hbox> - <description flex="1" class="indent"> - <html:span class="summary tail-with-learn-more"/> - <label class="securityLevel-restoreDefaults learnMore text-link"/> - </description> - <vbox class="securityLevel-descriptionList indent"> + <vbox class="securityLevel-radio-option"> +  + <radio value="safer" + aria-describedby="securityLevelSummary-safer"/> + <vbox id="securityLevelSummary-safer"> + <description class="summary indent" flex="1"/> + <vbox class="securityLevel-descriptionList indent"/> </vbox> </vbox> - <vbox id="securityLevel-vbox-safest"> - <hbox> - <radio value="safest"/> - <vbox> - <spacer flex="1"/> - <label class="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> - </hbox> - <description flex="1" class="indent"> - <html:span class="summary tail-with-learn-more"/> - <label class="securityLevel-restoreDefaults learnMore text-link"/> - </description> - <vbox class="securityLevel-descriptionList indent"> + <vbox class="securityLevel-radio-option"> + <radio value="safest" + aria-describedby="securityLevelSummary-safest"/> + <vbox id="securityLevelSummary-safest"> + <description class="summary indent" flex="1"/> + <vbox class="securityLevel-descriptionList indent"/> </vbox> </vbox> </radiogroup> ===================================== browser/components/securitylevel/locale/en-US/securityLevel.properties ===================================== @@ -13,9 +13,11 @@ security_level_learn_more = Learn more # Panel security_level_change = Change… +security_level_change_setting = Change Setting… security_level_standard_summary = All browser and website features are enabled. security_level_safer_summary = Disables website features that are often dangerous, causing some sites to lose functionality. security_level_safest_summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. +security_level_custom_heading = Warning! security_level_custom_summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. ## Security level section in about:preferences#privacy View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/90395b2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/90395b2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 2 commits: fixup! Bug 16940: After update, load local change notes.
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 4b8dca0d by Pier Angelo Vendrame at 2023-01-09T20:34:21+00:00 fixup! Bug 16940: After update, load local change notes. Bug 41524: Read changelogs as UTF-8 - - - - - 7774a06e by Henry Wilkes at 2023-01-09T20:34:31+00:00 fixup! Bug 16940: After update, load local change notes. We make a number of related changed to improve the semantics and accessibility of the about:tbupdate page: + We parse and show the release notes as a bullet list. + We use paragraphs, headings and bullet list to structure content. + We stop using fixed "px" font sizes and use relative sizes instead. + Add a lang="en-US" and dir="ltr" attribute to the english text. - - - - - 4 changed files: - browser/actors/AboutTBUpdateParent.jsm - browser/base/content/abouttbupdate/aboutTBUpdate.css - browser/base/content/abouttbupdate/aboutTBUpdate.js - browser/base/content/abouttbupdate/aboutTBUpdate.xhtml Changes: ===================================== browser/actors/AboutTBUpdateParent.jsm ===================================== @@ -8,7 +8,6 @@ this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"]; const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); @@ -22,9 +21,9 @@ const kRequestUpdateMessageName = "FetchUpdateData"; * implementation. */ class AboutTBUpdateParent extends JSWindowActorParent { - receiveMessage(aMessage) { + async receiveMessage(aMessage) { if (aMessage.name == kRequestUpdateMessageName) { - return this.releaseNoteInfo; + return this.getReleaseNoteInfo(); } return undefined; } @@ -51,7 +50,7 @@ class AboutTBUpdateParent extends JSWindowActorParent { // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get releaseNoteInfo() { + async getReleaseNoteInfo() { let info = { moreInfoURL: this.moreInfoURL }; try { @@ -74,46 +73,72 @@ class AboutTBUpdateParent extends JSWindowActorParent { f.append("Docs"); f.append("ChangeLog.txt"); - let fs = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( - Ci.nsIFileInputStream - ); - fs.init(f, -1, 0, 0); - let s = NetUtil.readInputStreamToString(fs, fs.available()); - fs.close(); - - // Truncate at the first empty line. - s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); - - // Split into first line (version plus releaseDate) and - // remainder (releaseNotes). - // This first match() uses multiline mode with two capture groups: - // first line: (.*$) - // remaining lines: ([\s\S]+) - // [\s\S] matches all characters including end of line. This trick - // is needed because when using JavaScript regex in multiline mode, - // . does not match an end of line character. - let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); - if (matchArray && matchArray.length == 3) { - info.releaseNotes = matchArray[2]; - let line1 = matchArray[1]; - // Extract the version and releaseDate. The first line looks like: - // Tor Browser 8.5 -- May 1 2019 - // The regex uses two capture groups: - // text that does not include a hyphen: (^[^-]*) - // remaining text: (.*$) - // In between we match optional whitespace, one or more hyphens, and - // optional whitespace by using: \s*-+\s* - matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); - if (matchArray && matchArray.length == 3) { - info.version = matchArray[1]; - info.releaseDate = matchArray[2]; + // NOTE: We load in the entire file, but only use the first few lines + // before the first blank line. + const logLines = (await IOUtils.readUTF8(f.path)) + .replace(/\n\r?\n.*/ms, "") + .split(/\n\r?/); + + // Read the first line to get the version and date. + // Assume everything after the last "-" is the date. + const firstLine = logLines.shift(); + const match = firstLine?.match(/(.*)-+(.*)/); + if (match) { + info.version = match[1].trim(); + info.releaseDate = match[2].trim(); + } else { + // No date. + info.version = firstLine?.trim(); + } + + // We want to read the rest of the release notes as a tree. Each entry + // will contain the text for that line. + // We choose a negative index for the top node of this tree to ensure no + // line will appear less indented. + const topEntry = { indent: -1, children: undefined }; + let prevEntry = topEntry; + + for (let line of logLines) { + const indent = line.match(/^ */)[0]; + line = line.trim(); + if (line.startsWith("*")) { + // Treat as a bullet point. + let entry = { + text: line.replace(/^\*\s/, ""), + indent: indent.length, + }; + let parentEntry; + if (entry.indent > prevEntry.indent) { + // A sub-list of the previous item. + prevEntry.children = []; + parentEntry = prevEntry; + } else { + // Same list or end of sub-list. + // Search for the first parent whose indent comes before ours. + parentEntry = prevEntry.parent; + while (entry.indent <= parentEntry.indent) { + parentEntry = parentEntry.parent; + } + } + entry.parent = parentEntry; + parentEntry.children.push(entry); + prevEntry = entry; + } else if (prevEntry === topEntry) { + // Unexpected, missing bullet point on first line. + // Place as its own bullet point instead, and set as prevEntry for the + // next loop. + prevEntry = { text: line, indent: indent.length, parent: topEntry }; + topEntry.children = [prevEntry]; } else { - info.version = line1; // Match failed: return entire line in version. + // Append to the previous bullet point. + prevEntry.text += ` ${line}`; } - } else { - info.releaseNotes = s; // Only one line: use as releaseNotes. } - } catch (e) {} + + info.releaseNotes = topEntry.children; + } catch (e) { + Cu.reportError(e); + } return info; } ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.css ===================================== @@ -14,61 +14,54 @@ body { font-family: Helvetica, Arial, sans-serif; color: var(--abouttor-text-color); background-color: var(--abouttor-bg-toron-color); - background-attachment: fixed; - background-size: 100% 100%; -} - -a { - color: var(--abouttor-text-color); -} - -.two-column-grid { - display: inline-grid; + margin-block: 40px; + margin-inline: 50px; + display: grid; grid-template-columns: auto auto; - grid-column-gap: 50px; - margin: 10px 0px 0px 50px; + align-items: baseline; + gap: 40px 50px; } -.two-column-grid div { - margin-top: 40px; - align-self: baseline; /* Align baseline of text across the row. */ +body > *:not([hidden]) { + display: contents; } .label-column { - font-size: 14px; - font-weight: 400; + grid-column: 1; } -/* - * Use a reduced top margin to bring the row that contains the - * "visit our website" link closer to the row that precedes it. This - * looks better because the "visit our website" row does not have a - * label in the left column. - */ -div.more-info-row { - margin-top: 5px; - font-size: 14px; +.content { + grid-column: 2; + font-family: monospace; + line-height: 1.4; +} + +.label-column, .content { + margin: 0; + padding: 0; + font-size: 1rem; + font-weight: normal; } -#version-content { - font-size: 50px; - font-weight: 300; +a { + color: inherit; } -body:not([havereleasedate]) .release-date-cell { - display: none; +.no-line-break { + white-space: nowrap; } -#releasedate-content { - font-size: 17px; +ul { + padding-inline: 1em 0; } -#releasenotes-label { - align-self: start; /* Anchor "Release Notes" label at the top. */ +h3, h4 { + font-size: 1.1rem; + font-weight: bold; } -#releasenotes-content { - font-family: monospace; - font-size: 15px; - white-space: pre; +h3.build-system-heading { + font-size: 1.5rem; + font-weight: normal; + margin-block-start: 3em; } ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.js ===================================== @@ -5,23 +5,105 @@ /* eslint-env mozilla/frame-script */ -// aData may contain the following string properties: -// version -// releaseDate -// moreInfoURL -// releaseNotes -function onUpdate(aData) { - document.getElementById("version-content").textContent = aData.version; - if (aData.releaseDate) { - document.body.setAttribute("havereleasedate", "true"); - document.getElementById("releasedate-content").textContent = - aData.releaseDate; +/** + * An object representing a bullet point in the release notes. + * + * typedef {Object} ReleaseBullet + * @property {string} text - The text for this bullet point. + * @property {?Array<ReleaseBullet>} children - A sub-list of bullet points. + */ + +/** + * Fill an element with the given list of release bullet points. + * + * @param {Element} container - The element to fill with bullet points. + * @param {Array<ReleaseBullet>} bulletPoints - The list of bullet points. + * @param {string} [childTag="h3"] - The element tag name to use for direct + * children. Initially, the children are h3 sub-headings. + */ +function fillReleaseNotes(container, bulletPoints, childTag = "h3") { + for (const { text, children } of bulletPoints) { + const childEl = document.createElement(childTag); + // Keep dashes like "[tor-browser]" on the same line by nowrapping the word. + for (const [index, part] of text.split(/(\S+-\S+)/).entries()) { + if (!part) { + continue; + } + const span = document.createElement("span"); + span.textContent = part; + span.classList.toggle("no-line-break", index % 2); + childEl.appendChild(span); + } + container.appendChild(childEl); + if (children) { + if (childTag == "h3" && text.toLowerCase() === "build system") { + // Special case: treat the "Build System" heading's children as + // sub-headings. + childEl.classList.add("build-system-heading"); + fillReleaseNotes(container, children, "h4"); + } else { + const listEl = document.createElement("ul"); + fillReleaseNotes(listEl, children, "li"); + if (childTag == "li") { + // Insert within the "li" element. + childEl.appendChild(listEl); + } else { + container.appendChild(listEl); + } + } + } + } +} + +/** + * Set the content for the specified container, or hide it if we have no + * content. + * + * @template C + * @param {string} containerId - The id for the container. + * @param {?C} content - The content for this container, or a falsey value if + * the container has no content. + * @param {function(contentEl: Elemenet, content: C)} [fillContent] - A function + * to fill the ".content" contentEl with the given 'content'. If unspecified, + * the 'content' will become the contentEl's textContent. + */ +function setContent(containerId, content, fillContent) { + const container = document.getElementById(containerId); + if (!content) { + container.hidden = true; + return; } + const contentEl = container.querySelector(".content"); + // Release notes are only in English. + contentEl.setAttribute("lang", "en-US"); + contentEl.setAttribute("dir", "ltr"); + if (fillContent) { + fillContent(contentEl, content); + } else { + contentEl.textContent = content; + } +} + +/** + * Callback when we receive the update details. + * + * @param {Object} aData - The update details. + * @param {?string} aData.version - The update version. + * @param {?string} aData.releaseDate - The release date. + * @param {?string} aData.moreInfoURL - A URL for more info. + * @param {?Array<ReleaseBullet>} aData.releaseNotes - Release notes as bullet + * points. + */ +function onUpdate(aData) { + setContent("version-row", aData.version); + setContent("releasedate-row", aData.releaseDate); + setContent("releasenotes", aData.releaseNotes, fillReleaseNotes); + if (aData.moreInfoURL) { document.getElementById("infolink").setAttribute("href", aData.moreInfoURL); + } else { + document.getElementById("fullinfo").hidden = true; } - document.getElementById("releasenotes-content").textContent = - aData.releaseNotes; } RPMSendQuery("FetchUpdateData").then(onUpdate); ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.xhtml ===================================== @@ -21,19 +21,26 @@ type="text/javascript"/> </head> <body dir="&locale.dir;"> -<div class="two-column-grid"> - <div class="label-column">&aboutTBUpdate.version;</div> - <div id="version-content"/> - - <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> - <div id="releasedate-content" class="release-date-cell"/> - - <div class="more-info-row"/> - <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> - - <div id="releasenotes-label" - class="label-column">&aboutTBUpdate.releaseNotes;</div> - <div id="releasenotes-content"></div> -</div> +  + <div id="version-row"> + <span class="label-column">&aboutTBUpdate.version;</span> + <span class="content"></span> + </div> + <div id="releasedate-row"> + <span class="label-column">&aboutTBUpdate.releaseDate;</span> + <span class="content"></span> + </div> + <div id="fullinfo"> + <p class="content"> + &aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; + </p> + </div> + <section id="releasenotes"> + <h2 class="label-column">&aboutTBUpdate.releaseNotes;</h2> + <div class="content"></div> + </section> </body> </html> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4177d7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4177d7… You're receiving this email because of your account on gitlab.torproject.org.

1 0