September 2022 - tor-commits - lists.torproject.org

[builders/tor-browser-build] branch main updated: Update rbm for rbm#40010 and rbm#40009
by gitolite role 20 Sep '22

20 Sep '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 97cd534 Update rbm for rbm#40010 and rbm#40009 97cd534 is described below commit 97cd534bb5aecbd087b5b17fcf822d0fbc8d19af Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Tue Sep 20 11:49:52 2022 +0200 Update rbm for rbm#40010 and rbm#40009 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index c485326..8ed3aa1 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit c48532692f8c5a412da891b3d43bd46a24cd179e +Subproject commit 8ed3aa1c0b65c711947df2f0d483215510514253 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch master updated (c485326 -> 8ed3aa1)
by gitolite role 20 Sep '22

20 Sep '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/rbm. from c485326 Bug 40043: container: add rbm to /etc/hosts by default add e7b453d Bug 40009: Add git_depth option add 8ed3aa1 Bug 40010: Add git_branch option No new revisions were added by this update. Summary of changes: doc/options_tar.asc | 11 +++++++++++ lib/RBM.pm | 29 ++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/rbm] branch main updated (c485326 -> 8ed3aa1)
by gitolite role 20 Sep '22

20 Sep '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch main in repository builders/rbm. from c485326 Bug 40043: container: add rbm to /etc/hosts by default new e7b453d Bug 40009: Add git_depth option new 8ed3aa1 Bug 40010: Add git_branch option The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/options_tar.asc | 11 +++++++++++ lib/RBM.pm | 29 ++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 updated: Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.2.0esr-12.0-3 by this push: new 22b494ed36131 Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass 22b494ed36131 is described below commit 22b494ed36131f2195cae9b11fc0772cf2b500e9 Author: Dan Ballard <dan(a)mindstab.net> AuthorDate: Tue Sep 6 11:34:24 2022 -0700 Bug 41125: stop proxy bypass in ServiceRequest.fetch by gating with checking MOZ_PROXY_BYPASS_PROTECTION and network.proxy.allow_bypass --- services/settings/Utils.jsm | 3 +++ toolkit/modules/AppConstants.jsm | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm index 31ad77d28678a..bab0e078ea14e 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm @@ -220,6 +220,9 @@ var Utils = { function fallbackOrReject(err) { if ( // At most one recursive Utils.fetch call (bypassProxy=false to true). + // if allowed by network.proxy.allow_bypass + AppConstants.MOZ_PROXY_BYPASS_PROTECTION || + !Services.prefs.getBoolPref("network.proxy.allow_bypass", false) || bypassProxy || Services.startup.shuttingDown || Utils.isOffline || diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 64695e4c996d6..3ebe8b69bfdc2 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -482,6 +482,13 @@ this.AppConstants = Object.freeze({ false, #endif + MOZ_PROXY_BYPASS_PROTECTION: +#ifdef MOZ_PROXY_BYPASS_PROTECTION + true, +#else + false, +#endif + // Returns true for CN region build when distibution id set as 'MozillaOnline' isChinaRepack() { return ( -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40624: Use port 80 for placeholder bridge addresses.
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 55f8975 Bug 40624: Use port 80 for placeholder bridge addresses. 55f8975 is described below commit 55f89756330a060cc65456000acf75226c545a42 Author: David Fifield <david(a)bamsoftware.com> AuthorDate: Wed Sep 14 21:57:14 2022 -0600 Bug 40624: Use port 80 for placeholder bridge addresses. This makes meek-azure and Snowflake work when "This computer goes through a firewall that only allows connections to certain ports" is set. https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- projects/common/bridges_list.meek-azure.txt | 2 +- projects/common/bridges_list.snowflake.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/common/bridges_list.meek-azure.txt b/projects/common/bridges_list.meek-azure.txt index 14de202..ca46158 100644 --- a/projects/common/bridges_list.meek-azure.txt +++ b/projects/common/bridges_list.meek-azure.txt @@ -1 +1 @@ -meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +meek_lite 192.0.2.2:80 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com diff --git a/projects/common/bridges_list.snowflake.txt b/projects/common/bridges_list.snowflake.txt index a3266fd..99a6904 100644 --- a/projects/common/bridges_list.snowflake.txt +++ b/projects/common/bridges_list.snowflake.txt @@ -1 +1 @@ -snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72 +snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 updated: Bug 41116: Normalize system fonts.
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.2.0esr-12.0-3 by this push: new 582fab63ef3b9 Bug 41116: Normalize system fonts. 582fab63ef3b9 is described below commit 582fab63ef3b94801cc9f53fefc5e4e25988e29e Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Sep 19 12:57:40 2022 +0200 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. --- widget/nsXPLookAndFeel.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp index 3cc2c561dbc54..8791038a2a3f0 100644 --- a/widget/nsXPLookAndFeel.cpp +++ b/widget/nsXPLookAndFeel.cpp @@ -1000,6 +1000,17 @@ widget::LookAndFeelFont nsXPLookAndFeel::StyleToLookAndFeelFont( bool nsXPLookAndFeel::GetFontValue(FontID aID, nsString& aName, gfxFontStyle& aStyle) { + if (nsContentUtils::ShouldResistFingerprinting()) { +#ifdef XP_MACOSX + aName = u"-apple-system"_ns; +#else + aName = u"sans-serif"_ns; +#endif + aStyle = gfxFontStyle(); + aStyle.size = 12; + return true; + } + if (const LookAndFeelFont* cached = sFontCache.Get(aID)) { return LookAndFeelFontToStyle(*cached, aName, aStyle); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 updated (ff839fde49f3c -> cd000078e5f91)
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. from ff839fde49f3c fixup! Bug 40925: Implemented the Security Level component new f6a93bb092169 fixup! Bug 40926: Implemented the New Identity feature new cd000078e5f91 fixup! Bug 40925: Implemented the Security Level component The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../components/newidentity/content/newidentity.js | 24 ++++----- .../securitylevel/content/securityLevel.js | 58 ++++++++++------------ 2 files changed, 38 insertions(+), 44 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 updated: fixup! Bug 40925: Implemented the Security Level component
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.2.0esr-12.0-3 by this push: new ff839fde49f3c fixup! Bug 40925: Implemented the Security Level component ff839fde49f3c is described below commit ff839fde49f3c2d2581eda496b5bc8b4a3e60bdb Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Thu Sep 8 12:19:08 2022 +0100 fixup! Bug 40925: Implemented the Security Level component Clean up stray security level fluent ids with no associated string. --- .../components/securitylevel/content/securityLevelButton.inc.xhtml | 4 +--- .../components/securitylevel/content/securityLevelPanel.inc.xhtml | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevelButton.inc.xhtml b/browser/components/securitylevel/content/securityLevelButton.inc.xhtml index 2ca8fcde945c1..96ee1ec0ca499 100644 --- a/browser/components/securitylevel/content/securityLevelButton.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelButton.inc.xhtml @@ -4,6 +4,4 @@ onmousedown="SecurityLevelButton.onCommand(event);" onkeypress="SecurityLevelButton.onCommand(event);" closemenu="none" - cui-areatype="toolbar" - data-l10n-id="security-level-button" - /> + cui-areatype="toolbar"/> diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index 0347ab5e70854..c485f819aba92 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -34,11 +34,9 @@ </hbox> </vbox> <hbox class="panel-footer"> - <button id="securityLevel-restoreDefaults" - data-l10n-id="security-level-restore-defaults"/> + <button id="securityLevel-restoreDefaults"/> <button id="securityLevel-advancedSecuritySettings" - default="true" - data-l10n-id="security-level-change"/> + default="true"/> </hbox> </vbox> </panelview> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch geckoview-102.2.0esr-12.0-1 updated: Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch geckoview-102.2.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/geckoview-102.2.0esr-12.0-1 by this push: new b2c2c5f22bc06 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser b2c2c5f22bc06 is described below commit b2c2c5f22bc06df13ca02ae28e7cfcfcfa05e38f Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Aug 1 17:56:45 2022 +0000 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser --- .gitignore | 3 ++ tools/torbrowser/Makefile | 44 ++++++++++++++++++++++++++ tools/torbrowser/bridges.js | 77 +++++++++++++++++++++++++++++++++++++++++++++ tools/torbrowser/build.sh | 7 +++++ tools/torbrowser/clobber.sh | 6 ++++ tools/torbrowser/config.sh | 6 ++++ tools/torbrowser/deploy.sh | 23 ++++++++++++++ tools/torbrowser/fetch.sh | 30 ++++++++++++++++++ tools/torbrowser/ide.sh | 7 +++++ tools/torbrowser/jslint.sh | 7 +++++ 10 files changed, 210 insertions(+) diff --git a/.gitignore b/.gitignore index b409ec583766d..b2b8b720c1787 100644 --- a/.gitignore +++ b/.gitignore @@ -193,3 +193,6 @@ config/external/icu4x # Ignore Storybook generated files browser/components/storybook/node_modules/ browser/components/storybook/storybook-static/ + +# Ignore binary base of tor browser +.binaries diff --git a/tools/torbrowser/Makefile b/tools/torbrowser/Makefile new file mode 100644 index 0000000000000..92650151560ec --- /dev/null +++ b/tools/torbrowser/Makefile @@ -0,0 +1,44 @@ +.DEFAULT_GOAL := all + +# https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… +mkfile_path := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) + +DEV_ROOT = $(mkfile_path)/../.. +BINARIES = $(DEV_ROOT)/.binaries +BUILD_OUTPUT = $(DEV_ROOT)/obj-x86_64-pc-linux-gnu + +config: + ./config.sh $(DEV_ROOT) + +ide-vscode: + ./ide.sh vscode $(DEV_ROOT) + +ide-eclipse: + ./ide.sh eclipse $(DEV_ROOT) + +ide-visualstudio: + ./ide.sh visualstudio $(DEV_ROOT) + +fetch: + ./fetch.sh $(BINARIES) + +build: + ./build.sh $(DEV_ROOT) + +deploy: + ./deploy.sh $(BINARIES) $(BUILD_OUTPUT) + +all: build deploy + +run: + $(BINARIES)/dev/Browser/start-tor-browser -v + +jslint: + ./jslint.sh $(DEV_ROOT) $(JS) + +clobber: + ./clobber.sh $(DEV_ROOT) + +clean: + rm -rf $(BUILD_OUTPUT) + diff --git a/tools/torbrowser/bridges.js b/tools/torbrowser/bridges.js new file mode 100644 index 0000000000000..e8f11a36c401d --- /dev/null +++ b/tools/torbrowser/bridges.js @@ -0,0 +1,77 @@ +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); + +// Default bridges. +pref( + "extensions.torlauncher.default_bridge.obfs4.1", + "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.2", + "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.3", + "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.4", + "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.5", + "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.6", + "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.7", + "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.8", + "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.9", + "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.10", + "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.11", + "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.12", + "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.13", + "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.14", + "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.15", + "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.16", + "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" +); + +pref( + "extensions.torlauncher.default_bridge.meek-azure.1", + "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.1", + "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" +); diff --git a/tools/torbrowser/build.sh b/tools/torbrowser/build.sh new file mode 100755 index 0000000000000..e53dbc5000bc7 --- /dev/null +++ b/tools/torbrowser/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 + +cd $DEV_ROOT +./mach build +./mach build stage-package diff --git a/tools/torbrowser/clobber.sh b/tools/torbrowser/clobber.sh new file mode 100755 index 0000000000000..5073454b23c10 --- /dev/null +++ b/tools/torbrowser/clobber.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 + +cd $DEV_ROOT +./mach clobber diff --git a/tools/torbrowser/config.sh b/tools/torbrowser/config.sh new file mode 100755 index 0000000000000..d353119613792 --- /dev/null +++ b/tools/torbrowser/config.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 + +cd $DEV_ROOT +./mach configure diff --git a/tools/torbrowser/deploy.sh b/tools/torbrowser/deploy.sh new file mode 100755 index 0000000000000..9f2ebd58cbe3a --- /dev/null +++ b/tools/torbrowser/deploy.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e +BINARIES=$1 +BUILD_OUTPUT=$2 + +SCRIPT_DIR=$(realpath "$(dirname "$0")") + +# Add built-in bridges +mkdir -p $BUILD_OUTPUT/_omni/defaults/preferences +cat $BUILD_OUTPUT/dist/bin/browser/defaults/preferences/000-tor-browser.js $SCRIPT_DIR/bridges.js >> $BUILD_OUTPUT/_omni/defaults/preferences/000-tor-browser.js +cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja defaults/preferences/000-tor-browser.js +rm -rf $BUILD_OUTPUT/_omni + +# Repackage the manual +# rm -rf $BUILD_OUTPUT/_omni +# mkdir $BUILD_OUTPUT/_omni +# unzip $BINARIES/dev/Browser/browser/omni.ja -d $BUILD_OUTPUT/_omni +# cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja chrome/browser/content/browser/manual +# rm -rf $BUILD_OUTPUT/_omni + +# copy binaries +cp -r $BUILD_OUTPUT/dist/firefox/* $BINARIES/dev/Browser +rm -rf $BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache diff --git a/tools/torbrowser/fetch.sh b/tools/torbrowser/fetch.sh new file mode 100755 index 0000000000000..5b5c627c0c343 --- /dev/null +++ b/tools/torbrowser/fetch.sh @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +BINARIES_DIR=$1 + +# download the current downloads.json +wget https://aus1.torproject.org/torbrowser/update_3/alpha/downloads.json +# get url for latest alpha linux en_US package +TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+") +TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_en-US.tar.xz" +TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" + +# remove download manifest +rm downloads.json + +# clear out previous tor-browser and previous package +rm -rf "${BINARIES_DIR}/dev" +rm -f "${TOR_BROWSER_PACKAGE}" + +# download +rm -f "${TOR_BROWSER_PACKAGE}" +wget "${TOR_BROWSER_PACKAGE_URL}" +mkdir -p "${BINARIES_DIR}" + +# and extract +tar -xf ${TOR_BROWSER_PACKAGE} -C "${BINARIES_DIR}" +mv "${BINARIES_DIR}/tor-browser_en-US" "${BINARIES_DIR}/dev" + +# cleanup +rm -f "${TOR_BROWSER_PACKAGE}" diff --git a/tools/torbrowser/ide.sh b/tools/torbrowser/ide.sh new file mode 100755 index 0000000000000..5da0c670d8c5b --- /dev/null +++ b/tools/torbrowser/ide.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +IDE=$1 +DEV_ROOT=$2 + +cd $DEV_ROOT +./mach ide $IDE diff --git a/tools/torbrowser/jslint.sh b/tools/torbrowser/jslint.sh new file mode 100755 index 0000000000000..be1016275c289 --- /dev/null +++ b/tools/torbrowser/jslint.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +JS_FILE=$2 + +cd $DEV_ROOT +./mach lint -l eslint --fix $JS_FILE -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40621: Update namecoin patches for linted TorButton
by gitolite role 09 Sep '22

09 Sep '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new fc1170e Bug 40621: Update namecoin patches for linted TorButton fc1170e is described below commit fc1170e5d97b02f2da5bd938edf42ee7396b53b3 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Wed Sep 7 16:39:54 2022 +0200 Bug 40621: Update namecoin patches for linted TorButton --- projects/firefox/namecoin-torbutton.patch | 198 ++++++++++++++++-------------- 1 file changed, 103 insertions(+), 95 deletions(-) diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch index 4e92628..c923d68 100644 --- a/projects/firefox/namecoin-torbutton.patch +++ b/projects/firefox/namecoin-torbutton.patch @@ -1,8 +1,8 @@ diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js -index d6034384..120d32a0 100644 +index e4b5ceea..fb0b8fc9 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js -@@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(), +@@ -58,7 +58,11 @@ let createTorCircuitDisplay = (function() { knownCircuitIDs = new Map(), // A mutable map that records the SOCKS credentials for the // latest channels for each browser + domain. @@ -13,112 +13,120 @@ index d6034384..120d32a0 100644 + // A mutable map from .bit[.onion] domains to .onion domains. + bitToOnionMap = {}; - // __trimQuotes(s)__. - // Removes quotation marks around a quoted string. -@@ -132,6 +136,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { - return null; - }; + // __trimQuotes(s)__. + // Removes quotation marks around a quoted string. +@@ -153,6 +157,28 @@ let createTorCircuitDisplay = (function() { + return null; + }; -+// __collectBitTargets(aContoller)__. -+// Watches for STREAM NEW events. When a NEW event occurs, we will see -+// the stream's target domain. If that target is a .bit domain, then -+// we want to be sure to record this so we can later record if it is -+// remapped to a .onion domain. -+let collectBitTargets = function (aController) { -+ return aController.watchEvent( -+ "STREAM", -+ streamEvent => streamEvent.StreamStatus === "NEW", -+ async (streamEvent) => { -+ logger.eclog(3, "new streamEvent:" + JSON.stringify(streamEvent)); -+ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { -+ let targetDomain = streamEvent.Target.split(":")[0]; -+ if (targetDomain.endsWith(".bit") || -+ targetDomain.endsWith(".bit.onion")) { -+ bitTargets[streamEvent.StreamID] = Services.eTLD.getBaseDomainFromHost(targetDomain); -+ logger.eclog(3, "stream on .bit domain: " + targetDomain); ++ // __collectBitTargets(aContoller)__. ++ // Watches for STREAM NEW events. When a NEW event occurs, we will see ++ // the stream's target domain. If that target is a .bit domain, then ++ // we want to be sure to record this so we can later record if it is ++ // remapped to a .onion domain. ++ let collectBitTargets = function (aController) { ++ return aController.watchEvent( ++ "STREAM", ++ streamEvent => streamEvent.StreamStatus === "NEW", ++ async (streamEvent) => { ++ logger.eclog(3, "new streamEvent:" + JSON.stringify(streamEvent)); ++ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { ++ let targetDomain = streamEvent.Target.split(":")[0]; ++ if (targetDomain.endsWith(".bit") || ++ targetDomain.endsWith(".bit.onion")) { ++ bitTargets[streamEvent.StreamID] = Services.eTLD.getBaseDomainFromHost(targetDomain); ++ logger.eclog(3, "stream on .bit domain: " + targetDomain); ++ } + } -+ } -+ }); -+}; ++ }); ++ }; + - // __collectIsolationData(aController, updateUI)__. - // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then - // we assume isolation settings (SOCKS username+password) are now fixed for the -@@ -145,6 +171,15 @@ let collectIsolationData = function (aController, updateUI) { - "STREAM", - streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - async (streamEvent) => { -+ logger.eclog(3, "sentconnect streamEvent:" + JSON.stringify(streamEvent)); -+ // Collect any stream target that might be an onion. -+ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { -+ let targetDomain = streamEvent.Target.split(":")[0]; -+ if (targetDomain.endsWith(".onion")) { -+ bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; -+ logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); + // __collectIsolationData(aController, updateUI)__. + // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then + // we assume isolation settings (SOCKS username+password) are now fixed for the +@@ -166,6 +192,15 @@ let createTorCircuitDisplay = (function() { + "STREAM", + streamEvent => streamEvent.StreamStatus === "SENTCONNECT", + async streamEvent => { ++ logger.eclog(3, "sentconnect streamEvent:" + JSON.stringify(streamEvent)); ++ // Collect any stream target that might be an onion. ++ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { ++ let targetDomain = streamEvent.Target.split(":")[0]; ++ if (targetDomain.endsWith(".onion")) { ++ bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; ++ logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); ++ } + } -+ } - if (!knownCircuitIDs.get(streamEvent.CircuitID)) { - logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); - knownCircuitIDs.set(streamEvent.CircuitID, true); -@@ -312,7 +347,9 @@ let updateCircuitDisplay = function () { - } + if (!knownCircuitIDs.get(streamEvent.CircuitID)) { + logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); + knownCircuitIDs.set(streamEvent.CircuitID, true); +@@ -367,7 +402,9 @@ let createTorCircuitDisplay = (function() { + } - let domainParts = []; -- if (domain.endsWith(".onion")) { -+ logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); -+ let mappedOnion = bitToOnionMap[domain]; -+ if (domain.endsWith(".onion") || mappedOnion) { - for (let i = 0; i < 3; ++i) { - li(uiString("relay")); + let domainParts = []; +- if (domain.endsWith(".onion")) { ++ logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); ++ let mappedOnion = bitToOnionMap[domain]; ++ if (domain.endsWith(".onion") || mappedOnion) { + for (let i = 0; i < 3; ++i) { + li(uiString("relay")); + } +@@ -380,28 +417,32 @@ let createTorCircuitDisplay = (function() { + domainParts.push(domain); } -@@ -325,24 +362,28 @@ let updateCircuitDisplay = function () { - domainParts.push(domain); - } -- // We use a XUL html:span element so that the tooltiptext is displayed. -- li([ -- "html:span", -- { -- class: "circuit-onion", -- onclick: ` +- // We use a XUL html:span element so that the tooltiptext is displayed. +- li([ +- "html:span", +- { +- class: "circuit-onion", +- onclick: ` - this.classList.add("circuit-onion-copied"); - Cc[ - "@mozilla.org/widget/clipboardhelper;1" - ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) - `, -- "data-onion": domain, -- "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), -- "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), -- tooltiptext: domain, -- }, -- ...domainParts, -- ]); -+ if (mappedOnion) { -+ li(domain, " ", ["span", { class: "circuit-ip-address" }, mappedOnion]); -+ } else { -+ // We use a XUL html:span element so that the tooltiptext is displayed. -+ li([ -+ "html:span", -+ { -+ class: "circuit-onion", -+ onclick: ` +- "data-onion": domain, +- "data-text-clicktocopy": torbutton_get_property_string( +- "torbutton.circuit_display.click_to_copy" +- ), +- "data-text-copied": torbutton_get_property_string( +- "torbutton.circuit_display.copied" +- ), +- tooltiptext: domain, +- }, +- ...domainParts, +- ]); ++ if (mappedOnion) { ++ li(domain, " ", ["span", { class: "circuit-ip-address" }, mappedOnion]); ++ } else { ++ // We use a XUL html:span element so that the tooltiptext is displayed. ++ li([ ++ "html:span", ++ { ++ class: "circuit-onion", ++ onclick: ` + this.classList.add("circuit-onion-copied"); + Cc[ + "@mozilla.org/widget/clipboardhelper;1" + ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) + `, -+ "data-onion": domain, -+ "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), -+ "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), -+ tooltiptext: domain, -+ }, -+ ...domainParts, -+ ]); -+ } ++ "data-onion": domain, ++ "data-text-clicktocopy": torbutton_get_property_string( ++ "torbutton.circuit_display.click_to_copy" ++ ), ++ "data-text-copied": torbutton_get_property_string( ++ "torbutton.circuit_display.copied" ++ ), ++ tooltiptext: domain, ++ }, ++ ...domainParts, ++ ]); ++ } - // Hide the note about guards if we are using a bridge. - document.getElementById("circuit-guard-note-container").style.display = -@@ -454,6 +495,7 @@ let setupDisplay = function (enablePrefName) { + // Hide the note about guards if we are using a bridge. + document.getElementById("circuit-guard-note-container").style.display = +@@ -534,6 +575,7 @@ let createTorCircuitDisplay = (function() { stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, stopEnsuringCorrectPopupDimensions = null, @@ -126,7 +134,7 @@ index d6034384..120d32a0 100644 stop = function() { syncDisplayWithSelectedTab(false); if (myController) { -@@ -466,6 +508,9 @@ let setupDisplay = function (enablePrefName) { +@@ -546,6 +588,9 @@ let createTorCircuitDisplay = (function() { if (stopEnsuringCorrectPopupDimensions) { stopEnsuringCorrectPopupDimensions(); } @@ -136,11 +144,11 @@ index d6034384..120d32a0 100644 myController = null; } }, -@@ -474,6 +519,7 @@ let setupDisplay = function (enablePrefName) { +@@ -554,6 +599,7 @@ let createTorCircuitDisplay = (function() { try { myController = await wait_for_controller(); syncDisplayWithSelectedTab(true); + stopCollectingBitTargets = collectBitTargets(myController); - stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); - stopCollectingBrowserCredentials = collectBrowserCredentials(); - stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); + stopCollectingIsolationData = collectIsolationData( + myController, + updateCircuitDisplay -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0