March 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40750: Solve rlbox reproducibility problems
by Pier Angelo Vendrame (＠pierov) 06 Mar '23

06 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 76054058 by Pier Angelo Vendrame at 2023-03-03T18:42:49+01:00 Bug 40750: Solve rlbox reproducibility problems The wasi-sandbox project was not reproducible, because libc.a was filled in a non-deterministic order. Its Makefile contains some wildcards, but adding a sort to them was not enough to build libc.a deterministically. After fixing this problem, Firefox build issue disappears, too. Upstream issue: https://github.com/WebAssembly/wasi-libc/issues/398 - - - - - 4 changed files: - + projects/wasi-sysroot/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch - projects/wasi-sysroot/build - projects/wasi-sysroot/config - rbm.conf Changes: ===================================== projects/wasi-sysroot/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch ===================================== @@ -0,0 +1,36 @@ +From ef21e4f17e104a34e7db89215db567cddd48832d Mon Sep 17 00:00:00 2001 +From: Pier Angelo Vendrame <pierov(a)torproject.org> +Date: Wed, 1 Mar 2023 10:19:50 +0100 +Subject: [PATCH] Sort the object list passed to ar in the Makefile. + +This makes builds reproducible. +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index c31e3d7..f350ecb 100644 +--- a/Makefile ++++ b/Makefile +@@ -488,13 +488,13 @@ $(SYSROOT_LIB)/libwasi-emulated-signal.a: $(LIBWASI_EMULATED_SIGNAL_OBJS) $(LIBW + %.a: + @mkdir -p "$(@D)" + # On Windows, the commandline for the ar invocation got too long, so it needs to be split up. +- $(AR) crs $@ $(wordlist 1, 199, $^) +- $(AR) crs $@ $(wordlist 200, 399, $^) +- $(AR) crs $@ $(wordlist 400, 599, $^) +- $(AR) crs $@ $(wordlist 600, 799, $^) ++ $(AR) crs $@ $(wordlist 1, 199, $(sort $^)) ++ $(AR) crs $@ $(wordlist 200, 399, $(sort $^)) ++ $(AR) crs $@ $(wordlist 400, 599, $(sort $^)) ++ $(AR) crs $@ $(wordlist 600, 799, $(sort $^)) + # This might eventually overflow again, but at least it'll do so in a loud way instead of + # silently dropping the tail. +- $(AR) crs $@ $(wordlist 800, 100000, $^) ++ $(AR) crs $@ $(wordlist 800, 100000, $(sort $^)) + + $(MUSL_PRINTSCAN_OBJS): CFLAGS += \ + -D__wasilibc_printscan_no_long_double \ +-- +2.39.2 + ===================================== projects/wasi-sysroot/build ===================================== @@ -28,6 +28,9 @@ mv clang-source llvm-project export LLVM_HOME=$(pwd)/llvm-project tar -xf $rootdir/[% c('input_files_by_name/wasi-libc') %] mv wasi-libc-* wasi-libc +pushd wasi-libc +patch -p1 < "$rootdir/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch" +popd popd # What follows has been copied from Firefox's @@ -53,11 +56,14 @@ cat > 'version.sh' << EOF echo '[% c("abbrev") %]' EOF -# Build wasi-libc, libc++ and libc++abi. +# Build wasi-libc, and re-pack it, to make sure we get a deterministic output. +make PREFIX=/wasi build/wasi-libc.BUILT + +# We need to compile compiler-rt before building libc++ and libc++abi, because +# we need to inject it to Clang. make \ LLVM_PROJ_DIR=$LLVM_HOME \ PREFIX=/wasi \ - build/wasi-libc.BUILT \ build/compiler-rt.BUILT \ NINJA_FLAGS='-j[% c("num_procs") %]' @@ -66,6 +72,7 @@ rtdir="build/llvm/lib/clang/$(ls build/llvm/lib/clang)/lib/wasi" mkdir -p "$rtdir" cp build/compiler-rt/lib/wasi/libclang_rt.builtins-wasm32.a "$rtdir/" +# Now we can finally build libc++ and libc++abi. make \ LLVM_PROJ_DIR=$LLVM_HOME \ PREFIX=/wasi \ ===================================== projects/wasi-sysroot/config ===================================== @@ -33,3 +33,4 @@ input_files: project: wasi-config - name: wasi-libc project: wasi-libc + - filename: '0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch' ===================================== rbm.conf ===================================== @@ -170,7 +170,7 @@ var: - zh-rCN - zh-rTW - rlbox: 0 + rlbox: 1 sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40798: dmg2mar step also takes care of copying the signed+stabled dmg to the signed directory
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d536e6ad by Richard Pospesel at 2023-03-03T17:36:14+00:00 Bug 40798: dmg2mar step also takes care of copying the signed+stabled dmg to the signed directory - - - - - 2 changed files: - tools/signing/dmg2mar - tools/signing/gatekeeper-bundling.sh Changes: ===================================== tools/signing/dmg2mar ===================================== @@ -1,8 +1,7 @@ #!/bin/bash -# This script runs `make dmg2mar-release` or `make dmg2mar-alpha`, after -# moving the signed dmg files from the $tbb_version-macos-signed directory -# to the normal signed directory. +# This script runs `make dmg2mar-release` or `make dmg2mar-alpha`, and assumes +# that the final signed dmgs are deployed to the normal signed directory. # It should be run after `gatekeeper-bundling.sh`. set -e @@ -12,19 +11,21 @@ source "$script_dir/functions" cd "$script_dir/../.." +# some initial checks to make sure directories and file counts are as expected... + version=$(./rbm/rbm showconf browser --target alpha --target torbrowser-linux-x86_64 var/torbrowser_version) test "$version" = "$tbb_version" || \ exit_error "Incorrect tor browser version: $version != $tbb_version" -test -d "$macos_signed_dir" || \ - exit_error "$macos_signed_dir does not exist" +test -d "$signed_version_dir" || \ + exit_error "$signed_version_dir does not exist" ProjName=$(ProjectName) nb_locales=$(echo $bundle_locales | wc -w) -nb_bundles=$(ls -1 "$macos_signed_dir/$ProjName"-*.dmg | wc -l) +nb_bundles=$(ls -1 "$signed_version_dir/$ProjName"-*.dmg | wc -l) test "$nb_locales" -eq "$nb_bundles" || \ exit_error "Wrong number of bundles: $nb_locales != $nb_bundles" -mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/ +# before building converting the dmg to a mar make $SIGNING_PROJECTNAME-dmg2mar-$tbb_version_type ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -73,5 +73,7 @@ do $script_dir/ddmg.sh $macos_signed_dir/$ProjName-${tbb_version}-macos_$lang.dmg $tmpdir/dmg/ "$Proj_Name" rm -rf "dmg/$Proj_Name.app" done - rm -Rf "$tmpdir" + +# move the signed+stapled dmgs to expected output directory for publishing and mar generation +mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40800: Add WebTunnel support for mobile
by Pier Angelo Vendrame (＠pierov) 03 Mar '23

