- tbb-commits - lists.torproject.org

[builders/tor-browser-build] branch main updated: fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov 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 823383c fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos 823383c is described below commit 823383cd749307aa49c5625c1f9a0019575a4049 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 14 18:19:58 2022 +0200 fixup! Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos Changed remaining URLs in GitLab issue templates. --- .gitlab/issue_templates/Release Prep - Alpha.md | 12 ++++++------ .gitlab/issue_templates/Release Prep - Stable.md | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab/issue_templates/Release Prep - Alpha.md b/.gitlab/issue_templates/Release Prep - Alpha.md index eb9a3f7..1735c6b 100644 --- a/.gitlab/issue_templates/Release Prep - Alpha.md +++ b/.gitlab/issue_templates/Release Prep - Alpha.md @@ -33,7 +33,7 @@ <details> <summary>Desktop</summary> -### **torbutton** : https://git.torproject.org/torbutton.git +### **torbutton** : https://gitlab.torproject.org/tpo/applications/torbutton.git - [ ] Update translations : - [ ] `./import-translations.sh` - **NOTE** : if there are no new strings imported then we are done here @@ -42,7 +42,7 @@ - [ ] ***(Optional)*** Backport to maintenance branch if present and necessary - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit -### **tor-launcher** : https://git.torproject.org/tor-launcher.git +### **tor-launcher** : https://gitlab.torproject.org/tpo/applications/tor-launcher.git - [ ] Update translations: - [ ] ./localization/import-translations.sh - **NOTE** : if there are no new strings imported then we are done here @@ -57,11 +57,11 @@ <details> <summary>Android</summary> -### **tba-translation** : https://git.torproject.org/translation.git +### **tba-translation** : https://gitlab.torproject.org/tpo/translation.git - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` -### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git +### **tor-android-service** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-android-service.git - [ ] Fetch latest and identify new `HEAD` of `main` branch - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` @@ -101,7 +101,7 @@ <details> <summary>Shared</summary> -### tor-browser: https://git.torproject.org/tor-browser.git +### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags @@ -138,7 +138,7 @@ <details> <summary>Build/Signing/Publishing</summary> -### tor-browser-build: https://git.torproject.org/builders/tor-browser-build.git +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches - [ ] Update `rbm.conf` diff --git a/.gitlab/issue_templates/Release Prep - Stable.md b/.gitlab/issue_templates/Release Prep - Stable.md index a93f472..6c36008 100644 --- a/.gitlab/issue_templates/Release Prep - Stable.md +++ b/.gitlab/issue_templates/Release Prep - Stable.md @@ -39,7 +39,7 @@ <details> <summary>Desktop</summary> -### **torbutton** ***(Optional)***: https://git.torproject.org/torbutton.git +### **torbutton** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/torbutton.git - [ ] ***(Optional)*** Update translations : - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] `./import-translations.sh` @@ -48,7 +48,7 @@ - **NOTE** : only add files which are already being tracked - [ ] fixup! `tor-browser`'s `Bug 10760 : Integrate TorButton to TorBrowser core` issue to point to updated `torbutton` commit -### **tor-launcher** ***(Optional)***: https://git.torproject.org/tor-launcher.git +### **tor-launcher** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-launcher.git - [ ] ***(Optional)*** Update translations: - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] ./localization/import-translations.sh @@ -59,7 +59,7 @@ - Message `Tagging $(TOR_LAUNCHER_VERSION)` - [ ] Push `main` and tag to origin -### tor-browser: https://git.torproject.org/tor-browser.git +### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr91/tags - [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>` @@ -93,7 +93,7 @@ <details> <summary>Android</summary> -### **geckoview**: https://git.torproject.org/tor-browser.git +### **geckoview**: https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-release/tags - [ ] `$(RR_TAG)` : `<INSERT_TAG_HERE>` @@ -123,12 +123,12 @@ - Message : `Tagging $(FIREFOX_BUILD_N) for $(RR_VERSION)-based (alpha|stable)` - [ ] Push tag to `origin` -### **tba-translation** ***(Optional)***: https://git.torproject.org/translation.git +### **tba-translation** ***(Optional)***: https://gitlab.torproject.org/tpo/translation.git - **NOTE** We only update strings in stable if a backported feature depends on new strings - [ ] Fetch latest and identify new `HEAD` of `fenix-torbrowserstringsxml` branch - [ ] `origin/fenix-torbrowserstringsxml` : `<INSERT COMMIT HASH HERE>` -### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git +### **tor-android-service** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/tor-android-service.git - [ ] Fetch latest and identify new `HEAD` of `main` branch - [ ] `origin/main` : `<INSERT COMMIT HASH HERE>` @@ -185,7 +185,7 @@ <details> <summary>Build/Signing/Publishing</summary> -### tor-browser-build: https://git.torproject.org/builders/tor-browser-build.git +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches - [ ] Update `rbm.conf` -- 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 17400: Enable multi-lingual builds
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov 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 a3f4912 Bug 17400: Enable multi-lingual builds a3f4912 is described below commit a3f49129c0c697eb7e951c871b8bfa8dd2e1fe27 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 7 18:16:58 2022 +0200 Bug 17400: Enable multi-lingual builds --- projects/browser/build | 10 ++++++---- projects/browser/config | 2 +- rbm.conf | 2 +- tools/update-responses/update_responses | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/projects/browser/build b/projects/browser/build index 6a7ef9a..2e037d6 100644 --- a/projects/browser/build +++ b/projects/browser/build @@ -223,7 +223,7 @@ tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/" unzip omni.ja defaults/preferences/[% c("var/prefs_file") %] || [ $? -lt 3 ] -# Append our built extension-overrides.js to 000-tor-browser.js +# 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") %] @@ -235,8 +235,6 @@ cp defaults/preferences/[% c("var/prefs_file") %] $rootdir zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %] -# Set the locale of the bundle. -echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/[% c("var/prefs_file") %] [% c("touch") %] defaults/preferences/[% c("var/prefs_file") %] zip -Xm omni.ja defaults/preferences/[% c("var/prefs_file") %] rm -rf defaults @@ -247,7 +245,11 @@ popd [% IF c("var/osx") || c("var/multi_lingual") -%] # Prepare our language packs to embed our default bookmarks. # See bug 21879 for more details. - [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% IF c("var/multi_lingual") -%] + [% SET locales = c("var/locales") -%] + [% ELSE -%] + [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% END -%] [% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; diff --git a/projects/browser/config b/projects/browser/config index 10b7eb9..4ae3e4f 100644 --- a/projects/browser/config +++ b/projects/browser/config @@ -75,7 +75,7 @@ input_files: enable: '[% c("var/tor-browser") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% ! c("var/testbuild") && ! c("var/android") %]' + enable: '[% (!c("var/testbuild") || c("var/multi_lingual")) && ! c("var/android") %]' - project: fonts name: fonts enable: '[% ! c("var/android") %]' diff --git a/rbm.conf b/rbm.conf index 97baa32..02c8074 100644 --- a/rbm.conf +++ b/rbm.conf @@ -75,7 +75,7 @@ var: torbrowser_build: 'build1' torbrowser_incremental_from: - 12.0a2 - multi_lingual: 0 + multi_lingual: 1 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 7881205..af81875 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -411,7 +411,7 @@ sub write_htaccess { $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$migrate_langs->{$lang}.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-ALL.xml $flags\n"; } } write_htdocs($channel, '.htaccess', $htaccess); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated (bf61fa9 -> b321f2a)
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch main in repository builders/tor-browser-build. from bf61fa9 Bug 40638: Update the update link of nightly builds new 9f5c55f Bug 40640: Extract Gradle in the toolchain setup new b321f2a Bug 23656: Use mozconfigs from tor-browser.git (Geckoview) 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: projects/android-components/build | 7 +++-- projects/android-toolchain/config | 11 +++++--- projects/application-services/build | 6 ++-- projects/fenix/build | 13 +++++---- projects/geckoview/build | 14 ++++++---- projects/geckoview/config | 13 ++++----- projects/geckoview/mozconfig-android-aarch64 | 42 ---------------------------- projects/geckoview/mozconfig-android-all | 13 --------- projects/geckoview/mozconfig-android-armv7 | 42 ---------------------------- projects/geckoview/mozconfig-android-x86 | 42 ---------------------------- projects/geckoview/mozconfig-android-x86_64 | 42 ---------------------------- projects/tor-android-service/build | 6 ++-- projects/tor-onion-proxy-library/build | 6 ++-- 13 files changed, 44 insertions(+), 213 deletions(-) delete mode 100644 projects/geckoview/mozconfig-android-aarch64 delete mode 100644 projects/geckoview/mozconfig-android-all delete mode 100644 projects/geckoview/mozconfig-android-armv7 delete mode 100644 projects/geckoview/mozconfig-android-x86 delete mode 100644 projects/geckoview/mozconfig-android-x86_64 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (54e941e99e2b -> fbe4ac7178a0)
by gitolite role 17 Oct '22

