- tbb-commits - lists.torproject.org

[Git][tpo/applications/android-components][android-components-102.0.14-12.0-1] squash! Add support for new GeckoView interfaces
by Pier Angelo Vendrame (＠pierov) 26 Oct '22

26 Oct '22

Pier Angelo Vendrame pushed to branch android-components-102.0.14-12.0-1 at The Tor Project / Applications / android-components Commits: 43499dfb by Pier Angelo Vendrame at 2022-10-26T10:46:22+02:00 squash! Add support for new GeckoView interfaces Bug 41394: Expose privacy.prioritizeonions.enabled to Android. - - - - - 2 changed files: - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt Changes: ===================================== components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -741,6 +741,13 @@ class GeckoEngine( localeUpdater.updateValue() } } + override var prioritizeOnions: Boolean + get() = runtime.settings.prioritizeOnions + set(value) { + value.let { + runtime.settings.prioritizeOnions = it + } + } }.apply { defaultSettings?.let { this.javascriptEnabled = it.javascriptEnabled @@ -762,6 +769,7 @@ class GeckoEngine( this.httpsOnlyMode = it.httpsOnlyMode this.torSecurityLevel = it.torSecurityLevel this.spoofEnglish = it.spoofEnglish + this.prioritizeOnions = it.prioritizeOnions } } ===================================== components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt ===================================== @@ -196,6 +196,8 @@ abstract class Settings { open var torSecurityLevel: Int by UnsupportedSetting() open var spoofEnglish: Boolean by UnsupportedSetting() + + open var prioritizeOnions: Boolean by UnsupportedSetting() } /** @@ -235,7 +237,8 @@ data class DefaultSettings( override var enterpriseRootsEnabled: Boolean = false, override var httpsOnlyMode: Engine.HttpsOnlyMode = Engine.HttpsOnlyMode.DISABLED, override var torSecurityLevel: Int = 4, - override var spoofEnglish: Boolean = false + override var spoofEnglish: Boolean = false, + override var prioritizeOnions: Boolean = false ) : Settings() class UnsupportedSetting<T> { View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/commit/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated (f1029024c484 -> d632a5f4cc14)
by gitolite role 26 Oct '22

26 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. from f1029024c484 squash! Bug 2176: Rebrand Firefox to TorBrowser new 21b34a4edcd3 fixup! Bug 40925: Implemented the Security Level component new d632a5f4cc14 fixup! Bug 21952: Implement Onion-Location 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: mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 36 +++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: squash! Bug 2176: Rebrand Firefox to TorBrowser
by gitolite role 26 Oct '22

26 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new f1029024c484 squash! Bug 2176: Rebrand Firefox to TorBrowser f1029024c484 is described below commit f1029024c48454105ec02992f7203341d6cd3be9 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Oct 25 22:06:52 2022 +0000 squash! Bug 2176: Rebrand Firefox to TorBrowser Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one --- browser/branding/alpha/document_pdf.ico | Bin 19994 -> 20011 bytes browser/branding/nightly/document_pdf.ico | Bin 19994 -> 20011 bytes browser/branding/official/document_pdf.ico | Bin 19994 -> 20011 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/alpha/document_pdf.ico b/browser/branding/alpha/document_pdf.ico index d6fe7c5bded9..dc74ba85f69d 100644 Binary files a/browser/branding/alpha/document_pdf.ico and b/browser/branding/alpha/document_pdf.ico differ diff --git a/browser/branding/nightly/document_pdf.ico b/browser/branding/nightly/document_pdf.ico index d6fe7c5bded9..dc74ba85f69d 100644 Binary files a/browser/branding/nightly/document_pdf.ico and b/browser/branding/nightly/document_pdf.ico differ diff --git a/browser/branding/official/document_pdf.ico b/browser/branding/official/document_pdf.ico index d6fe7c5bded9..dc74ba85f69d 100644 Binary files a/browser/branding/official/document_pdf.ico and b/browser/branding/official/document_pdf.ico differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated (5aff5d2b553b -> d176550c5c6e)
by gitolite role 26 Oct '22

26 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. from 5aff5d2b553b Bug 41371: Temporary hack to fix language selector popup position new d2946e519187 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac new d176550c5c6e fixup! Firefox preference overrides. 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: browser/app/profile/001-base-profile.js | 3 +++ browser/base/content/browser-menubar.inc | 3 ++- browser/base/content/browser.js | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: Bug 41371: Temporary hack to fix language selector popup position
by gitolite role 26 Oct '22

26 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 5aff5d2b553b Bug 41371: Temporary hack to fix language selector popup position 5aff5d2b553b is described below commit 5aff5d2b553bbc3e42fc6ae797f8b31d87dffd33 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Thu Oct 20 18:19:28 2022 +0100 Bug 41371: Temporary hack to fix language selector popup position --- browser/components/preferences/main.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index 7586816a0450..eab384264c4e 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -996,6 +996,23 @@ var gMainPane = { gMainPane.onPrimaryBrowserLanguageMenuChange(event); }); + // Temporary hack to cause the menu popup to resize itself just after being + // shown. See tor-browser#41371 + // We get ~one frame of a potentially badly sized popup, and then the popup + // should re-adjust to the new size. + // TODO: Remove with firefox 115 since this is fixed properly in + // mozilla-central 107. + menulist.addEventListener("popupshown", () => { + const popupBox = menulist.menupopup; + // We change a layout parameter and then force a relayout. We choose + // "min-height: 0" since we expect this won't change the displayed result + // but is enough to force the relayout. + const minHeight = popupBox.style.minHeight; + popupBox.style.minHeight = 0; + popupBox.getBoundingClientRect(); + popupBox.style.minHeight = minHeight; + }); + gMainPane.updatePrimaryBrowserLanguageUI(Services.locale.appLocaleAsBCP47); }, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: Bug 40026: FF99 Audit
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new a14adcc Bug 40026: FF99 Audit a14adcc is described below commit a14adccac9ed132242eda7fcae713766c29c8735 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Oct 25 22:47:31 2022 +0000 Bug 40026: FF99 Audit --- audits/FF99_AUDIT | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/audits/FF99_AUDIT b/audits/FF99_AUDIT new file mode 100644 index 0000000..4440553 --- /dev/null +++ b/audits/FF99_AUDIT @@ -0,0 +1,74 @@ +# General + +The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript). + +The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation. + +`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit. + +## Firefox: https://github.com/mozilla/gecko-dev.git + +- Start: `99300ebd4a4a6440b6a11a80108f1ed6d867cdb4` ( `FIREFOX_RELEASE_99_BASE` ) +- End: `cd4dcd48476d8cb29f4770f6fb659e440ff84345` ( `FIREFOX_RELEASE_100_BASE` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +--- + +## Application Services: https://github.com/mozilla/application-services.git + +- Start: `1fcdb5984be6e0cc460d00cde44c49b7e3ac1ec6` ( `v92.0.0` ) +- End: `21f2904245a956366cae798e16035156c8232cad` ( `v93.0.2` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Android Components: https://github.com/mozilla-mobile/android-components.git + +- Start: `4154c161f0949fdf3e94780c8b5ac360722e909c` ( `v99.0.0` ) +- End: `2cf4dbe50f6810d373aeb550e722fabfc6816f56` ( `v99.0.10` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Fenix: https://github.com/mozilla-mobile/fenix.git + +- Start: `f4a5a4e471d17be791d73fddc63ebdfb734368e4` ( `v99.0.0-beta.1` ) +- End: `2421d3731e49faf5e2b9d3d4aa41bdbf3e81459a` ( `releases_v99.0.0` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Ticket Review ## + +### 99 https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=F… + +- https://bugzilla.mozilla.org/show_bug.cgi?id=1755354 @dan https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41138 + - Nothing to do, already disabled by pref +- https://bugzilla.mozilla.org/show_bug.cgi?id=1637922 @richard https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41139 + - Nothing to do, already disabled by pref +- https://bugzilla.mozilla.org/show_bug.cgi?id=1751366 @ma1 https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41140 + - Nothing to do, will investigate backing this out in 12.5 alpha to investigate performance improvements ( opened https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41397 ) +- https://bugzilla.mozilla.org/show_bug.cgi?id=1675054 @dan https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41141 + - Not a security risk, bu discoverd the feature should also likely be enabeld for http .onion domains; opened https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41399 \ No newline at end of file -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: fixup! Firefox preference overrides.
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 7f80a8d34c6c fixup! Firefox preference overrides. 7f80a8d34c6c is described below commit 7f80a8d34c6c9bb0afbc4220faf1266a97bd9763 Author: hackademix <giorgio(a)maone.net> AuthorDate: Tue Oct 25 23:14:12 2022 +0200 fixup! Firefox preference overrides. --- browser/app/profile/001-base-profile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index 304f0668b433..3be1024d8a34 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -199,6 +199,7 @@ pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("privacy.resistFingerprinting", true); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API +pref("dom.webmidi.enabled", false); // Bug 41398: Disable Web MIDI API pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now -- 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 40663: Do not ship bookmarks anymore
by gitolite role 25 Oct '22

25 Oct '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 90369475 Bug 40663: Do not ship bookmarks anymore 90369475 is described below commit 903694759483d9b4f59b5f9cc8193874ce46167d Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Oct 25 16:29:21 2022 +0200 Bug 40663: Do not ship bookmarks anymore We now ship them in tor-browser/firefox, instead. --- .../Data/Browser/profile.default/bookmarks.html | 22 ---------------------- .../Data/Browser/profile.default/bookmarks.html | 22 ---------------------- .../Data/Browser/profile.default/bookmarks.html | 22 ---------------------- projects/browser/build | 22 ---------------------- 4 files changed, 88 deletions(-) diff --git a/projects/browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html b/projects/browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html deleted file mode 100644 index 3181e203..00000000 --- a/projects/browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1>Bookmarks</H1> - -<DL><p> - <DT><H3>Tor Project Bookmarks</H3> -<DD>Helpful bookmarks from the Tor Project - <DL><p> - <DT><A HREF="http://2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="http://pzhdfe7jraknpj2qgu5cz2u3i4deuyfwmonvzu5i3nyw4t4bmg7o5pad.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="http://rzuwtpc4wb3xdzrj3yeajsvm3fkq4vbeubm2tdxaqruzzzgs5dwemlad.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="about:manual" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A// [...] - <DT><A HREF="http://xmrhfasfg5suueegrnc4gsgyi2tyclcy5oz7f5drnrodmdtob6t2ioyd.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="https://donate.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/ [...] - <DT><A HREF="http://yq5jjvr7drkjrelzhut7kgclfuro65jjlivyzfmxiq2kyv5lickrl4qd.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - </DL><p> - <HR> -</DL><p> diff --git a/projects/browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html b/projects/browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html deleted file mode 100644 index 3181e203..00000000 --- a/projects/browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1>Bookmarks</H1> - -<DL><p> - <DT><H3>Tor Project Bookmarks</H3> -<DD>Helpful bookmarks from the Tor Project - <DL><p> - <DT><A HREF="http://2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="http://pzhdfe7jraknpj2qgu5cz2u3i4deuyfwmonvzu5i3nyw4t4bmg7o5pad.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="http://rzuwtpc4wb3xdzrj3yeajsvm3fkq4vbeubm2tdxaqruzzzgs5dwemlad.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="about:manual" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A// [...] - <DT><A HREF="http://xmrhfasfg5suueegrnc4gsgyi2tyclcy5oz7f5drnrodmdtob6t2ioyd.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="https://donate.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/ [...] - <DT><A HREF="http://yq5jjvr7drkjrelzhut7kgclfuro65jjlivyzfmxiq2kyv5lickrl4qd.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - </DL><p> - <HR> -</DL><p> diff --git a/projects/browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html b/projects/browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html deleted file mode 100644 index 3181e203..00000000 --- a/projects/browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1>Bookmarks</H1> - -<DL><p> - <DT><H3>Tor Project Bookmarks</H3> -<DD>Helpful bookmarks from the Tor Project - <DL><p> - <DT><A HREF="http://2gzyxa5ihm7nsggfxnu52rck2vv4rvmdlkiu3zzui5du4xyclen53wid.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="http://pzhdfe7jraknpj2qgu5cz2u3i4deuyfwmonvzu5i3nyw4t4bmg7o5pad.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="http://rzuwtpc4wb3xdzrj3yeajsvm3fkq4vbeubm2tdxaqruzzzgs5dwemlad.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="about:manual" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A// [...] - <DT><A HREF="http://xmrhfasfg5suueegrnc4gsgyi2tyclcy5oz7f5drnrodmdtob6t2ioyd.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - <DT><A HREF="https://donate.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/ [...] - <DT><A HREF="http://yq5jjvr7drkjrelzhut7kgclfuro65jjlivyzfmxiq2kyv5lickrl4qd.onion/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd [...] - </DL><p> - <HR> -</DL><p> diff --git a/projects/browser/build b/projects/browser/build index 479ecde9..52e62b59 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -160,9 +160,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/ [% END -%] - # Place a copy of the bookmarks.html file at the top. It will be moved into - # browser/omni.ja later - cp -p Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html $rootdir rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac @@ -226,15 +223,6 @@ unzip omni.ja defaults/preferences/[% c("var/prefs_file") %] || [ $? -lt 3 ] # Append our built extension-overrides.js to the preferences file cat "$GENERATEDPREFSPATH" >> defaults/preferences/[% c("var/prefs_file") %] cp defaults/preferences/[% c("var/prefs_file") %] $rootdir -[% IF c("var/osx") %] - # Embed our default bookmarks within the en-US locale. - mkdir -p chrome/en-US/locale/browser - cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/ - [% c("touch") %] chrome/en-US/locale/browser/bookmarks.html - chmod 600 chrome/en-US/locale/browser/bookmarks.html - zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html - rm -rf chrome -[% END %] [% c("touch") %] defaults/preferences/[% c("var/prefs_file") %] zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %] rm -rf defaults @@ -254,16 +242,6 @@ popd [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; %] - [% IF c("var/osx") -%] - unzip -d prep_[% lang %] [% xpi %] - cp $rootdir/bookmarks.html prep_[% lang %]/browser/chrome/[% lang %]/locale/browser/ - rm [% xpi %] - cd prep_[% lang %] - [% c('zip', { - zip_src => [ '.' ], - zip_args => xpi, - }) %] - [% END -%] # If we are building a multi-lingual package, add all of the language packs. [% IF c("var/multi_lingual") %] cp [% xpi %] "$TBDIR/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated (710112fd464a -> 1f0435c6aed5)
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. from 710112fd464a fixup! Firefox preference overrides. new 8ef8a0a11a14 fixup! Bug 2176: Rebrand Firefox to TorBrowser new 1f0435c6aed5 fixup! Firefox preference overrides. 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: browser/app/profile/001-base-profile.js | 5 --- browser/base/content/default-bookmarks.html | 69 ++++++++--------------------- 2 files changed, 18 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: fixup! Firefox preference overrides.
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 710112fd464a fixup! Firefox preference overrides. 710112fd464a is described below commit 710112fd464aadbdc3c52b0aa02667ce9b0549da Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Oct 24 21:24:14 2022 +0000 fixup! Firefox preference overrides. Bug 27128: Consider homogenizing HTTP/2 Settings prefs --- browser/app/profile/001-base-profile.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index 4197b1019454..bd85bc010e66 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -237,7 +237,6 @@ pref("privacy.firstparty.isolate", true); // Always enforce first party isolatio pref("privacy.partition.network_state", false); // Disable for now until audit pref("network.cookie.cookieBehavior", 1); pref("network.cookie.cookieBehavior.pbmode", 1); -pref("network.http.http2.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 and tor-browser#41014 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633 // Bug 40177: Make sure tracker cookie purging is disabled pref("privacy.purge_trackers.enabled", false); @@ -258,6 +257,25 @@ pref("network.proxy.allow_bypass", false, locked); // #40682 // alters content load order in a page. See tor-browser#24686 pref("network.http.tailing.enabled", true, locked); +// Make sure the varoius http2 settings, buffer sizes, timings, etc are locked to firefox defaults to minimize network performance fingerprinting. See https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/27128 +pref("network.http.http2.enabled", true, locked); +pref("network.http.http2.enabled.deps", true, locked); +pref("network.http.http2.enforce-tls-profile", true, locked); +pref("network.http.http2.chunk-size", 16000, locked); +pref("network.http.http2.timeout", 170, locked); +pref("network.http.http2.coalesce-hostnames", true, locked); +pref("network.http.http2.persistent-settings", false, locked); +pref("network.http.http2.ping-threshold", 58, locked); +pref("network.http.http2.ping-timeout", 8, locked); +pref("network.http.http2.send-buffer-size", 131072, locked); +pref("network.http.http2.allow-push", true, locked); +pref("network.http.http2.push-allowance", 131072, locked); +pref("network.http.http2.pull-allowance", 12582912, locked); +pref("network.http.http2.default-concurrent", 100, locked); +pref("network.http.http2.default-hpack-buffer", 65536, locked); +pref("network.http.http2.websockets", false, locked); +pref("network.http.http2.enable-hpack-dump", false, locked); + // Make sure we don't have any GIO supported protocols (defense in depth // measure) pref("network.gio.supported-protocols", ""); -- 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 40665: Shorten snowflake bridge line.
by gitolite role 25 Oct '22

25 Oct '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 1f25d10c Bug 40665: Shorten snowflake bridge line. 1f25d10c is described below commit 1f25d10c35dc4184ca0380a4819d359170cfbef1 Author: David Fifield <david(a)bamsoftware.com> AuthorDate: Tue Oct 25 13:10:43 2022 -0600 Bug 40665: Shorten snowflake bridge line. The bridge parameters are too long (535 bytes) to fit in space available for encoding them (510 bytes). This change removes one of the STUN servers, stun:stun.voip.blackberry.com:3478, to reduce the length to 500 bytes. stun:stun.voip.blackberry.com:3478 was chosen because, besides being a relatively long string in itself, it's known to be blocked (on the Unified Register) in Russia: https://lists.torproject.org/pipermail/anti-censorship-team/2022-May/000237… --- projects/common/bridges_list.snowflake.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/bridges_list.snowflake.txt b/projects/common/bridges_list.snowflake.txt index 7c7ecbd4..7a4aaf92 100644 --- a/projects/common/bridges_list.snowflake.txt +++ b/projects/common/bridges_list.snowflake.txt @@ -1 +1 @@ -snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 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,s [...] +snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,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.v [...] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: Bug 41369: Improve Firefox language settings for multi-lingual packages
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new e3bef662e97c Bug 41369: Improve Firefox language settings for multi-lingual packages e3bef662e97c is described below commit e3bef662e97cb9562498460db3ec8f344c744d74 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Oct 18 19:02:18 2022 +0200 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. --- browser/components/preferences/main.js | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index ecdf42cd98c8..7586816a0450 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -1013,8 +1013,28 @@ var gMainPane = { available, { preferNative: true } ); - let locales = available.map((code, i) => ({ code, name: localeNames[i] })); - locales.sort((a, b) => a.name > b.name); + let locales = available.map((code, i) => { + let name = localeNames[i].replace(/\s*$.+$$/g, ""); + if (code === "ja-JP-macos") { + // Mozilla codebases handle Japanese in macOS in different ways, + // sometimes they call it ja-JP-mac and sometimes they call it + // ja-JP-macos. The former is translated to Japanese when specifying + // preferNative to true, the latter is not. Since seeing ja-JP-macos + // would be confusing anyway, we treat it as a special case. + // See tor-browser#41372 and Bug 1726586. + name = + Services.intl.getLocaleDisplayNames(undefined, ["ja"], { + preferNative: true, + }) + " (ja)"; + } else { + name += ` (${code})`; + } + return { + code, + name, + }; + }); + locales.sort((a, b) => a.code.localeCompare(b.code)); let fragment = document.createDocumentFragment(); for (let { code, name } of locales) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] annotated tag tbb-11.5.6-build1 created (now 189b4e76)
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tbb-11.5.6-build1 in repository builders/tor-browser-build. at 189b4e76 (tag) tagging 8dafa94871ca2dc01493b2260da7c4239f0fe933 (commit) replaces tbb-11.5.5-build1 by Richard Pospesel on Tue Oct 25 19:32:40 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 11.5.6 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmNYOdgXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyz/jBAAi6Jy8Oj1jabg6CRQLcZtJD2g 9Vo9gXpqAMZPL7TN1P/ZDQ38+D0F5V7iMVNIaQvf2wgbOZOOpyVdSiWNuF7NVm7o +Kyz083tsnqgohYZVBUEjOvR3x2nWTZ41jKI8h+KsgRLgFISOmfLji1uH41b0nfj yTRnv9kU8gFfYgW3XZimBvAgqX7+DRBOrsJcypfCyhE0Bbx56wu4u9o7AohoPPZD ea97wQG9WAjvGf8DZGMbiBuQgEcnhRluR2P/gDPijLa8RYs3R2TLZUGOuZt+ku/n DmqqWw1MNz4pPpH+XBhRg/uQUlROskKNm41iHaTtK5PsGp8dumhzbTDJQW0Q4ZEs FhfqYC6WUu1BL8/7BrlrjRVk9Uj79mk/UDN299U530ol/i0UdmPF9lyQ51v3ZLk9 CbEDzhOXuuZevLRVQVDqHeTMrsQh56FadrioIKce9bxxhobSZYrxK0jFVpxcKvoT L3WvQ4KIm6ZC6LCMVlXaCEQ7qJ8Ats99UO3un8qDvHEVvxAmeCl6Sq0Kh0rE1nuH FMh4dKH44aRDbWwCH886WwUGwVS9jbM/ZRqM6ujF05xRrTAbIurkk6s1DTj5V9yR ngz+EijWIehDP9LfFeZrolwJiC0tCuXSI1v0UBrtUxPLbYzoDgEjm6veH0LwNijq mqGJMrFO4XApo+qJ/90= =LheR -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40664: Prepare stable release 11.5.6
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 8dafa948 Bug 40664: Prepare stable release 11.5.6 8dafa948 is described below commit 8dafa94871ca2dc01493b2260da7c4239f0fe933 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Oct 25 19:00:53 2022 +0000 Bug 40664: Prepare stable release 11.5.6 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4339d713..1381e73a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 11.5.6 - October 25 2022 + * All Plaforms + * Bug 40665: Shorten snowflake bridge line [tor-browser-build] + Tor Browser 11.5.5 - October 20 2022 * All Platforms * Update Translations diff --git a/rbm.conf b/rbm.conf index bfcde601..7f3ac153 100644 --- a/rbm.conf +++ b/rbm.conf @@ -71,10 +71,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.5.5' + torbrowser_version: '11.5.6' torbrowser_build: 'build1' torbrowser_incremental_from: - 11.5.4 + - 11.5.5 project_name: tor-browser multi_lingual: 0 build_mar: 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40665: Shorten snowflake bridge line.
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 46070e58 Bug 40665: Shorten snowflake bridge line. 46070e58 is described below commit 46070e584d8b58da7feab1d31844fdfc8a49bab5 Author: David Fifield <david(a)bamsoftware.com> AuthorDate: Tue Oct 25 13:10:43 2022 -0600 Bug 40665: Shorten snowflake bridge line. The bridge parameters are too long (535 bytes) to fit in space available for encoding them (510 bytes). This change removes one of the STUN servers, stun:stun.voip.blackberry.com:3478, to reduce the length to 500 bytes. stun:stun.voip.blackberry.com:3478 was chosen because, besides being a relatively long string in itself, it's known to be blocked (on the Unified Register) in Russia: https://lists.torproject.org/pipermail/anti-censorship-team/2022-May/000237… --- projects/common/bridges_list.snowflake.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/bridges_list.snowflake.txt b/projects/common/bridges_list.snowflake.txt index 7c7ecbd4..7a4aaf92 100644 --- a/projects/common/bridges_list.snowflake.txt +++ b/projects/common/bridges_list.snowflake.txt @@ -1 +1 @@ -snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 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,s [...] +snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,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.v [...] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated (7187cb8561e9 -> dae0e8fa0796)
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. from 7187cb8561e9 fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js new 8ee2a04b63f0 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser new 2c885618ed0e fixup! Bug 21952: Implement Onion-Location new dae0e8fa0796 fixup! Bug 40458: Implement .tor.onion aliases The 3 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: dom/base/Document.cpp | 104 +++++++++++++++++++++++++------------- netwerk/dns/OnionAliasService.cpp | 13 +++-- 2 files changed, 76 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser-bundle-testsuite] branch main updated: Bug 40046: add base-browser nightly builds
by gitolite role 25 Oct '22

25 Oct '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository tor-browser-bundle-testsuite. The following commit(s) were added to refs/heads/main by this push: new 2f1fd21 Bug 40046: add base-browser nightly builds 2f1fd21 is described below commit 2f1fd2146dac1157a8dffc5e3a76b037c231157d Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Thu Oct 6 12:59:32 2022 +0200 Bug 40046: add base-browser nightly builds --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 96 ++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 15 deletions(-) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index bb0033c..c0f3861 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -27,9 +27,9 @@ sub test_types { sub set_tests { my ($testsuite) = @_; $testsuite->{tests} = [ - # Nightly + # Tor Browser Nightly { - name => 'nightly-linux-x86_64', + name => 'torbrowser-nightly-linux-x86_64', descr => 'build tor-browser nightly linux-x86_64', type => 'rbm_build', project => 'release', @@ -42,13 +42,13 @@ sub set_tests { publish_dir => 'nightly-linux-x86_64', }, { - name => 'incrementals-nightly-linux-x86_64', + name => 'torbrowser-incrementals-nightly-linux-x86_64', descr => 'create incrementals for tor-browser nightly linux-x86_64', type => 'make_incrementals', publish_dir => 'nightly-linux-x86_64', }, { - name => 'nightly-linux-i686', + name => 'torbrowser-nightly-linux-i686', descr => 'build tor-browser nightly linux-i686', type => 'rbm_build', project => 'release', @@ -61,13 +61,13 @@ sub set_tests { publish_dir => 'nightly-linux-i686', }, { - name => 'incrementals-nightly-linux-i686', + name => 'torbrowser-incrementals-nightly-linux-i686', descr => 'create incrementals for tor-browser nightly linux-i686', type => 'make_incrementals', publish_dir => 'nightly-linux-i686', }, { - name => 'nightly-windows-i686', + name => 'torbrowser-nightly-windows-i686', descr => 'build tor-browser nightly windows-i686', type => 'rbm_build', project => 'release', @@ -80,13 +80,13 @@ sub set_tests { publish_dir => 'nightly-windows-i686', }, { - name => 'incrementals-nightly-windows-i686', + name => 'torbrowser-incrementals-nightly-windows-i686', descr => 'create incrementals for tor-browser nightly windows-i686', type => 'make_incrementals', publish_dir => 'nightly-windows-i686', }, { - name => 'nightly-windows-x86_64', + name => 'torbrowser-nightly-windows-x86_64', descr => 'build tor-browser nightly windows-x86_64', type => 'rbm_build', project => 'release', @@ -99,13 +99,13 @@ sub set_tests { publish_dir => 'nightly-windows-x86_64', }, { - name => 'incrementals-nightly-windows-x86_64', + name => 'torbrowser-incrementals-nightly-windows-x86_64', descr => 'create incrementals for tor-browser nightly windows-x86_64', type => 'make_incrementals', publish_dir => 'nightly-windows-x86_64', }, { - name => 'nightly-osx-x86_64', + name => 'torbrowser-nightly-osx-x86_64', descr => 'build tor-browser nightly osx-x86_64', type => 'rbm_build', project => 'release', @@ -118,13 +118,13 @@ sub set_tests { publish_dir => 'nightly-osx-x86_64', }, { - name => 'incrementals-nightly-osx-x86_64', + name => 'torbrowser-incrementals-nightly-osx-x86_64', descr => 'create incrementals for tor-browser nightly osx-x86_64', type => 'make_incrementals', publish_dir => 'nightly-osx-x86_64', }, { - name => 'nightly-android-armv7', + name => 'torbrowser-nightly-android-armv7', descr => 'build tor-browser nightly android-armv7', type => 'rbm_build', project => 'release', @@ -137,7 +137,7 @@ sub set_tests { publish_dir => 'nightly-android-armv7', }, { - name => 'nightly-android-x86', + name => 'torbrowser-nightly-android-x86', descr => 'build tor-browser nightly android-x86', type => 'rbm_build', project => 'release', @@ -150,7 +150,7 @@ sub set_tests { publish_dir => 'nightly-android-x86', }, { - name => 'nightly-android-x86_64', + name => 'torbrowser-nightly-android-x86_64', descr => 'build tor-browser nightly android-x86_64', type => 'rbm_build', project => 'release', @@ -163,7 +163,7 @@ sub set_tests { publish_dir => 'nightly-android-x86_64', }, { - name => 'nightly-android-aarch64', + name => 'torbrowser-nightly-android-aarch64', descr => 'build tor-browser nightly android-aarch64', type => 'rbm_build', project => 'release', @@ -175,6 +175,72 @@ sub set_tests { ], publish_dir => 'nightly-android-aarch64', }, + # Base Browser Nightly + { + name => 'basebrowser-nightly-linux-x86_64', + descr => 'build base-browser nightly linux-x86_64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-linux-x86_64', + 'basebrowser', + ], + publish_dir => 'basebrowser-nightly-linux-x86_64', + }, + { + name => 'basebrowser-nightly-linux-i686', + descr => 'build base-browser nightly linux-i686', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-linux-i686', + 'basebrowser', + ], + publish_dir => 'basebrowser-nightly-linux-i686', + }, + { + name => 'basebrowser-nightly-windows-i686', + descr => 'build base-browser nightly windows-i686', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-windows-i686', + 'basebrowser', + ], + publish_dir => 'basebrowser-nightly-windows-i686', + }, + { + name => 'basebrowser-nightly-windows-x86_64', + descr => 'build base-browser nightly windows-x86_64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-windows-x86_64', + 'basebrowser', + ], + publish_dir => 'basebrowser-nightly-windows-x86_64', + }, + { + name => 'basebrowser-nightly-macos', + descr => 'build base-browser nightly macos', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-osx-x86_64', + 'basebrowser', + ], + publish_dir => 'basebrowser-nightly-macos', + }, ]; } -- 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 40662: Make base-browser nightly build from tag
by gitolite role 25 Oct '22

25 Oct '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 c30f8a4b Bug 40662: Make base-browser nightly build from tag c30f8a4b is described below commit c30f8a4b851b9d57261598199f0730256454faef Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Tue Oct 25 11:33:30 2022 +0200 Bug 40662: Make base-browser nightly build from tag We don't have a branch for base-browser in tor-browser.git, but only a tag. --- projects/firefox/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a0f3bd53..9963929c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -66,8 +66,8 @@ targets: branding_directory: 'browser/branding/official' nightly: - git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' - tag_gpg_id: 0 + git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %][% IF c("var/base-browser") %]-build1[% END %]' + tag_gpg_id: '[% c("var/base-browser") %]' var: branding_directory: 'browser/branding/nightly' -- 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 40660: Update changelog-format-blog-post script to point gitlab rather than gitolite
by gitolite role 25 Oct '22

25 Oct '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 a6c85b14 Bug 40660: Update changelog-format-blog-post script to point gitlab rather than gitolite a6c85b14 is described below commit a6c85b149af9025e6a26c17c7fcaf4c7d5e5614c Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Oct 24 19:39:53 2022 +0000 Bug 40660: Update changelog-format-blog-post script to point gitlab rather than gitolite --- tools/changelog-format-blog-post | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/changelog-format-blog-post b/tools/changelog-format-blog-post index 84519bba..c9e61150 100755 --- a/tools/changelog-format-blog-post +++ b/tools/changelog-format-blog-post @@ -49,5 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) { my @v = split(/\./, $current_tbversion); $changelog_branch = "maint-$v[0].$v[1]"; } -print "The full changelog since [Tor Browser $last_tbversion](https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/browser/Bundle-Data/Docs/ChangeLog.txt?h=$changelog_branch) is:\n\n"; +print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs/ChangeLog.txt) is:\n\n"; + print $changelog; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: Bug 40025: FF98 Audit
by gitolite role 24 Oct '22

24 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new 9158e02 Bug 40025: FF98 Audit 9158e02 is described below commit 9158e0260674995c7471aefb03e817857a3c39fe Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Oct 24 20:32:56 2022 +0000 Bug 40025: FF98 Audit --- audits/FF98_AUDIT | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/audits/FF98_AUDIT b/audits/FF98_AUDIT new file mode 100644 index 0000000..81fd0a7 --- /dev/null +++ b/audits/FF98_AUDIT @@ -0,0 +1,76 @@ +Tracking issue: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/issues/40… + +# General + +The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript). + +The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation. + +`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit. + +## Firefox: https://github.com/mozilla/gecko-dev.git + +- Start: `82764d45153d175f4686ead7aac977810fe1fd1b` ( `FIREFOX_RELEASE_98_BASE` ) +- End: `99300ebd4a4a6440b6a11a80108f1ed6d867cdb4` ( `FIREFOX_RELEASE_99_BASE` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +--- + +## Application Services: https://github.com/mozilla/application-services.git + +- Start: `17942945873cdb8be56a9316d3cb8a611b3ef321` ( `v91.1.0` ) +- End: `1fcdb5984be6e0cc460d00cde44c49b7e3ac1ec6` ( `v92.0.0` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Android Components: https://github.com/mozilla-mobile/android-components.git + +- Start: `6f6ed0ca80410e42e8781bcf856e686ecbff2f63` ( `v98.0.0` ) +- End: `a31f2c481a7e220ca87affd8cd88fcb42b1624c1` ( `v98.0.13` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Fenix: https://github.com/mozilla-mobile/fenix.git + +- Start: `6c290430adc9af36e5123a78360a602bb5509c6c` ( `v98.0.0-beta.1` ) +- End: `0df2c648ab38682569e823b2140b945a0d7d6a9b` ( `releases_v98.0.0` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Ticket Review ## + +### 98 https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=F… + +- https://bugzilla.mozilla.org/show_bug.cgi?id=1749501 : @ma1 https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41134 + - Nothing to do here +- https://bugzilla.mozilla.org/show_bug.cgi?id=1749323 : @dan https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41135 + - Fixed in https://gitlab.torproject.org/tpo/applications/tor-browser/-/merge_requests… +- https://bugzilla.mozilla.org/show_bug.cgi?id=1749635 : @pierov https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41136 + - Nothing to do here +- https://bugzilla.mozilla.org/show_bug.cgi?id=1751170 : @pierov https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41137 + - Fixed in https://gitlab.torproject.org/tpo/applications/tor-browser/-/merge_requests… \ No newline at end of file -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: Bug 40024: FF96 Audit
by gitolite role 24 Oct '22

24 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new 3287abf Bug 40024: FF96 Audit 3287abf is described below commit 3287abf6189f1ca9f3422eeb47bd04a253aa8a93 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Oct 24 20:27:55 2022 +0000 Bug 40024: FF96 Audit --- audits/FF96_AUDIT | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/audits/FF96_AUDIT b/audits/FF96_AUDIT new file mode 100644 index 0000000..d30dbfb --- /dev/null +++ b/audits/FF96_AUDIT @@ -0,0 +1,77 @@ +Tracking Issue: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/issues/40… + +# General + +The audit begins at the commit hash where the previous audit ended. Use code_audit.sh for creating the diff and highlighting potentially problematic code. The audit is scoped to a specific language (currently C/C++, Rust, Java/Kotlin, and Javascript). + +The output includes the entire patch where the new problematic code was introduced. Search for `XXX MATCH XXX` to find the next potential violation. + +`code_audit.sh` contains the list of known problematic APIs. New usage of these functions are documented and analyzed in this audit. + +## Firefox: https://github.com/mozilla/gecko-dev.git + +- Start: `6a277ae5bdf6554793cd0da292a9c9ea804b4ed9` ( `FIREFOX_RELEASE_96_BASE` ) +- End: `e6b83e1727b7e9a6847e6e15bdb935d9937099e4` ( `FIREFOX_RELEASE_97_BASE` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +#### e88ab3dace9ad1c671c6c37a5aa1a3652e754544 +- Some windows proxy stuff we need to check +- Review Result: (SAFE|BAD) + +--- + +## Application Services: https://github.com/mozilla/application-services.git + +- Start: `5ceeb43598871a7d8550acc574a6a3fb93803ad7` ( `v87.3.0` ) +- End: `df53ad867be7d79899e05797533cd624f1eeb2a2` ( `v90.0.1` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +## Android Components: https://github.com/mozilla-mobile/android-components.git + +- Start: `ea5bd2687c9b64245ea8e3cdcb84faa5d87d540a` ( `v96.0.0` ) +- End: `0178a6fde98fa8c76885d67a2362f2ca310b67fd` ( `v96.0.15` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +**OR** +## Fenix: https://github.com/mozilla-mobile/fenix.git + +- Start: `a7afdb776ca202bf5eafc29d6a84f047c1609e0f` ( `v96.0.0-beta.1` ) +- End: `abe11c163d14fab17bdcf8aebbef2de2a3360032` ( `releases_v96.0.0` ) + +### Languages: +- [x] java +- [x] cpp +- [x] js +- [x] rust + +Nothing of interest (using `code_audit.sh`) + +**OR** + +## Ticket Review ## + +### Review List + +#### 96 https://bugzilla.mozilla.org/buglist.cgi?query_format=advanced&resolution=F… + +- https://bugzilla.mozilla.org/show_bug.cgi?id=1740840 : @ma1 https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41129 + - Nothing to do here \ No newline at end of file -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js
by gitolite role 24 Oct '22

24 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 7187cb8561e9 fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js 7187cb8561e9 is described below commit 7187cb8561e9fb3287e7b12aad3a73ee6335a20c Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Oct 17 21:53:38 2022 +0000 fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js Bug 40251: Clear obsolete prefs after torbutton!27 --- browser/app/profile/000-tor-browser.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 1a992d9681ad..65d6bc26a8b9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -46,20 +46,15 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo // Display prefs pref("extensions.torbutton.display_circuit", true); -pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); -pref("extensions.torbutton.updateNeeded", false); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.local_tor_check",true); -pref("extensions.torbutton.versioncheck_enabled",true); pref("extensions.torbutton.use_nontor_proxy",false); // State prefs: pref("extensions.torbutton.startup",false); -pref("extensions.torbutton.inserted_button",false); -pref("extensions.torbutton.inserted_security_level",false); // This is only used when letterboxing is disabled. // See #7255 for details. We display the warning three times to make sure the @@ -70,20 +65,12 @@ pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.resize_new_windows",false); -pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last -pref("extensions.torbutton.tor_memory_jar",false); -pref("extensions.torbutton.nontor_memory_jar",false); pref("extensions.torbutton.launch_warning",true); -// Opt out of Firefox addon pings: -// https://developer.mozilla.org/en/Addons/Working_with_AMO -pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); - // Security Slider pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); -pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); pref("extensions.torbutton.noscript_inited", false); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: fixup! Bug 40933: Add tor-launcher functionality
by gitolite role 24 Oct '22

24 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new ed7d92b0d031 fixup! Bug 40933: Add tor-launcher functionality ed7d92b0d031 is described below commit ed7d92b0d03166825f51d64cc57f59c3594b996b Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 21 19:35:58 2022 +0200 fixup! Bug 40933: Add tor-launcher functionality Bug 41386: Fix a pair of errors when handling the case of tor already running --- .../components/tor-launcher/TorMonitorService.jsm | 107 +++++++++++++++------ toolkit/components/tor-launcher/TorProcess.jsm | 22 ++--- 2 files changed, 88 insertions(+), 41 deletions(-) diff --git a/toolkit/components/tor-launcher/TorMonitorService.jsm b/toolkit/components/tor-launcher/TorMonitorService.jsm index 881f4a5a7355..27572c30370f 100644 --- a/toolkit/components/tor-launcher/TorMonitorService.jsm +++ b/toolkit/components/tor-launcher/TorMonitorService.jsm @@ -5,7 +5,9 @@ var EXPORTED_SYMBOLS = ["TorMonitorService"]; const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); +const { clearTimeout, setTimeout } = ChromeUtils.import( + "resource://gre/modules/Timer.jsm" +); const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); @@ -13,7 +15,7 @@ const { XPCOMUtils } = ChromeUtils.import( const { TorParsers, TorStatuses } = ChromeUtils.import( "resource://gre/modules/TorParsers.jsm" ); -const { TorProcess, TorProcessStatus } = ChromeUtils.import( +const { TorProcess } = ChromeUtils.import( "resource://gre/modules/TorProcess.jsm" ); @@ -69,6 +71,7 @@ const TorMonitorService = { _connection: null, _eventsToMonitor: Object.freeze(["STATUS_CLIENT", "NOTICE", "WARN", "ERR"]), _torLog: [], // Array of objects with date, type, and msg properties. + _startTimeout: null, _isBootstrapDone: false, _bootstrapErrorOccurred: false, @@ -91,7 +94,7 @@ const TorMonitorService = { this._controlTor(); } else { logger.info( - "Not starting the event monitor, as e do not own the Tor daemon." + "Not starting the event monitor, as we do not own the Tor daemon." ); } logger.debug("TorMonitorService initialized"); @@ -104,6 +107,8 @@ const TorMonitorService = { uninit() { if (this._torProcess) { this._torProcess.forget(); + this._torProcess.onExit = null; + this._torProcess.onRestart = null; this._torProcess = null; } this._shutDownEventMonitor(); @@ -181,35 +186,42 @@ const TorMonitorService = { // Private methods async _startProcess() { - this._torProcess = new TorProcess(); - this._torProcess.onExit = () => { - Services.obs.notifyObservers(null, TorTopics.ProcessExited); - }; - this._torProcess.onRestart = async () => { - this._shutDownEventMonitor(); - await this._controlTor(); - Services.obs.notifyObservers(null, TorTopics.ProcessRestarted); - }; + // TorProcess should be instanced once, then always reused and restarted + // only through the prompt it exposes when the controlled process dies. + if (!this._torProcess) { + this._torProcess = new TorProcess(); + this._torProcess.onExit = () => { + this._shutDownEventMonitor(); + Services.obs.notifyObservers(null, TorTopics.ProcessExited); + }; + this._torProcess.onRestart = async () => { + this._shutDownEventMonitor(); + await this._controlTor(); + Services.obs.notifyObservers(null, TorTopics.ProcessRestarted); + }; + } + + // Already running, but we did not start it + if (this._torProcess.isRunning) { + return false; + } + try { await this._torProcess.start(); - if (!this._torProcess.isRunning) { - this._torProcess = null; - return false; + if (this._torProcess.isRunning) { + logger.info("tor started"); } } catch (e) { // TorProcess already logs the error. this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = e.toString(); - this._torProcess = null; - return false; } - logger.info("tor started"); - return true; + return this._torProcess.isRunning; }, async _controlTor() { - if (!this._torProcess && !(await this._startProcess())) { + if (!this._torProcess?.isRunning && !(await this._startProcess())) { logger.error("Tor not running, not starting to monitor it."); return; } @@ -217,7 +229,6 @@ const TorMonitorService = { let delayMS = ControlConnTimings.initialDelayMS; const callback = async () => { if (await this._startEventMonitor()) { - this._status = TorProcessStatus.Running; this.retrieveBootstrapStatus().catch(e => { logger.warn("Could not get the initial bootstrap status", e); }); @@ -225,6 +236,14 @@ const TorMonitorService = { // FIXME: TorProcess is misleading here. We should use a topic related // to having a control port connection, instead. Services.obs.notifyObservers(null, TorTopics.ProcessIsReady); + + // We reset this here hoping that _shutDownEventMonitor can interrupt + // the current monitor, either by calling clearTimeout and preventing it + // from starting, or by closing the control port connection. + if (this._startTimeout === null) { + logger.warn("Someone else reset _startTimeout!"); + } + this._startTimeout = null; } else if ( Date.now() - this._torProcessStartTime > ControlConnTimings.timeoutMS @@ -234,18 +253,28 @@ const TorMonitorService = { this._lastWarningPhase = "startup"; this._lastWarningReason = s; logger.info(s); + if (this._startTimeout === null) { + logger.warn("Someone else reset _startTimeout!"); + } + this._startTimeout = null; } else { delayMS *= 2; if (delayMS > ControlConnTimings.maxRetryMS) { delayMS = ControlConnTimings.maxRetryMS; } - setTimeout(() => { + this._startTimeout = setTimeout(() => { logger.debug(`Control port not ready, waiting ${delayMS / 1000}s.`); callback(); }, delayMS); } }; - setTimeout(callback, delayMS); + // Check again, in the unfortunate case in which the execution was alrady + // queued, but was waiting network code. + if (this._startTimeout === null) { + this._startTimeout = setTimeout(callback, delayMS); + } else { + logger.error("Possible race? Refusing to start the timeout again"); + } }, async _startEventMonitor() { @@ -259,6 +288,16 @@ const TorMonitorService = { conn = await controller(avoidCache); } catch (e) { logger.error("Cannot open a control port connection", e); + if (conn) { + try { + conn.close(); + } catch (e) { + logger.error( + "Also, the connection is not null but cannot be closed", + e + ); + } + } return false; } @@ -273,12 +312,19 @@ const TorMonitorService = { return false; } + // FIXME: At the moment it is not possible to start the event monitor + // when we do start the tor process. So, does it make sense to keep this + // control? if (this._torProcess) { this._torProcess.connectionWorked(); } if (!TorLauncherUtil.shouldOnlyConfigureTor) { - this._takeTorOwnership(conn); + try { + await this._takeTorOwnership(conn); + } catch (e) { + logger.warn("Could not take ownership of the Tor daemon", e); + } } this._connection = conn; @@ -449,12 +495,13 @@ const TorMonitorService = { }, _shutDownEventMonitor() { - if (this._connection) { - this._connection.close(); - this._connection = null; - this._eventMonitorInProgressReply = null; - this._isBootstrapDone = false; - this.clearBootstrapError(); + this._connection?.close(); + this._connection = null; + if (this._startTimeout !== null) { + clearTimeout(this._startTimeout); + this._startTimeout = null; } + this._isBootstrapDone = false; + this.clearBootstrapError(); }, }; diff --git a/toolkit/components/tor-launcher/TorProcess.jsm b/toolkit/components/tor-launcher/TorProcess.jsm index 3dd194817d0a..a8ad7b73c95e 100644 --- a/toolkit/components/tor-launcher/TorProcess.jsm +++ b/toolkit/components/tor-launcher/TorProcess.jsm @@ -1,6 +1,6 @@ "use strict"; -var EXPORTED_SYMBOLS = ["TorProcess", "TorProcessStatus"]; +var EXPORTED_SYMBOLS = ["TorProcess"]; const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); @@ -49,7 +49,7 @@ class TorProcess { _exeFile = null; _dataDir = null; _args = []; - _torProcess = null; // nsIProcess + _subprocess = null; _status = TorProcessStatus.Unknown; _torProcessStartTime = null; // JS Date.now() _didConnectToTorControlPort = false; // Have we ever made a connection? @@ -69,7 +69,7 @@ class TorProcess { } async start() { - if (this._torProcess) { + if (this._subprocess) { return; } @@ -135,13 +135,13 @@ class TorProcess { environmentAppend: true, stderr: "pipe", }; - this._torProcess = await Subprocess.call(options); + this._subprocess = await Subprocess.call(options); this._watchProcess(); this._status = TorProcessStatus.Running; this._torProcessStartTime = Date.now(); } catch (e) { this._status = TorProcessStatus.Exited; - this._torProcess = null; + this._subprocess = null; logger.error("startTor error:", e); throw e; } @@ -162,7 +162,7 @@ class TorProcess { // Still, before closing the owning connection, this class should forget about // the process, so that future notifications will be ignored. forget() { - this._torProcess = null; + this._subprocess = null; this._status = TorProcessStatus.Exited; } @@ -174,14 +174,14 @@ class TorProcess { } async _watchProcess() { - const watched = this._torProcess; + const watched = this._subprocess; if (!watched) { return; } try { const { exitCode } = await watched.wait(); - if (watched !== this._torProcess) { + if (watched !== this._subprocess) { logger.debug(`A Tor process exited with code ${exitCode}.`); } else if (exitCode) { logger.warn(`The watched Tor process exited with code ${exitCode}.`); @@ -192,13 +192,13 @@ class TorProcess { logger.error("Failed to watch the tor process", e); } - if (watched === this._torProcess) { + if (watched === this._subprocess) { this._processExitedUnexpectedly(); } } _processExitedUnexpectedly() { - this._torProcess = null; + this._subprocess = null; this._status = TorProcessStatus.Exited; // TODO: Move this logic somewhere else? @@ -238,7 +238,7 @@ class TorProcess { } }); } else if (this.onExit) { - this.onExit(unexpected); + this.onExit(); } } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: fixup! Bug 40597: Implement TorSettings module
by gitolite role 24 Oct '22

24 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 3d5f52ebdda4 fixup! Bug 40597: Implement TorSettings module 3d5f52ebdda4 is described below commit 3d5f52ebdda4026d4891cc8a1079e8370c0ed5e5 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 21 19:13:09 2022 +0200 fixup! Bug 40597: Implement TorSettings module Bug 41281: Opt-out Connection Assist traffic --- browser/modules/TorConnect.jsm | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 34a3a9ee7d33..7c458a41c17d 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -23,9 +23,6 @@ const { TorMonitorService } = ChromeUtils.import( const { TorBootstrapRequest } = ChromeUtils.import( "resource://gre/modules/TorBootstrapRequest.jsm" ); -const { TorLauncherUtil } = ChromeUtils.import( - "resource://gre/modules/TorLauncherUtil.jsm" -); const { TorSettings, @@ -49,6 +46,7 @@ const TorLauncherPrefs = Object.freeze({ const TorConnectPrefs = Object.freeze({ censorship_level: "torbrowser.debug.censorship_level", + allow_internet_test: "torbrowser.bootstrap.allow_internet_test", }); const TorConnectState = Object.freeze({ @@ -251,30 +249,41 @@ const InternetStatus = Object.freeze({ class InternetTest { constructor() { + this._enabled = Services.prefs.getBoolPref( + TorConnectPrefs.allow_internet_test, + true + ); + this._status = InternetStatus.Unknown; this._error = null; this._pending = false; - this._timeout = setTimeout(() => { - this._timeout = null; - this.test(); - }, this.timeoutRand()); + if (this._enabled) { + this._timeout = setTimeout(() => { + this._timeout = null; + this.test(); + }, this.timeoutRand()); + } this.onResult = (online, date) => {}; this.onError = err => {}; } test() { - if (this._pending) { + if (this._pending || !this._enabled) { return; } this.cancel(); this._pending = true; + console.log("TorConnect: starting the Internet test"); this._testAsync() .then(status => { this._pending = false; this._status = status.successful ? InternetStatus.Online : InternetStatus.Offline; + console.log( + `TorConnect: performed Internet test, outcome ${this._status}` + ); this.onResult(this.status, status.date); }) .catch(error => { @@ -322,6 +331,10 @@ class InternetTest { return this._error; } + get enabled() { + return this._enabled; + } + // We randomize the Internet test timeout to make fingerprinting it harder, at least a little bit... timeoutRand() { const offset = 30000; @@ -457,7 +470,8 @@ const TorConnect = (() => { const maybeTransitionToError = () => { if ( internetTest.status === InternetStatus.Unknown && - internetTest.error === null + internetTest.error === null && + internetTest.enabled ) { // We have been called by a failed bootstrap, but the internet test has not run yet - force // it to run immediately! -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-1 updated: fixup! Bug 40933: Add tor-launcher functionality
by gitolite role 24 Oct '22

24 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 8f318354ad30 fixup! Bug 40933: Add tor-launcher functionality 8f318354ad30 is described below commit 8f318354ad30d4e56eee5aea4dc0e568dd59916b Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Oct 24 11:09:57 2022 +0200 fixup! Bug 40933: Add tor-launcher functionality Bug 41385: BootstrapError is never notified Also, cleaned TorProcessDidNotStart, that is never actually used and some other possible improvements on error reporting. --- .../tor-launcher/TorBootstrapRequest.jsm | 56 +++++++++++----------- .../components/tor-launcher/TorMonitorService.jsm | 31 ++++++++---- toolkit/components/tor-launcher/TorProcess.jsm | 23 ++------- 3 files changed, 51 insertions(+), 59 deletions(-) diff --git a/toolkit/components/tor-launcher/TorBootstrapRequest.jsm b/toolkit/components/tor-launcher/TorBootstrapRequest.jsm index 4f0ae240b31d..e999d5c3f62c 100644 --- a/toolkit/components/tor-launcher/TorBootstrapRequest.jsm +++ b/toolkit/components/tor-launcher/TorBootstrapRequest.jsm @@ -39,7 +39,7 @@ class TorBootstrapRequest { this._timeoutID = null; } - async observe(subject, topic, data) { + observe(subject, topic, data) { const obj = subject?.wrappedJSObject; switch (topic) { case TorTopics.BootstrapStatus: { @@ -59,17 +59,8 @@ class TorBootstrapRequest { break; } case TorTopics.BootstrapError: { - // first stop our bootstrap timeout before handling the error - clearTimeout(this._timeoutID); - - await TorProtocolService.stopBootstrap(); - - const message = obj.message; - const details = obj.details; - if (this.onbootstraperror) { - this.onbootstraperror(message, details); - } - this._bootstrapPromiseResolve(false); + console.info("TorBootstrapRequest: observerd TorBootstrapError", obj); + this._stop(obj?.message, obj?.details); break; } } @@ -91,41 +82,48 @@ class TorBootstrapRequest { // optionally cancel bootstrap after a given timeout if (this.timeout > 0) { this._timeoutID = setTimeout(async () => { - await TorProtocolService.stopBootstrap(); - if (this.onbootstraperror) { - this.onbootstraperror( - "Tor Bootstrap process timed out", - `Bootstrap attempt abandoned after waiting ${this.timeout} ms` - ); - } - this._bootstrapPromiseResolve(false); + this._timeoutID = null; + // TODO: Translate, if really used + await this._stop( + "Tor Bootstrap process timed out", + `Bootstrap attempt abandoned after waiting ${this.timeout} ms` + ); }, this.timeout); } // wait for bootstrapping to begin and maybe handle error - TorProtocolService.connect().catch(async err => { - clearTimeout(this._timeoutID); - // stopBootstrap never throws, at the moment - await TorProtocolService.stopBootstrap(); - if (this.onbootstraperror) { - this.onbootstraperror(err.message, ""); - } - this._bootstrapPromiseResolve(false); + TorProtocolService.connect().catch(err => { + this._stop(err.message, ""); }); }).finally(() => { // and remove ourselves once bootstrap is resolved Services.obs.removeObserver(this, TorTopics.BootstrapStatus); Services.obs.removeObserver(this, TorTopics.BootstrapError); + this._bootstrapPromise = null; }); return this._bootstrapPromise; } async cancel() { - clearTimeout(this._timeoutID); + await this._stop(); + } + + // Internal implementation. Do not use directly, but call cancel, instead. + async _stop(message, details) { + // first stop our bootstrap timeout before handling the error + if (this._timeoutID !== null) { + clearTimeout(this._timeoutID); + this._timeoutID = null; + } + // stopBootstrap never throws await TorProtocolService.stopBootstrap(); + if (this.onbootstraperror && message) { + this.onbootstraperror(message, details); + } + this._bootstrapPromiseResolve(false); } } diff --git a/toolkit/components/tor-launcher/TorMonitorService.jsm b/toolkit/components/tor-launcher/TorMonitorService.jsm index 201ac6275c56..881f4a5a7355 100644 --- a/toolkit/components/tor-launcher/TorMonitorService.jsm +++ b/toolkit/components/tor-launcher/TorMonitorService.jsm @@ -47,7 +47,6 @@ const Preferences = Object.freeze({ const TorTopics = Object.freeze({ BootstrapError: "TorBootstrapError", HasWarnOrErr: "TorLogHasWarnOrErr", - ProcessDidNotStart: "TorProcessDidNotStart", ProcessExited: "TorProcessExited", ProcessIsReady: "TorProcessIsReady", ProcessRestarted: "TorProcessRestarted", @@ -191,8 +190,17 @@ const TorMonitorService = { await this._controlTor(); Services.obs.notifyObservers(null, TorTopics.ProcessRestarted); }; - await this._torProcess.start(); - if (!this._torProcess.isRunning) { + try { + await this._torProcess.start(); + if (!this._torProcess.isRunning) { + this._torProcess = null; + return false; + } + } catch (e) { + // TorProcess already logs the error. + this._bootstrapErrorOccurred = true; + this._lastWarningPhase = "startup"; + this._lastWarningReason = e.toString(); this._torProcess = null; return false; } @@ -222,11 +230,9 @@ const TorMonitorService = { ControlConnTimings.timeoutMS ) { let s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); - TorLauncherUtil.notifyUserOfError( - s, - null, - TorTopics.ProcessDidNotStart - ); + this._bootstrapErrorOccurred = true; + this._lastWarningPhase = "startup"; + this._lastWarningReason = s; logger.info(s); } else { delayMS *= 2; @@ -432,8 +438,13 @@ const TorMonitorService = { this._lastWarningPhase = statusObj.TAG; this._lastWarningReason = statusObj.REASON; - const msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); - TorLauncherUtil.notifyUserOfError(msg, details, TorTopics.BootstrapError); + const message = TorLauncherUtil.getLocalizedString( + "tor_bootstrap_failed" + ); + Services.obs.notifyObservers( + { message, details }, + TorTopics.BootstrapError + ); } }, diff --git a/toolkit/components/tor-launcher/TorProcess.jsm b/toolkit/components/tor-launcher/TorProcess.jsm index a23fd324efff..3dd194817d0a 100644 --- a/toolkit/components/tor-launcher/TorProcess.jsm +++ b/toolkit/components/tor-launcher/TorProcess.jsm @@ -32,10 +32,6 @@ const TorProcessStatus = Object.freeze({ Exited: 3, }); -const TorProcessTopics = Object.freeze({ - ProcessDidNotStart: "TorProcessDidNotStart", -}); - // Logger adapted from CustomizableUI.jsm XPCOMUtils.defineLazyGetter(this, "logger", () => { const { ConsoleAPI } = ChromeUtils.import( @@ -82,9 +78,7 @@ class TorProcess { this._status = TorProcessStatus.Unknown; try { - if (!this._makeArgs()) { - return; - } + this._makeArgs(); this._addControlPortArg(); this._addSocksPortArg(); @@ -149,11 +143,7 @@ class TorProcess { this._status = TorProcessStatus.Exited; this._torProcess = null; logger.error("startTor error:", e); - Services.obs.notifyObservers( - null, - TorProcessTopics.ProcessDidNotStart, - null - ); + throw e; } } @@ -284,12 +274,7 @@ class TorProcess { [details], 1 ); - TorLauncherUtil.notifyUserOfError( - err, - null, - TorProcessTopics.ProcessDidNotStart - ); - return false; + throw new Error(err); } const torrcDefaultsFile = TorLauncherUtil.getTorFile( @@ -319,8 +304,6 @@ class TorProcess { this._args.push(geoip6File.path); this._args.push("HashedControlPassword"); this._args.push(hashedPassword); - - return true; } _addControlPortArg() { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0