03 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c6423475 by Shelikhoo at 2023-03-02T14:04:48+00:00 Bug 40800: Add WebTunnel support for mobile This includes: add webtunnel support to tor-onion-proxy-library Add copy binary for webtunnel mobile update tor-android-service for webtunnel - - - - - 4 changed files: - projects/tor-android-service/config - + projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch - projects/tor-onion-proxy-library/build - projects/tor-onion-proxy-library/config Changes: ===================================== projects/tor-android-service/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 27924bc748044e987c188be854ff1471397cdb6a +git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22 git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git git_submodule: 1 container: ===================================== projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch ===================================== @@ -0,0 +1,74 @@ +From 3a6f835e8089dd15f5cd6487b5cfbdfafe7422f8 Mon Sep 17 00:00:00 2001 +From: Shelikhoo <xiaokangwang(a)outlook.com> +Date: Tue, 14 Feb 2023 16:59:59 +0000 +Subject: [PATCH] add WebTunnel Support + +--- + android/build.gradle | 3 +++ + .../thali/toronionproxy/TorConfigBuilder.java | 19 +++++++++++++++---- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/android/build.gradle b/android/build.gradle +index e107e8e..acd92c1 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -102,6 +102,9 @@ task copyPluggableTransports(type: Copy) { + rename { filename -> + filename.replace 'conjure-client', 'libConjure.so' + } ++ rename { filename -> ++ filename.replace 'webtunnel-client', 'libWebtunnel.so' ++ } + } + + gradle.projectsEvaluated { +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index b87993d..5e6d6c5 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -109,8 +109,8 @@ public final class TorConfigBuilder { + return this; + } + +- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException { +- if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null) { ++ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure, File pluggableTransportWebtunnel) throws IOException { ++ if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null || pluggableTransportWebtunnel == null) { + return this; + } + +@@ -144,7 +144,17 @@ public final class TorConfigBuilder { + .getCanonicalPath()); + } + +- transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath()); ++ if (!pluggableTransportWebtunnel.exists()) { ++ throw new IOException("Webtunnel binary does not exist: " + pluggableTransportWebtunnel ++ .getCanonicalPath()); ++ } ++ ++ if (!pluggableTransportWebtunnel.canExecute()) { ++ throw new IOException("Webtunnel binary is not executable: " + pluggableTransportWebtunnel ++ .getCanonicalPath()); ++ } ++ ++ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath(), pluggableTransportWebtunnel.getCanonicalPath()); + return this; + } + +@@ -511,10 +521,11 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) { ++ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) { + buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); + buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); + buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n"); ++ buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n'); + return this; + } + +-- +2.34.1 + ===================================== projects/tor-onion-proxy-library/build ===================================== @@ -25,6 +25,7 @@ patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch +patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] # Extract tor-expert-bundle @@ -41,14 +42,18 @@ patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch cp $ptdir/snowflake-client external/pluto/bin/armeabi/ cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/ cp $ptdir/conjure-client external/pluto/bin/armeabi/ + cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/ + cp $ptdir/webtunnel-client external/pluto/bin/armeabi/ [% ELSIF arch == "aarch64" -%] cp $ptdir/obfs4proxy external/pluto/bin/arm64-v8a/ cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/ cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/ + cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/ [% ELSE -%] cp $ptdir/obfs4proxy external/pluto/bin/[% arch %]/ cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/ cp $ptdir/conjure-client external/pluto/bin/[% arch %]/ + cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/ [% END -%] [% END -%] ===================================== projects/tor-onion-proxy-library/config ===================================== @@ -41,3 +41,4 @@ input_files: - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch - filename: 0001-Bug-30318-Add-snowflake-support.patch - filename: 0001-Bug-41361-Add-conjure-support.patch + - filename: 0001-Bug-40800-Add-WebTunnel-support.patch 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][base-browser-102.8.0esr-12.5-1] squash! Bug 40002: Remove about:ion
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 79a5cf25 by Pier Angelo Vendrame at 2023-03-03T16:39:33+00:00 squash! Bug 40002: Remove about:ion Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. (cherry picked from commit 46dc11a619ebb28f1d63e3d8fe94015718db992a) - - - - - 1 changed file: - services/sync/components.conf Changes: ===================================== services/sync/components.conf ===================================== @@ -11,10 +11,4 @@ Classes = [ 'jsm': 'resource://services-sync/Weave.jsm', 'constructor': 'WeaveService', }, - { - 'cid': '{d28f8a0b-95da-48f4-b712-caf37097be41}', - 'contract_ids': ['@mozilla.org/network/protocol/about;1?what=sync-log'], - 'jsm': 'resource://services-sync/Weave.jsm', - 'constructor': 'AboutWeaveLog', - }, ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/79a5cf2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/79a5cf2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] squash! Bug 40002: Remove about:ion
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 46dc11a6 by Pier Angelo Vendrame at 2023-03-03T14:56:18+01:00 squash! Bug 40002: Remove about:ion Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 1 changed file: - services/sync/components.conf Changes: ===================================== services/sync/components.conf ===================================== @@ -11,10 +11,4 @@ Classes = [ 'jsm': 'resource://services-sync/Weave.jsm', 'constructor': 'WeaveService', }, - { - 'cid': '{d28f8a0b-95da-48f4-b712-caf37097be41}', - 'contract_ids': ['@mozilla.org/network/protocol/about;1?what=sync-log'], - 'jsm': 'resource://services-sync/Weave.jsm', - 'constructor': 'AboutWeaveLog', - }, ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/46dc11a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/46dc11a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.0-1] Bug 18905: Hide unwanted items from help menu
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2094f3a4 by Arthur Edelstein at 2023-03-03T12:10:29+00:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option (cherry picked from commit 5ff98c20700d45b9bc57d970ff45c1e6519cd64d) - - - - - 3 changed files: - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -55,7 +55,8 @@ class="subviewbutton" data-l10n-id="appmenuitem-new-private-window" key="key_privatebrowsing" - command="Tools:PrivateBrowsing"/> + command="Tools:PrivateBrowsing" + hidden="true"/> <toolbarseparator/> <toolbarbutton id="appMenu-new-identity" class="subviewbutton" @@ -179,7 +180,8 @@ <toolbarbutton id="appMenu-restoreSession" data-l10n-id="appmenu-restore-session" class="subviewbutton" - command="Browser:RestoreLastSession"/> + command="Browser:RestoreLastSession" + hidden="true"/> <toolbarseparator/> <toolbarbutton id="appMenuClearRecentHistory" data-l10n-id="appmenu-clear-history" ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -458,6 +458,7 @@ have their strings defined by appmenu-data-l10n-id. --> <menuitem id="menu_openHelp" oncommand="openHelpLink('firefox-help')" + hidden="true" data-l10n-id="menu-get-help" appmenu-data-l10n-id="appmenu-get-help" #ifdef XP_MACOSX @@ -467,14 +468,17 @@ #endif <menuitem id="feedbackPage" oncommand="openFeedbackPage()" + hidden="true" data-l10n-id="menu-help-share-ideas" appmenu-data-l10n-id="appmenu-help-share-ideas"/> <menuitem id="helpSafeMode" oncommand="safeModeRestart();" + hidden="true" data-l10n-id="menu-help-enter-troubleshoot-mode2" appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/> <menuitem id="troubleShooting" oncommand="openTroubleshootingPage()" + hidden="true" data-l10n-id="menu-help-more-troubleshooting-info" appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/> <menuitem id="help_reportSiteIssue" ===================================== browser/base/content/browser-safebrowsing.js ===================================== @@ -7,6 +7,13 @@ var gSafeBrowsing = { setReportPhishingMenu() { + // tor-browser#18905: hide these menu entries + if ( + !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true) + ) { + return; + } + // In order to detect whether or not we're at the phishing warning // page, we have to check the documentURI instead of the currentURI. // This is because when the DocShell loads an error page, the View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2094f3a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2094f3a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] 4 commits: dropme! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 36693159 by Pier Angelo Vendrame at 2023-03-03T10:05:00+01:00 dropme! Bug 10760: Integrate TorButton to TorBrowser core Remove implementation of 18905 from Torbutton - - - - - 5ff98c20 by Arthur Edelstein at 2023-03-03T10:05:33+01:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 777cb20b by Pier Angelo Vendrame at 2023-03-03T10:05:40+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bring back the new circuit entries. - - - - - 7de98cbe by Pier Angelo Vendrame at 2023-03-03T10:05:47+01:00 fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser Move the manual menu entry to the manual commit - - - - - 2 changed files: - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js Changes: ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -461,17 +461,11 @@ <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">  -  - <box id="feedbackPage"/> - <box id="helpSafeMode"/> - <box id="menu_HelpPopup_reportPhishingtoolmenu"/> - <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>  <menuitem id="torBrowserUserManual" oncommand="gBrowser.selectedTab = gBrowser.addTab('about:manual', {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/> -  <menuitem id="menu_openHelp" oncommand="openHelpLink('firefox-help')" hidden="true" @@ -485,8 +479,8 @@ <menuitem id="feedbackPage" oncommand="openFeedbackPage()" hidden="true" - data-l10n-id="menu-help-feedback-page" - appmenu-data-l10n-id="appmenu-help-feedback-page"/> + data-l10n-id="menu-help-share-ideas" + appmenu-data-l10n-id="appmenu-help-share-ideas"/> <menuitem id="helpSafeMode" oncommand="safeModeRestart();" hidden="true" ===================================== browser/base/content/browser-safebrowsing.js ===================================== @@ -7,6 +7,13 @@ var gSafeBrowsing = { setReportPhishingMenu() { + // tor-browser#18905: hide these menu entries + if ( + !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true) + ) { + return; + } + // In order to detect whether or not we're at the phishing warning // page, we have to check the documentURI instead of the currentURI. // This is because when the DocShell loads an error page, the View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/486cbe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/486cbe… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.0-1] Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr...
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 129b9f62 by Richard Pospesel at 2023-03-02T17:22:43+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - 3 changed files: - + browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/themes/shared/browser-colors.css ===================================== @@ -0,0 +1,97 @@ +:root { + /* photon colors, not all of them are available for whatever reason + in firefox, so here they are */ + + --magenta-50: #ff1ad9; + --magenta-60: #ed00b5; + --magenta-70: #b5007f; + --magenta-80: #7d004f; + --magenta-90: #440027; + + --purple-30: #c069ff; + --purple-40: #ad3bff; + --purple-50: #9400ff; + --purple-60: #8000d7; + --purple-70: #6200a4; + --purple-80: #440071; + --purple-90: #25003e; + + --blue-40: #45a1ff; + --blue-50: #0a84ff; + --blue-50-a30: rgba(10, 132, 255, 0.3); + --blue-60: #0060df; + --blue-70: #003eaa; + --blue-80: #002275; + --blue-90: #000f40; + + --teal-50: #00feff; + --teal-60: #00c8d7; + --teal-70: #008ea4; + --teal-80: #005a71; + --teal-90: #002d3e; + + --green-50: #30e60b; + --green-60: #12bc00; + --green-70: #058b00; + --green-80: #006504; + --green-90: #003706; + + --yellow-50: #ffe900; + --yellow-60: #d7b600; + --yellow-70: #a47f00; + --yellow-80: #715100; + --yellow-90: #3e2800; + + --red-50: #ff0039; + --red-60: #d70022; + --red-70: #a4000f; + --red-80: #5a0002; + --red-90: #3e0200; + + --orange-50: #ff9400; + --orange-60: #d76e00; + --orange-70: #a44900; + --orange-80: #712b00; + --orange-90: #3e1300; + + --grey-10: #f9f9fa; + --grey-10-a10: rgba(249, 249, 250, 0.1); + --grey-10-a20: rgba(249, 249, 250, 0.2); + --grey-10-a40: rgba(249, 249, 250, 0.4); + --grey-10-a60: rgba(249, 249, 250, 0.6); + --grey-10-a80: rgba(249, 249, 250, 0.8); + --grey-20: #ededf0; + --grey-30: #d7d7db; + --grey-40: #b1b1b3; + --grey-50: #737373; + --grey-60: #4a4a4f; + --grey-70: #38383d; + --grey-80: #2a2a2e; + --grey-90: #0c0c0d; + --grey-90-a05: rgba(12, 12, 13, 0.05); + --grey-90-a10: rgba(12, 12, 13, 0.1); + --grey-90-a20: rgba(12, 12, 13, 0.2); + --grey-90-a30: rgba(12, 12, 13, 0.3); + --grey-90-a40: rgba(12, 12, 13, 0.4); + --grey-90-a50: rgba(12, 12, 13, 0.5); + --grey-90-a60: rgba(12, 12, 13, 0.6); + --grey-90-a70: rgba(12, 12, 13, 0.7); + --grey-90-a80: rgba(12, 12, 13, 0.8); + --grey-90-a90: rgba(12, 12, 13, 0.9); + + --ink-70: #363959; + --ink-80: #202340; + --ink-90: #0f1126; + + --white-100: #ffffff; + + /* TODO: Switch to some Firefox variable, once Mozilla adds one for this + color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ + --warning-color: #ffa436; +} + +@media (prefers-color-scheme: dark) { + :root { + --warning-color: #ffbd4f; + } +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -21,6 +21,7 @@ @import url("chrome://browser/skin/ctrlTab.css"); @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); +@import url("chrome://browser/skin/browser-colors.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/129b9f6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/129b9f6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] 6 commits: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: ab9dccd4 by Richard Pospesel at 2023-03-02T12:46:22+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41659: Add canonical color definitions to base-browser - commit removes tor-styles.css browser.xhtml so that the base-browser rebase applies correctly - - - - - 60e29559 by Richard Pospesel at 2023-03-02T16:54:12+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - eaf290eb by Richard Pospesel at 2023-03-02T16:54:12+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41659: Add canonical color definitions to base-browser - backout the tor-styles.inc.css additions - add tor-styles.css to browser-shared.css which is included everywhere - - - - - b05238e4 by Richard Pospesel at 2023-03-02T16:54:13+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 41659: Add canonical color definitions to base-browser - - - - - 0e2be626 by Richard Pospesel at 2023-03-02T16:54:13+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41659: Add canonical color definitions to base-browser - - - - - 486cbe1f by Richard Pospesel at 2023-03-02T16:54:13+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41659: Add canonical color definitions to base-browser - - - - - 13 changed files: - browser/base/content/browser.xhtml - browser/branding/alpha/content/jar.mn - browser/branding/alpha/content/tor-styles.css - browser/branding/nightly/content/jar.mn - browser/branding/nightly/content/tor-styles.css - browser/branding/official/content/jar.mn - browser/branding/official/content/tor-styles.css - browser/components/onionservices/content/authPreferences.css - browser/components/torconnect/content/aboutTorConnect.css - browser/components/torpreferences/content/torPreferences.css - browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -10,7 +10,6 @@ override rules using selectors with the same specificity. This applies to both "content" and "skin" packages, which bug 1385444 will unify later. --> <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> -<?xml-stylesheet href="chrome://branding/content/tor-styles.css" type="text/css"?> <!-- While these stylesheets are defined in Toolkit, they are only used in the main browser window, so we can load them here. Bug 1474241 is on file to ===================================== browser/branding/alpha/content/jar.mn ===================================== @@ -20,4 +20,4 @@ browser.jar: content/branding/icon512.png (../default512.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/alpha/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--teal-70); ===================================== browser/branding/nightly/content/jar.mn ===================================== @@ -19,4 +19,4 @@ browser.jar: content/branding/icon512.png (../default512.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/nightly/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--blue-60); ===================================== browser/branding/official/content/jar.mn ===================================== @@ -19,4 +19,4 @@ browser.jar: content/branding/icon512.png (../default512.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/official/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--purple-60); ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -1,6 +1,6 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); #torOnionServiceKeys-overview-container { margin-right: 30px; @@ -19,6 +19,6 @@ margin-right: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); visibility: hidden; } ===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -2,7 +2,7 @@ /* Copyright (c) 2021, The Tor Project, Inc. */ @import url("chrome://browser/skin/error-pages.css"); -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); :root { --onion-opacity: 1; @@ -305,5 +305,5 @@ body { .title.location { background-image: url("chrome://browser/content/torconnect/connection-location.svg"); - stroke: var(--torbrowser-warning); + stroke: var(--warning-color); } ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1,4 +1,5 @@ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); + #category-connection > .category-icon { list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg"); @@ -170,7 +171,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { #torPreferences-status-internet-statusIcon.offline, #torPreferences-status-tor-statusIcon:not(.connected) { list-style-image: url("chrome://global/skin/icons/warning.svg"); - fill: var(--torbrowser-warning); + fill: var(--warning-color); } #torPreferences-status-tor-statusIcon.blocked { @@ -557,7 +558,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { image#torPreferences-requestBridge-errorIcon { list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); } groupbox#torPreferences-bridges-group textarea { ===================================== browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css ===================================== @@ -87,11 +87,11 @@ /* TODO: Switch to some Firefox variable, once Mozilla adds one for this color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --torbrowser-warning: #ffa436; + --warning-color: #ffa436; } @media (prefers-color-scheme: dark) { :root { - --torbrowser-warning: #ffbd4f; + --warning-color: #ffbd4f; } -} +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,6 +23,8 @@ @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/torconnect-urlbar.css"); @import url("chrome://browser/skin/onionlocation.css"); +@import url("chrome://browser/skin/browser-colors.css"); +@import url("chrome://branding/content/tor-styles.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0a12a5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0a12a5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr...
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 7d26a0ae by Richard Pospesel at 2023-03-02T17:19:05+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - 3 changed files: - + browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/themes/shared/browser-colors.css ===================================== @@ -0,0 +1,97 @@ +:root { + /* photon colors, not all of them are available for whatever reason + in firefox, so here they are */ + + --magenta-50: #ff1ad9; + --magenta-60: #ed00b5; + --magenta-70: #b5007f; + --magenta-80: #7d004f; + --magenta-90: #440027; + + --purple-30: #c069ff; + --purple-40: #ad3bff; + --purple-50: #9400ff; + --purple-60: #8000d7; + --purple-70: #6200a4; + --purple-80: #440071; + --purple-90: #25003e; + + --blue-40: #45a1ff; + --blue-50: #0a84ff; + --blue-50-a30: rgba(10, 132, 255, 0.3); + --blue-60: #0060df; + --blue-70: #003eaa; + --blue-80: #002275; + --blue-90: #000f40; + + --teal-50: #00feff; + --teal-60: #00c8d7; + --teal-70: #008ea4; + --teal-80: #005a71; + --teal-90: #002d3e; + + --green-50: #30e60b; + --green-60: #12bc00; + --green-70: #058b00; + --green-80: #006504; + --green-90: #003706; + + --yellow-50: #ffe900; + --yellow-60: #d7b600; + --yellow-70: #a47f00; + --yellow-80: #715100; + --yellow-90: #3e2800; + + --red-50: #ff0039; + --red-60: #d70022; + --red-70: #a4000f; + --red-80: #5a0002; + --red-90: #3e0200; + + --orange-50: #ff9400; + --orange-60: #d76e00; + --orange-70: #a44900; + --orange-80: #712b00; + --orange-90: #3e1300; + + --grey-10: #f9f9fa; + --grey-10-a10: rgba(249, 249, 250, 0.1); + --grey-10-a20: rgba(249, 249, 250, 0.2); + --grey-10-a40: rgba(249, 249, 250, 0.4); + --grey-10-a60: rgba(249, 249, 250, 0.6); + --grey-10-a80: rgba(249, 249, 250, 0.8); + --grey-20: #ededf0; + --grey-30: #d7d7db; + --grey-40: #b1b1b3; + --grey-50: #737373; + --grey-60: #4a4a4f; + --grey-70: #38383d; + --grey-80: #2a2a2e; + --grey-90: #0c0c0d; + --grey-90-a05: rgba(12, 12, 13, 0.05); + --grey-90-a10: rgba(12, 12, 13, 0.1); + --grey-90-a20: rgba(12, 12, 13, 0.2); + --grey-90-a30: rgba(12, 12, 13, 0.3); + --grey-90-a40: rgba(12, 12, 13, 0.4); + --grey-90-a50: rgba(12, 12, 13, 0.5); + --grey-90-a60: rgba(12, 12, 13, 0.6); + --grey-90-a70: rgba(12, 12, 13, 0.7); + --grey-90-a80: rgba(12, 12, 13, 0.8); + --grey-90-a90: rgba(12, 12, 13, 0.9); + + --ink-70: #363959; + --ink-80: #202340; + --ink-90: #0f1126; + + --white-100: #ffffff; + + /* TODO: Switch to some Firefox variable, once Mozilla adds one for this + color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ + --warning-color: #ffa436; +} + +@media (prefers-color-scheme: dark) { + :root { + --warning-color: #ffbd4f; + } +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -21,6 +21,7 @@ @import url("chrome://browser/skin/ctrlTab.css"); @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); +@import url("chrome://browser/skin/browser-colors.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7d26a0a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7d26a0a… You're receiving this email because of your account on gitlab.torproject.org.

1 0