17 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. from 54e941e99e2b squash! Firefox preference overrides. new 800f5d762fa2 fixup! Base Browser's .mozconfigs. new 72ede633585d fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser new fbe4ac7178a0 fixup! TB3: Tor Browser's official .mozconfigs. 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: browser/config/mozconfigs/base-browser-android | 4 ++++ mozconfig-android-all | 22 ++++++++++++++++++++++ mozconfig-android-all-dev | 16 ---------------- tools/torbrowser/fataar.sh | 4 ++-- 4 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 mozconfig-android-all delete mode 100644 mozconfig-android-all-dev -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: squash! Firefox preference overrides.
by gitolite role 14 Oct '22

14 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 54e941e99e2b squash! Firefox preference overrides. 54e941e99e2b is described below commit 54e941e99e2b5841edf10cb05b1b4b71bcb81f19 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Oct 11 21:45:59 2022 +0000 squash! Firefox preference overrides. Bug 24686: Set network.http.tailing.enabled to true --- browser/app/profile/001-base-profile.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index 6489ac3c5076..c6b088434b79 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -253,6 +253,11 @@ pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); pref("network.proxy.allow_bypass", false); // #40682 +// Lock to 'true', which is already the firefox default, to prevent users +// from making themselves fingerprintable by disabling. This pref +// alters content load order in a page. See tor-browser#24686 +pref("network.http.tailing.enabled", true, 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

[torbutton] branch maint-11.5 updated: Bug 41364: Amend YEC 2022 styling
by gitolite role 14 Oct '22

14 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch maint-11.5 in repository torbutton. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 17569fee Bug 41364: Amend YEC 2022 styling 17569fee is described below commit 17569feebb570762ab92f9a6031609f012197b04 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Fri Oct 14 12:36:40 2022 +0100 Bug 41364: Amend YEC 2022 styling --- chrome/skin/aboutTor.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 5c75c1f0..b9f0d76f 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -11,7 +11,7 @@ --abouttor-bg-toroff-color: #A4000F; --abouttor-yec-page-bg-color: #0E0625; --abouttor-yec-heading-color: #C0FF00; - --abouttor-yec-heading-alt-color: #FF8AFF; + --abouttor-yec-heading-alt-color: #FF60FF; --abouttor-yec-button-color: #000000; --abouttor-yec-button-bg-color: #C0FF00; --abouttor-yec-button-hover-bg-color: #A8DF00; @@ -76,6 +76,10 @@ body:not([initialized]) { } } +body[toron]:not([hasbeenupdated]).isYEC .torcontent-container { + margin-block-end: calc(28px + 4rem); +} + #torbrowser-info { position: absolute; top: 16px; @@ -172,6 +176,7 @@ body:not([showmanual]) .showForManual { grid-area: image-start / image-start / image-end / sub-headings-end; margin-inline: -25px; margin-top: 45px; + opacity: 0.8; } .yec-foreground-image { @@ -180,6 +185,7 @@ body:not([showmanual]) .showForManual { align-self: end; margin-inline: -55px 25px; margin-block: 15px 10px; + mix-blend-mode: hard-light; } .yec-foreground-image:dir(rtl) { @@ -193,7 +199,7 @@ body:not([showmanual]) .showForManual { color: var(--abouttor-yec-heading-color); line-height: 1.1; font-family: 'Space Mono', monospace; - font-weight: 700; + font-weight: 400; letter-spacing: -0.05em; } @@ -210,6 +216,7 @@ body:not([showmanual]) .showForManual { font-family: 'Space Grotesk', sans-serif; font-size: 60px; letter-spacing: -0.05em; + mix-blend-mode: hard-light; } .yec-sub-heading-2 { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main updated: Bug 40619: Take translation from gitlab.tpo and not git.tpo
by gitolite role 14 Oct '22

14 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new 55e518c9 Bug 40619: Take translation from gitlab.tpo and not git.tpo 55e518c9 is described below commit 55e518c9a8c988db31eba9db324c348a0336567b Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 14 16:41:50 2022 +0200 Bug 40619: Take translation from gitlab.tpo and not git.tpo --- import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/import-translations.sh b/import-translations.sh index e0b8c3ed..736dc2b2 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -62,7 +62,7 @@ then git fetch origin cd .. else - git clone https://git.torproject.org/translation.git + git clone https://gitlab.torproject.org/tpo/translation.git fi # Update each translated file for each locale. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main updated: Bug 41306: Typo "will not able" in "Tor unexpectedly exited" dialog
by gitolite role 14 Oct '22

14 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new e5e1c5ec Bug 41306: Typo "will not able" in "Tor unexpectedly exited" dialog e5e1c5ec is described below commit e5e1c5ec8e6dd7285e382827789230dec70774ab Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 14 16:53:15 2022 +0200 Bug 41306: Typo "will not able" in "Tor unexpectedly exited" dialog --- chrome/locale/en-US/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/torlauncher.properties b/chrome/locale/en-US/torlauncher.properties index e0b07f03..2e34c6e1 100644 --- a/chrome/locale/en-US/torlauncher.properties +++ b/chrome/locale/en-US/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not be able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (7be57d563a83 -> af6e4a55210f)
by gitolite role 14 Oct '22

14 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. from 7be57d563a83 fixup! Bug 30237: Add v3 onion services client authentication prompt new 63c477f9c5b8 fixup! Add TorStrings module for localization new af6e4a55210f 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/modules/TorStrings.jsm | 116 +++++++++++++++++++++----------- 2 files changed, 81 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Bug 30237: Add v3 onion services client authentication prompt
by gitolite role 14 Oct '22

14 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 7be57d563a83 fixup! Bug 30237: Add v3 onion services client authentication prompt 7be57d563a83 is described below commit 7be57d563a8374c10cfd79d163af04f803f1bfa3 Author: hackademix <giorgio(a)maone.net> AuthorDate: Fri Oct 14 16:12:58 2022 +0100 fixup! Bug 30237: Add v3 onion services client authentication prompt --- .../components/onionservices/content/authPrompt.js | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/browser/components/onionservices/content/authPrompt.js b/browser/components/onionservices/content/authPrompt.js index f9b92608ed65..889acc2c6f67 100644 --- a/browser/components/onionservices/content/authPrompt.js +++ b/browser/components/onionservices/content/authPrompt.js @@ -228,18 +228,27 @@ const OnionAuthPrompt = (function() { }, _onCancel() { - // Arrange for an error page to be displayed. + // Arrange for an error page to be displayed: + // we build a short script calling docShell.displayError() + // and we pass it as a data: URI to loadFrameScript(), + // which runs it in the content frame which triggered + // this authentication prompt. const failedURI = this._failedURI.spec; const errorCode = - this._reasonForPrompt === OnionAuthUtil.topic.clientAuthMissing - ? Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH - : Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH; - - const io = `ChromeUtils.import("resource://gre/modules/Services.jsm").Services.io`; - this._browser.messageManager.loadFrameScript(`data:,${encodeURIComponent( - `docShell.displayLoadError(${errorCode}, ${io}.newURI(${JSON.stringify(failedURI)}), undefined, undefined);` + this._reasonForPrompt === OnionAuthUtil.topic.clientAuthMissing + ? Cr.NS_ERROR_TOR_ONION_SVC_MISSING_CLIENT_AUTH + : Cr.NS_ERROR_TOR_ONION_SVC_BAD_CLIENT_AUTH; + const io = + 'ChromeUtils.import("resource://gre/modules/Services.jsm").Services.io'; + + this._browser.messageManager.loadFrameScript( + `data:application/javascript,${encodeURIComponent( + `docShell.displayLoadError(${errorCode}, ${io}.newURI(${JSON.stringify( + failedURI + )}), undefined, undefined);` )}`, - false); + false + ); }, _getKeyElement() { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0