- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-140.4.0esr-15.0-1] fixup! [android] Modify add-on support
by ma1 (＠ma1) 21 Oct '25

21 Oct '25

ma1 pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a2d22e5 by hackademix at 2025-10-21T10:33:41+02:00 fixup! [android] Modify add-on support BB 44133: Hide (again) the "Allow in private browsing" checkboxes from WebExtension management UI when in global PBM - - - - - 4 changed files: - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/PermissionsDialogFragment.kt Changes: ===================================== mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt ===================================== @@ -379,6 +379,7 @@ class GeckoWebExtension( temporary = it.temporary, detailUrl = it.amoListingUrl, incognito = Incognito.fromString(it.incognito), + defaultPrivateBrowsingAllowed = it.allowedInPrivateBrowsing, ) } } ===================================== mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt ===================================== @@ -508,6 +508,11 @@ data class Metadata( * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/mani… */ val incognito: Incognito, + + /** + * Wether this extension should default to pbm-allowed because being installed in global PBM + */ + val defaultPrivateBrowsingAllowed : Boolean = false, ) /** ===================================== mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/Addon.kt ===================================== @@ -52,6 +52,7 @@ val logger = Logger("Addon") * @property ratingUrl The link to the ratings page (user reviews) for this [Addon]. * @property detailUrl The link to the detail page for this [Addon]. * @property incognito Indicates how the extension works with private browsing windows. + * @property defaultPrivateBrowsingAllowed whether the extension should default to pbm-enabled. */ @SuppressLint("ParcelCreator") @Parcelize @@ -77,6 +78,7 @@ data class Addon( val ratingUrl: String = "", val detailUrl: String = "", val incognito: Incognito = Incognito.SPANNING, + val defaultPrivateBrowsingAllowed: Boolean = false, ) : Parcelable { /** @@ -489,6 +491,7 @@ data class Addon( detailUrl = detailUrl, incognito = incognito, installedState = installedState, + defaultPrivateBrowsingAllowed = metadata?.defaultPrivateBrowsingAllowed == true, ) } ===================================== mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/ui/PermissionsDialogFragment.kt ===================================== @@ -270,6 +270,9 @@ class PermissionsDialogFragment : AddonDialogFragment() { forOptionalPermissions ) { allowedInPrivateBrowsing.isVisible = false + } else { + allowedInPrivateBrowsing.isChecked = addon.defaultPrivateBrowsingAllowed + allowedInPrivateBrowsing.isVisible = !addon.defaultPrivateBrowsingAllowed } positiveButton.setOnClickListener { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a2d22e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a2d22e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.4.0esr-15.0-1] fixup! TB 34378: [android] Port external helper app prompting
by clairehurst (＠clairehurst) 20 Oct '25

20 Oct '25

clairehurst pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: af86b6bf by clairehurst at 2025-10-16T17:13:16-06:00 fixup! TB 34378: [android] Port external helper app prompting - - - - - 2 changed files: - mobile/android/android-components/components/feature/app-links/build.gradle - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== mobile/android/android-components/components/feature/app-links/build.gradle ===================================== @@ -36,7 +36,6 @@ dependencies { implementation project(':ui-widgets') implementation libs.kotlin.coroutines - implementation project(path: ':support-utils') testImplementation project(':support-test') testImplementation project(':support-test-libstate') ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -870,17 +870,12 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn if (existingDialog != null) { return existingDialog } - - // TODO: This is a temporary solution to keep RR rebases in motion. - // We need to figure out a proper fix here and then apply it as a fixup to - // "TB 34378: [android] Port external helper app prompting" SimpleRedirectDialogFragment.newInstance( - dialogTitleString = "???", - dialogMessageString = "???" - ).also { - dialog = it - return it - } + getString(R.string.mozac_feature_applinks_normal_confirm_dialog_title), + ).also { + dialog = it + return it + } } private fun isAlreadyADialogCreated(): Boolean { return findPreviousDialogFragment() != null View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/af86b6b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/af86b6b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-spec][main] 2 commits: VersionNumbers: fix repository name
by morgan (＠morgan) 20 Oct '25

20 Oct '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-spec Commits: 813de8d1 by Nicolas Vigier at 2025-10-20T14:52:11+02:00 VersionNumbers: fix repository name - - - - - 3e6c6dcd by Nicolas Vigier at 2025-10-20T14:55:12+02:00 VersionNumbers: Add mb-* tags - - - - - 1 changed file: - processes/VersionNumbers Changes: ===================================== processes/VersionNumbers ===================================== @@ -14,9 +14,15 @@ A stable version is a series of dot separated numbers. Examples: Git Tags ======== -tor-browser-bundle.git is tagged with a tag using the following format: +tor-browser-build.git is tagged with a tag using the following format: tbb-$version-build$n -where $version is is the tor-browser version and $n a build number. +or: + + mb-$version-build$n + +where $version is is the tor-browser version (in the case of `tbb-*` +tags) or mullvad-browser version (in the case of `mb-*` tags) and $n a +build number. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/compare/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/compare/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch maint-15.0
by morgan (＠morgan) 20 Oct '25

20 Oct '25

morgan pushed new branch maint-15.0 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mai… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41604: Keep update-responses files from previous release
by boklm (＠boklm) 20 Oct '25

20 Oct '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 68895d3e by Nicolas Vigier at 2025-10-20T13:46:24+02:00 Bug 41604: Keep update-responses files from previous release We were keeping update-responses directories from the previous release if they are not in the new one, which happens when a release is not for all platforms. We were also keeping the `download-*.json` files. However, in the case of android-only releases we also need to keep `downloads.json` and `.htaccess`. To simplify we now keep all files and directories from the previous release which are not in the new one, including files starting with a dot (such as `.htaccess`). - - - - - 1 changed file: - tools/signing/upload-update_responses-to-staticiforme Changes: ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -26,23 +26,13 @@ trap "rm -Rf $old_ur" EXIT mv "$tbb_version_type" "$old_ur/$tbb_version_type" tar -xf "$update_responses_tar" -# Keep download-*.json files from previous release if they are not in -# the new release. This happens when a release does not include some -# platforms. See tor-browser-build#41039. -IFS=$'\n' -for file in $(ls -1 "$old_ur/$tbb_version_type"/download-*.json) -do - fname=$(basename "$file") - test -f "$tbb_version_type/$fname" && continue - mv "$file" "$tbb_version_type/$fname" -done - -# Keep directory from previous release if they are not in the new release. +# Keep files and directories from previous release if they are not in +# the new release. # This happens when a release does not include some platforms. -for file in $(ls -1 "$old_ur/$tbb_version_type") +IFS=$'\n' +for file in $(ls -a1 "$old_ur/$tbb_version_type") do - test -d "$old_ur/$tbb_version_type/$file" || continue - test -d "$tbb_version_type/$file" && continue + test -e "$tbb_version_type/$file" && continue mv -f "$old_ur/$tbb_version_type/$file" "$tbb_version_type/$file" done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-144.0a1-16.0-1
by Pier Angelo Vendrame (＠pierov) 20 Oct '25

20 Oct '25

Pier Angelo Vendrame pushed new branch tor-browser-144.0a1-16.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41605: Ignore incrementals if we're not building desktop.
by ma1 (＠ma1) 16 Oct '25

16 Oct '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 04fdae04 by hackademix at 2025-10-16T18:48:23+02:00 Bug 41605: Ignore incrementals if we're not building desktop. - - - - - 2 changed files: - tools/signing/staticiforme-prepare-cdn-dist-upload - tools/signing/wait-for-finished-build Changes: ===================================== tools/signing/staticiforme-prepare-cdn-dist-upload ===================================== @@ -28,7 +28,7 @@ chmod 775 "$dist_dir" chmod 664 "$dist_dir"/* chmod 664 "$dist_dir/.htaccess" -if is_project torbrowser; then +if is_project torbrowser && ls "$dist_dir"/*.mar > /dev/null 2>&1; then cdn_dir="/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser/$tbb_version" if test -d "$cdn_dir" then ===================================== tools/signing/wait-for-finished-build ===================================== @@ -12,9 +12,15 @@ source "$script_dir/functions" var_is_defined ssh_host_builder builder_tor_browser_build_dir +platform_desktop=$(rbm_showconf_boolean var/browser_platforms/signing_desktop) +incrementals="" +if [[ $platform_desktop == 1 ]]; then + incrementals=".incrementals" +fi + while true do - ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \ + ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/sha256sums-unsigned-build$incrementals.txt" && \ exit 0 echo "$(date -Iseconds): Waiting for build to finish..." sleep 5m View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41594: Remove version from tor-expert-bundle and tor-expert-bundle-aar filenames
by boklm (＠boklm) 16 Oct '25

16 Oct '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 02b1ec60 by Nicolas Vigier at 2025-10-16T17:53:42+02:00 Bug 41594: Remove version from tor-expert-bundle and tor-expert-bundle-aar filenames - - - - - 2 changed files: - projects/tor-expert-bundle-aar/config - projects/tor-expert-bundle/config Changes: ===================================== projects/tor-expert-bundle-aar/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' +filename: '[% project %]-[% c("var/build_id") %]' var: ===================================== projects/tor-expert-bundle/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]' +filename: '[% project %]-[% c("var/osname") %]-[% c("var/build_id") %]' version: '[% c("var/torbrowser_version") %]' targets: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41602: Update tools/changelog-format-blog-post
by boklm (＠boklm) 16 Oct '25

16 Oct '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 847f62ee by Nicolas Vigier at 2025-10-16T13:05:44+02:00 Bug 41602: Update tools/changelog-format-blog-post - - - - - 1 changed file: - tools/changelog-format-blog-post Changes: ===================================== tools/changelog-format-blog-post ===================================== @@ -49,6 +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://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt) is:\n\n"; +print "The [full changelog](https://gitlab.torproject.org/tpo/applications/tor-browser-build… since Tor Browser $last_tbversion is:\n\n"; print $changelog; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] 4 commits: alpha: new version, 15.0a4 (linux-x86_64)
by ma1 (＠ma1) 16 Oct '25

16 Oct '25

ma1 pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 54c6d6a0 by hackademix at 2025-10-16T11:57:34+02:00 alpha: new version, 15.0a4 (linux-x86_64) - - - - - 41a643af by hackademix at 2025-10-16T11:57:35+02:00 alpha: new version, 15.0a4 (macos) - - - - - 0f78bb12 by hackademix at 2025-10-16T11:57:35+02:00 alpha: new version, 15.0a4 (windows-x86_64) - - - - - f1c1489e by hackademix at 2025-10-16T11:57:36+02:00 alpha: new version, 15.0a4 - - - - - 31 changed files: - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json - update_1/alpha/linux-x86_64/.htaccess - − update_1/alpha/linux-x86_64/update-14.5a6-15.0a3-linux-x86_64.xml - − update_1/alpha/linux-x86_64/update-15.0a1-15.0a3-linux-x86_64.xml - + update_1/alpha/linux-x86_64/update-15.0a1-15.0a4-linux-x86_64.xml - − update_1/alpha/linux-x86_64/update-15.0a2-15.0a3-linux-x86_64.xml - + update_1/alpha/linux-x86_64/update-15.0a2-15.0a4-linux-x86_64.xml - + update_1/alpha/linux-x86_64/update-15.0a3-15.0a4-linux-x86_64.xml - − update_1/alpha/linux-x86_64/update-15.0a3-linux-x86_64.xml - + update_1/alpha/linux-x86_64/update-15.0a4-linux-x86_64.xml - update_1/alpha/macos/.htaccess - − update_1/alpha/macos/update-14.5a6-15.0a3-macos.xml - − update_1/alpha/macos/update-15.0a1-15.0a3-macos.xml - + update_1/alpha/macos/update-15.0a1-15.0a4-macos.xml - − update_1/alpha/macos/update-15.0a2-15.0a3-macos.xml - + update_1/alpha/macos/update-15.0a2-15.0a4-macos.xml - + update_1/alpha/macos/update-15.0a3-15.0a4-macos.xml - − update_1/alpha/macos/update-15.0a3-macos.xml - + update_1/alpha/macos/update-15.0a4-macos.xml - update_1/alpha/windows-x86_64/.htaccess - − update_1/alpha/windows-x86_64/update-14.5a6-15.0a3-windows-x86_64.xml - − update_1/alpha/windows-x86_64/update-15.0a1-15.0a3-windows-x86_64.xml - + update_1/alpha/windows-x86_64/update-15.0a1-15.0a4-windows-x86_64.xml - − update_1/alpha/windows-x86_64/update-15.0a2-15.0a3-windows-x86_64.xml - + update_1/alpha/windows-x86_64/update-15.0a2-15.0a4-windows-x86_64.xml - + update_1/alpha/windows-x86_64/update-15.0a3-15.0a4-windows-x86_64.xml - − update_1/alpha/windows-x86_64/update-15.0a3-windows-x86_64.xml - + update_1/alpha/windows-x86_64/update-15.0a4-windows-x86_64.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41600: update lyrebird version to v0.6.2
by Pier Angelo Vendrame (＠pierov) 16 Oct '25

16 Oct '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6ea8ed08 by Shelikhoo at 2025-10-16T10:19:33+02:00 Bug 41600: update lyrebird version to v0.6.2 - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.6.0 +version: 0.6.2 git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyre… git_hash: 'lyrebird-[% c("version") %]' tag_gpg_id: 1 @@ -9,7 +9,7 @@ container: use_container: 1 var: - go_vendor_sha256sum: 788d63f5cbe2b618f314df87d9f1b33bc26af44a1c7535e80b34400c2efb55d1 + go_vendor_sha256sum: 4cfab47a79b430bd40a72c4a7d7b2cf5ae57e73cdeea4d4fbbfb5a76beeb43c5 targets: nightly: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] 6 commits: alpha: new version, 15.0a4 (linux-i686)
by ma1 (＠ma1) 16 Oct '25

16 Oct '25

ma1 pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 26fe91f2 by hackademix at 2025-10-16T10:16:53+02:00 alpha: new version, 15.0a4 (linux-i686) - - - - - 25dca6b5 by hackademix at 2025-10-16T10:16:53+02:00 alpha: new version, 15.0a4 (linux-x86_64) - - - - - 15978cb5 by hackademix at 2025-10-16T10:16:54+02:00 alpha: new version, 15.0a4 (macos) - - - - - 7a4aafc6 by hackademix at 2025-10-16T10:16:54+02:00 alpha: new version, 15.0a4 (windows-i686) - - - - - 8436fc50 by hackademix at 2025-10-16T10:16:54+02:00 alpha: new version, 15.0a4 (windows-x86_64) - - - - - ab4c2374 by hackademix at 2025-10-16T10:16:55+02:00 alpha: new version, 15.0a4 - - - - - 52 changed files: - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json - update_3/alpha/download-linux-i686.json - update_3/alpha/download-linux-x86_64.json - update_3/alpha/download-macos.json - update_3/alpha/download-windows-i686.json - update_3/alpha/download-windows-x86_64.json - update_3/alpha/downloads.json - update_3/alpha/linux-i686/.htaccess - − update_3/alpha/linux-i686/update-14.5a6-15.0a3-linux-i686.xml - − update_3/alpha/linux-i686/update-15.0a1-15.0a3-linux-i686.xml - + update_3/alpha/linux-i686/update-15.0a1-15.0a4-linux-i686.xml - − update_3/alpha/linux-i686/update-15.0a2-15.0a3-linux-i686.xml - + update_3/alpha/linux-i686/update-15.0a2-15.0a4-linux-i686.xml - + update_3/alpha/linux-i686/update-15.0a3-15.0a4-linux-i686.xml - update_3/alpha/linux-i686/update-15.0a3-linux-i686.xml → update_3/alpha/linux-i686/update-15.0a4-linux-i686.xml - update_3/alpha/linux-x86_64/.htaccess - − update_3/alpha/linux-x86_64/update-14.5a6-15.0a3-linux-x86_64.xml - − update_3/alpha/linux-x86_64/update-15.0a1-15.0a3-linux-x86_64.xml - + update_3/alpha/linux-x86_64/update-15.0a1-15.0a4-linux-x86_64.xml - − update_3/alpha/linux-x86_64/update-15.0a2-15.0a3-linux-x86_64.xml - + update_3/alpha/linux-x86_64/update-15.0a2-15.0a4-linux-x86_64.xml - + update_3/alpha/linux-x86_64/update-15.0a3-15.0a4-linux-x86_64.xml - update_3/alpha/linux-x86_64/update-15.0a3-linux-x86_64.xml → update_3/alpha/linux-x86_64/update-15.0a4-linux-x86_64.xml - update_3/alpha/macos/.htaccess - − update_3/alpha/macos/update-14.5a6-15.0a3-macos.xml - − update_3/alpha/macos/update-15.0a1-15.0a3-macos.xml - + update_3/alpha/macos/update-15.0a1-15.0a4-macos.xml - − update_3/alpha/macos/update-15.0a2-15.0a3-macos.xml - + update_3/alpha/macos/update-15.0a2-15.0a4-macos.xml - + update_3/alpha/macos/update-15.0a3-15.0a4-macos.xml - update_3/alpha/macos/update-15.0a3-macos.xml → update_3/alpha/macos/update-15.0a4-macos.xml - update_3/alpha/windows-i686/.htaccess - − update_3/alpha/windows-i686/update-14.5a6-15.0a3-windows-i686.xml - − update_3/alpha/windows-i686/update-15.0a1-15.0a3-windows-i686.xml - + update_3/alpha/windows-i686/update-15.0a1-15.0a4-windows-i686.xml - − update_3/alpha/windows-i686/update-15.0a2-15.0a3-windows-i686.xml - + update_3/alpha/windows-i686/update-15.0a2-15.0a4-windows-i686.xml - + update_3/alpha/windows-i686/update-15.0a3-15.0a4-windows-i686.xml - − update_3/alpha/windows-i686/update-15.0a3-windows-i686.xml - + update_3/alpha/windows-i686/update-15.0a4-windows-i686.xml - update_3/alpha/windows-x86_64/.htaccess - − update_3/alpha/windows-x86_64/update-14.5a6-15.0a3-windows-x86_64.xml - − update_3/alpha/windows-x86_64/update-15.0a1-15.0a3-windows-x86_64.xml - + update_3/alpha/windows-x86_64/update-15.0a1-15.0a4-windows-x86_64.xml - − update_3/alpha/windows-x86_64/update-15.0a2-15.0a3-windows-x86_64.xml - + update_3/alpha/windows-x86_64/update-15.0a2-15.0a4-windows-x86_64.xml - + update_3/alpha/windows-x86_64/update-15.0a3-15.0a4-windows-x86_64.xml - − update_3/alpha/windows-x86_64/update-15.0a3-windows-x86_64.xml - + update_3/alpha/windows-x86_64/update-15.0a4-windows-x86_64.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-15.0a4-build1
by Pier Angelo Vendrame (＠pierov) 15 Oct '25

15 Oct '25

Pier Angelo Vendrame pushed new tag mb-15.0a4-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-15.0a4-build1
by Pier Angelo Vendrame (＠pierov) 15 Oct '25

15 Oct '25

Pier Angelo Vendrame pushed new tag tbb-15.0a4-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41566, 41567: Prepare Tor, Mullvad Browser 15.0a4
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3f55477b by Pier Angelo Vendrame at 2025-10-15T21:29:30+02:00 Bug 41566, 41567: Prepare Tor, Mullvad Browser 15.0a4 - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/openssl/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,49 @@ +Mullvad Browser 15.0a4 - October 16 2025 + * All Platforms + * Updated Firefox to 140.4.0esr + * Updated NoScript to 13.2.1 + * Updated Mullvad Browser Extension to 0.9.5 + * Updated uBlock Origin to 1.66.4 + * Bug 477: Rebase Mullvad Browser Alpha onto 140.4.0esr [mullvad-browser] + * Bug 478: Update to the Mullvad Browser extension to 0.9.5 [mullvad-browser] + * Bug 19741: Opensearch (contextual search) does not obey FPI [tor-browser] + * Bug 43850: Modify the Contrast Control settings for RFP [tor-browser] + * Bug 43869: Hide pens with RFP [tor-browser] + * Bug 43900: Open newtab rather than firefoxview when unloading the last tab [tor-browser] + * Bug 44107: Switch tab search action is missing an icon [tor-browser] + * Bug 44108: Fix the new history sidebar [tor-browser] + * Bug 44123: Do not trim protocol off of URLs ever [tor-browser] + * Bug 44153: Test search engines [tor-browser] + * Bug 44159: Change or hide the sidebar settings description [tor-browser] + * Bug 44177: Remove more urlbar actions [tor-browser] + * Bug 44178: Search preservation does not work with duckduckgo in safest security level [tor-browser] + * Bug 44187: TLS session tickets leak Private Browsing mode [tor-browser] + * Bug 44213: Reduce linkability concerns of the "Search with" contextual search action [tor-browser] + * Bug 44214: Update letterboxing to reflect changes in ESR 140 [tor-browser] + * Bug 44215: Hide Firefox home settings in about:preferences [tor-browser] + * Bug 44221: Backport MozBug 1984333 Bump Spoofed Processor Count [tor-browser] + * Bug 44234: No images in PDF [tor-browser] + * Bug 44240: Typo on dom.security.https_first_add_exception_on_failure [tor-browser] + * Bug 44242: Hand over Security Level's WebAssembly controls to NoScript [tor-browser] + * Bug 44262: Disable adding search engines from HTML forms [tor-browser] + * Linux + * Bug 44227: Some CJK characters cannot be rendered by Tor which uses the Noto font family [tor-browser] + * Bug 41586: Replace Noto CJK with Jigmo on Linux [tor-browser-build] + * Build System + * All Platforms + * Bug 41373: Remove `_ALL` from mar filenames [tor-browser-build] + * Bug 41568: Update instructions for manually building 7zip [tor-browser-build] + * Bug 41579: Add zip to the list of Tor Browser Build dependencies [tor-browser-build] + * Bug 41588: Restore legacy channel support in projects/release/update_responses_config.yml [tor-browser-build] + * Bug 41589: Backport tor-browser-build-browser#41270: Add updater rewriterules to make 13.5.7 a watershed [tor-browser-build] + * Windows + * Bug 44167: Move the nsis-uninstall.patch to tor-browser repository [tor-browser] + * macOS + * Bug 41571: Work-around to prevent older 7z versions to break rcodesign. [tor-browser-build] + * Linux + * Bug 41558: Share descriptions between Linux packages and archives [tor-browser-build] + * Bug 41569: Use var/display_name in .desktop files [tor-browser-build] + Mullvad Browser 15.0a3 - September 18 2025 * All Platforms * Updated Firefox to 140.3.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,73 @@ +Tor Browser 15.0a4 - October 16 2025 + * All Platforms + * Updated NoScript to 13.2.1 + * Updated OpenSSL to 3.5.4 + * Bug 19741: Opensearch (contextual search) does not obey FPI [tor-browser] + * Bug 43850: Modify the Contrast Control settings for RFP [tor-browser] + * Bug 43869: Hide pens with RFP [tor-browser] + * Bug 44068: Handle migration from meek-azure to meek built-in bridge type [tor-browser] + * Bug 44234: No images in PDF [tor-browser] + * Bug 44240: Typo on dom.security.https_first_add_exception_on_failure [tor-browser] + * Bug 44242: Hand over Security Level's WebAssembly controls to NoScript [tor-browser] + * Bug 44250: Rebase Tor Browser Alpha onto 140.4esr [tor-browser] + * Bug 41574: Update Snowflake builtin bridge lines [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 140.4.0esr + * Bug 43900: Open newtab rather than firefoxview when unloading the last tab [tor-browser] + * Bug 44101: Toolbar connection status is not visible when using vertical tabs [tor-browser] + * Bug 44107: Switch tab search action is missing an icon [tor-browser] + * Bug 44108: Fix the new history sidebar [tor-browser] + * Bug 44123: Do not trim protocol off of URLs ever [tor-browser] + * Bug 44153: Test search engines [tor-browser] + * Bug 44159: Change or hide the sidebar settings description [tor-browser] + * Bug 44177: Remove more urlbar actions [tor-browser] + * Bug 44178: Search preservation does not work with duckduckgo in safest security level [tor-browser] + * Bug 44184: Duckduckgo Onion Lite search does not work properly in safest when added as a search engine [tor-browser] + * Bug 44187: TLS session tickets leak Private Browsing mode [tor-browser] + * Bug 44192: Hovering unloaded tab causes console error [tor-browser] + * Bug 44213: Reduce linkability concerns of the "Search with" contextual search action [tor-browser] + * Bug 44214: Update letterboxing to reflect changes in ESR 140 [tor-browser] + * Bug 44215: Hide Firefox home settings in about:preferences [tor-browser] + * Bug 44221: Backport MozBug 1984333 Bump Spoofed Processor Count [tor-browser] + * Bug 44239: DDG HTML page and search results displayed incorrectly with Safest security setting [tor-browser] + * Bug 44262: Disable adding search engines from HTML forms [tor-browser] + * Linux + * Bug 44227: Some CJK characters cannot be rendered by Tor which uses the Noto font family [tor-browser] + * Bug 41586: Replace Noto CJK with Jigmo on Linux [tor-browser-build] + * Android + * Updated GeckoView to 140.4.0esr + * Bug 43401: Replace the constructor of Locale with a builder [tor-browser] + * Bug 43643: Clean out unused tor connect strings [tor-browser] + * Bug 43650: Survey banner behaves like a dialog on Android, rather than a card [tor-browser] + * Bug 43676: Preemptively disable unified trust panel by default so we are tracking for next ESR [tor-browser] + * Bug 44031: Implement YEC 2025 Takeover for Android Stable [tor-browser] + * Bug 44218: Tor Browser Alpha for Android (15.0a2) doesn't work on Huawei devices P20 and P30 [tor-browser] + * Bug 44237: Revoke access to all advertising ids available in Android [tor-browser] + * Build System + * All Platforms + * Bug 41568: Update instructions for manually building 7zip [tor-browser-build] + * Bug 41576: Build expert bundles outside containers [tor-browser-build] + * Bug 41579: Add zip to the list of Tor Browser Build dependencies [tor-browser-build] + * Bug 41588: Restore legacy channel support in projects/release/update_responses_config.yml [tor-browser-build] + * Bug 41589: Backport tor-browser-build-browser#41270: Add updater rewriterules to make 13.5.7 a watershed [tor-browser-build] + * Windows + macOS + Linux + * Bug 41373: Remove `_ALL` from mar filenames [tor-browser-build] + * Bug 44131: Generate torrc-defaults and put it in objdir post-build [tor-browser] + * Windows + Linux + Android + * Updated Go to 1.24.9 + * Windows + * Bug 44167: Move the nsis-uninstall.patch to tor-browser repository [tor-browser] + * macOS + * Bug 41571: Work-around to prevent older 7z versions to break rcodesign. [tor-browser-build] + * Linux + * Bug 41558: Share descriptions between Linux packages and archives [tor-browser-build] + * Bug 41569: Use var/display_name in .desktop files [tor-browser-build] + * Android + * Bug 44220: Disable the JS minifier as it produces invalid JS [tor-browser] + * Bug 41577: Minify JS with UglifyJS on Android x86 [tor-browser-build] + * Bug 41582: Drop --pack-dyn-relocs=relr [tor-browser-build] + * Bug 41583: Align tor and PTs to 16kB on Android [tor-browser-build] + Tor Browser 15.0a3 - September 18 2025 * All Platforms * Updated Tor to 0.4.9.3-alpha ===================================== projects/browser/config ===================================== @@ -113,16 +113,16 @@ input_files: enable: '[% ! c("var/android") %]' - filename: dmg-root enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4551629/noscript-13.0.9.x… + - URL: https://addons.mozilla.org/firefox/downloads/file/4593796/noscript-13.2.1.x… name: noscript - sha256sum: 525ab61aff21f67d10c3e20965a86ed479631549908a658f54692adc47d771f5 - - URL: https://addons.mozilla.org/firefox/downloads/file/4573289/ublock_origin-1.6… + sha256sum: 190297f3d1e55db0c65f9bc00460bea9b753939d428ea593d6cef27fde1ce69a + - URL: https://addons.mozilla.org/firefox/downloads/file/4578681/ublock_origin-1.6… name: ublock-origin - sha256sum: 155820bace5bf7c8ba547e27678a4a25251131c54904f02f5bf340996f6fdbdc + sha256sum: bc62cd930601212f1568964389352bbd4b1808466f2c9ac1198c754338077fb0 enable: '[% c("var/mullvad-browser") %]' - - URL: https://cdn.mullvad.net/browser-extension/0.9.4/mullvad-browser-extension-0… + - URL: https://cdn.mullvad.net/browser-extension/0.9.5/mullvad-browser-extension-0… name: mullvad-extension - sha256sum: c91fcf30fe9a998f45ddc92e083bca4cd7b6dbb24fc545391e155ed1ec13c8cb + sha256sum: c36f8d5447300621579f7f1408a25f25dac3929c867e7ae5db9fc8b82e80a4e9 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox/config ===================================== @@ -21,7 +21,7 @@ var: browser_series: '15.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser ===================================== projects/geckoview/config ===================================== @@ -23,7 +23,7 @@ var: browser_series: '15.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 2 gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]' deps: ===================================== projects/go/config ===================================== @@ -1,11 +1,11 @@ # vim: filetype=yaml sw=2 -version: '1.24.7' +version: '1.24.9' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 var: - source_sha256: 2a8f50db0f88803607c50d7ea8834dcb7bd483c6b428a91e360fdf8624b46464 + source_sha256: c72f81ba54fe00efe7f3e7499d400979246881b13b775e9a9bb85541c11be695 no_crosscompile: 1 setup: | mkdir -p /var/tmp/dist ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 311002 +version: 321660 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.5.3 +version: 3.5.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -33,5 +33,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://github.com/openssl/openssl/releases/download/openssl-[% c("version") %]/openssl-[% c("version") %].tar.gz' - sha256sum: c9489d2abcf943cdc8329a57092331c598a402938054dc3a22218aea8a8ec3bf + sha256sum: 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 name: openssl ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937 + git_hash: dff70d135408cfc24931c170efa91fbaded19914 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: db5e90248e74338ce72ff118bdb749fea6ea2606 + git_hash: ca310e42296a7085ea59fc323592f3dc702123ac targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 092a1e145fc7d558afbb0f6490f21aef4f6f5b2e + git_hash: 0efa38c746df88feeb4daa7150e394e87e6d4d18 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -74,11 +74,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '15.0a3' + torbrowser_version: '15.0a4' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2025/09/17 18:30:00' + browser_release_date: '2025/10/15 18:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_default_channel: alpha browser_platforms: @@ -128,9 +128,9 @@ var: updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 15.0a3 - 15.0a2 - 15.0a1 - - 14.5a6 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # torbrowser_legacy_version: 13.5.22 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 44131: Skip copying Bundle-Data when building for macos
by boklm (＠boklm) 15 Oct '25

15 Oct '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b0e80195 by Beatriz Rizental at 2025-10-15T09:51:52+02:00 Bug 44131: Skip copying Bundle-Data when building for macos That folder doesn't exist anymore for macos. - - - - - a2e5d129 by Beatriz Rizental at 2025-10-15T09:53:45+02:00 Bug 44131: Escape backlashes when building tor-expert-bundle This is currently breaking the Windows builds. - - - - - 2 changed files: - projects/browser/build - projects/tor-expert-bundle/config Changes: ===================================== projects/browser/build ===================================== @@ -219,8 +219,10 @@ do cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH" [% IF c("var/tor-browser") -%] cp -a Bundle-Data/Docs-TBB/* "$tbdir/$DOCSPATH" - tar -C Bundle-Data/[% bundledata_osname %] \ - -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x + [% IF ! c("var/macos") %] + tar -C Bundle-Data/[% bundledata_osname %] \ + -c . | tar -C "$tbdir/[% c('var/ProjectName') %]" -x + [% END %] [% ELSIF c("var/mullvad-browser") -%] cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH" [% END -%] ===================================== projects/tor-expert-bundle/config ===================================== @@ -11,7 +11,8 @@ targets: pt_path: PluggableTransports/ windows: var: - pt_path: TorBrowser\Tor\PluggableTransports\ + # Backlashes need to be escaped here. + pt_path: TorBrowser\\Tor\\PluggableTransports\\ pt_extension: .exe input_files: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-140.4.0esr-15.0-1-build2
by Pier Angelo Vendrame (＠pierov) 15 Oct '25

15 Oct '25

Pier Angelo Vendrame pushed new tag mullvad-browser-140.4.0esr-15.0-1-build2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-140.4.0esr-15.0-1-build2
by Pier Angelo Vendrame (＠pierov) 15 Oct '25

15 Oct '25

Pier Angelo Vendrame pushed new tag tor-browser-140.4.0esr-15.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.4.0esr-15.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch mullvad-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: e64d0d0c by hackademix at 2025-10-15T18:07:33+00:00 fixup! Firefox preference overrides. BB 44262: Disable adding search engines from HTML forms - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -216,6 +216,9 @@ pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); pref("browser.urlbar.recentsearches.featureGate", false); pref("browser.urlbar.suggest.recentsearches", false); +// tor-browser#44262: Disable adding search engines from HTML forms +pref("browser.urlbar.update2.engineAliasRefresh", false); + // Disable the UITour API // See tor-browser#41457 and // https://bugzilla.mozilla.org/show_bug.cgi?id=1915280 View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/e64… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/e64… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.4.0esr-15.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch base-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 85dc5eb3 by hackademix at 2025-10-15T18:07:11+00:00 fixup! Firefox preference overrides. BB 44262: Disable adding search engines from HTML forms - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -216,6 +216,9 @@ pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); pref("browser.urlbar.recentsearches.featureGate", false); pref("browser.urlbar.suggest.recentsearches", false); +// tor-browser#44262: Disable adding search engines from HTML forms +pref("browser.urlbar.update2.engineAliasRefresh", false); + // Disable the UITour API // See tor-browser#41457 and // https://bugzilla.mozilla.org/show_bug.cgi?id=1915280 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/85dc5eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/85dc5eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.4.0esr-15.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2d9ad814 by hackademix at 2025-10-15T18:02:31+00:00 fixup! Firefox preference overrides. BB 44262: Disable adding search engines from HTML forms - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -216,6 +216,9 @@ pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); pref("browser.urlbar.recentsearches.featureGate", false); pref("browser.urlbar.suggest.recentsearches", false); +// tor-browser#44262: Disable adding search engines from HTML forms +pref("browser.urlbar.update2.engineAliasRefresh", false); + // Disable the UITour API // See tor-browser#41457 and // https://bugzilla.mozilla.org/show_bug.cgi?id=1915280 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2d9ad81… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2d9ad81… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.4.0esr-15.0-1] fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 23c8a66b by Henry Wilkes at 2025-10-15T17:43:21+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44101: Show tor connection status in the nav bar when the tab bar is hidden. - - - - - 4 changed files: - browser/base/content/navigator-toolbox.inc.xhtml - toolkit/components/torconnect/content/torConnectTitlebarStatus.css - + toolkit/components/torconnect/content/torConnectTitlebarStatus.inc.xhtml - toolkit/components/torconnect/content/torConnectTitlebarStatus.js Changes: ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -100,12 +100,7 @@ #include private-browsing-indicator.inc.xhtml <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/> - <html:div id="tor-connect-titlebar-status" role="status"> - <html:img alt="" - src="chrome://global/content/torconnect/tor-not-connected-to-connected-animated.svg" /> - <html:span id="tor-connect-titlebar-status-label"></html:span> - </html:div> - +#include ../../../toolkit/components/torconnect/content/torConnectTitlebarStatus.inc.xhtml #include titlebar-items.inc.xhtml </toolbar> @@ -526,6 +521,7 @@ <hbox class="titlebar-spacer" type="post-tabs"/> #include private-browsing-indicator.inc.xhtml <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/> +#include ../../../toolkit/components/torconnect/content/torConnectTitlebarStatus.inc.xhtml #include titlebar-items.inc.xhtml </toolbar> ===================================== toolkit/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -1,16 +1,28 @@ -#tor-connect-titlebar-status:not([hidden]) { +.tor-connect-titlebar-status:not([hidden]) { display: flex; align-items: center; - /* Want same as #private-browsing-indicator-with-label */ + /* Want same as .private-browsing-indicator-with-label */ margin-inline: 7px; + + #navigator-toolbox[tabs-hidden] #TabsToolbar > & { + /* Hide in the tabs bar when the tabs bar is hidden. E.g. when using + * vertical tabs. Should be shown in the #nav-bar instead. + * See tor-browser#44101. */ + display: none; + } + + #navigator-toolbox:not([tabs-hidden]) #nav-bar > & { + /* Hide in the nav bar when the (horizontal) tabs bar is visible. */ + display: none; + } } -#tor-connect-titlebar-status-label { +.tor-connect-titlebar-status-label { margin-inline: 6px; white-space: nowrap; } -#tor-connect-titlebar-status img { +.tor-connect-titlebar-status img { -moz-context-properties: fill, stroke; fill: var(--icon-color); stroke: var(--icon-color); @@ -25,7 +37,7 @@ object-position: var(--tor-not-connected-offset); } -#tor-connect-titlebar-status.tor-connect-status-potentially-blocked img { +.tor-connect-titlebar-status.tor-connect-status-potentially-blocked img { /* NOTE: context-stroke is only used for the first "frame" for the slash. When * we assign the potentially-blocked class, we do *not* expect to be connected * at the same time, so we only expect this first frame to be visible in this @@ -33,17 +45,17 @@ stroke: var(--icon-color-critical); } -#tor-connect-titlebar-status.tor-connect-status-connected img { +.tor-connect-titlebar-status.tor-connect-status-connected img { object-position: var(--tor-connected-offset); } @media not ((prefers-contrast) or (forced-colors)) { /* Make the connected text and icon purple. */ - #tor-connect-titlebar-status.tor-connect-status-connected { + .tor-connect-titlebar-status.tor-connect-status-connected { color: var(--tor-text-color); } - #tor-connect-titlebar-status.tor-connect-status-connected img { + .tor-connect-titlebar-status.tor-connect-status-connected img { fill: var(--tor-text-color); stroke: var(--tor-text-color); } @@ -60,11 +72,11 @@ } @media (prefers-reduced-motion: no-preference) { - #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition { + .tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition { transition: color 1000ms; } - #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition img { + .tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition img { transition: fill 1000ms, stroke 1000ms; animation-name: onion-not-connected-to-connected; animation-delay: 200ms; ===================================== toolkit/components/torconnect/content/torConnectTitlebarStatus.inc.xhtml ===================================== @@ -0,0 +1,7 @@ +<html:div class="tor-connect-titlebar-status" role="status"> + <html:img + alt="" + src="chrome://global/content/torconnect/tor-not-connected-to-connected-animated.svg" + /> + <html:span class="tor-connect-titlebar-status-label"></html:span> +</html:div> ===================================== toolkit/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -3,21 +3,15 @@ */ var gTorConnectTitlebarStatus = { /** - * The status element in the title bar. + * The status elements and their labels. * - * @type {Element} + * @type {{status: Element, label: Element}[]} */ - node: null, - /** - * The status label. - * - * @type {Element} - */ - label: null, + _elements: [], /** * Whether we are connected, or null if the connection state is not yet known. * - * @type {bool?} + * @type {boolean?} */ connected: null, @@ -31,21 +25,21 @@ var gTorConnectTitlebarStatus = { this._strings = TorStrings.torConnect; - this.node = document.getElementById("tor-connect-titlebar-status"); - this.label = document.getElementById("tor-connect-titlebar-status-label"); + this._elements = Array.from( + document.querySelectorAll(".tor-connect-titlebar-status"), + element => { + return { + status: element, + label: element.querySelector(".tor-connect-titlebar-status-label"), + }; + } + ); // The title also acts as an accessible name for the role="status". - this.node.setAttribute("title", this._strings.titlebarStatusName); + for (const { status } of this._elements) { + status.setAttribute("title", this._strings.titlebarStatusName); + } - this._observeTopic = TorConnectTopics.StageChange; - this._stateListener = { - observe: (subject, topic) => { - if (topic !== this._observeTopic) { - return; - } - this._torConnectStateChanged(); - }, - }; - Services.obs.addObserver(this._stateListener, this._observeTopic); + Services.obs.addObserver(this, TorConnectTopics.StageChange); this._torConnectStateChanged(); }, @@ -54,7 +48,15 @@ var gTorConnectTitlebarStatus = { * De-initialize the component. */ uninit() { - Services.obs.removeObserver(this._stateListener, this._observeTopic); + Services.obs.removeObserver(this, TorConnectTopics.StageChange); + }, + + observe(subject, topic) { + switch (topic) { + case TorConnectTopics.StageChange: + this._torConnectStateChanged(); + break; + } }, /** @@ -67,7 +69,7 @@ var gTorConnectTitlebarStatus = { switch (TorConnect.stageName) { case TorConnectStage.Disabled: // Hide immediately. - this.node.hidden = true; + this._setHidden(true); return; case TorConnectStage.Bootstrapped: textId = "titlebarStatusConnected"; @@ -85,7 +87,9 @@ var gTorConnectTitlebarStatus = { } break; } - this.label.textContent = this._strings[textId]; + for (const { label } of this._elements) { + label.textContent = this._strings[textId]; + } if (this.connected !== connected) { // When we are transitioning from // this.connected = false @@ -104,11 +108,13 @@ var gTorConnectTitlebarStatus = { // // We only expect this latter case when opening a new window after // bootstrapping has already completed. See tor-browser#41850. - this.node.classList.toggle( - "tor-connect-status-animate-transition", - connected && this.connected !== null - ); - this.node.classList.toggle("tor-connect-status-connected", connected); + for (const { status } of this._elements) { + status.classList.toggle( + "tor-connect-status-animate-transition", + connected && this.connected !== null + ); + status.classList.toggle("tor-connect-status-connected", connected); + } this.connected = connected; if (connected) { this._startHiding(); @@ -119,10 +125,23 @@ var gTorConnectTitlebarStatus = { this._stopHiding(); } } - this.node.classList.toggle( - "tor-connect-status-potentially-blocked", - potentiallyBlocked - ); + for (const { status } of this._elements) { + status.classList.toggle( + "tor-connect-status-potentially-blocked", + potentiallyBlocked + ); + } + }, + + /** + * Hide or show the status. + * + * @param {boolean} hide - Whether to hide the status. + */ + _setHidden(hide) { + for (const { status } of this._elements) { + status.hidden = hide; + } }, /** @@ -134,7 +153,7 @@ var gTorConnectTitlebarStatus = { return; } this._hidingTimeout = setTimeout(() => { - this.node.hidden = true; + this._setHidden(true); }, 5000); }, @@ -146,6 +165,6 @@ var gTorConnectTitlebarStatus = { clearTimeout(this._hidingTimeout); this._hidingTimeout = 0; } - this.node.hidden = false; + this._setHidden(false); }, }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/23c8a66… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/23c8a66… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.4.0esr-15.0-1] Bug 1993166 - Improve origin attributes on opensearch. r=Standard8,urlbar-reviewers
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch mullvad-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 9795642d by Pier Angelo Vendrame at 2025-10-15T17:37:56+00:00 Bug 1993166 - Improve origin attributes on opensearch. r=Standard8,urlbar-reviewers Differential Revision: https://phabricator.services.mozilla.com/D268183 - - - - - 5 changed files: - browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs Changes: ===================================== browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs ===================================== @@ -286,10 +286,22 @@ class ProviderContextualSearch extends ActionsProvider { let { type, engine } = this.#resultEngine; if (type == OPEN_SEARCH_ENGINE) { + let originAttributes; + try { + let currentURI = Services.io.newURI(queryContext.currentPage); + originAttributes = { + firstPartyDomain: Services.eTLD.getSchemelessSite(currentURI), + }; + } catch {} let openSearchEngineData = await lazy.loadAndParseOpenSearchEngine( - Services.io.newURI(engine.uri) + Services.io.newURI(engine.uri), + null, + originAttributes ); - engine = new lazy.OpenSearchEngine({ engineData: openSearchEngineData }); + engine = new lazy.OpenSearchEngine({ + engineData: openSearchEngineData, + originAttributes, + }); } this.#performSearch( ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -56,6 +56,8 @@ export class OpenSearchEngine extends SearchEngine { * @param {string} [options.faviconURL] * The website favicon, to be used if the engine data hasn't specified an * icon. + * @param {object} [options.originAttributes] + * The origin attributes to use to download additional resources. */ constructor(options = {}) { super({ @@ -68,7 +70,10 @@ export class OpenSearchEngine extends SearchEngine { }); if (options.faviconURL) { - this._setIcon(options.faviconURL, undefined, false).catch(e => + this._setIcon(options.faviconURL, { + override: false, + originAttributes: options.originAttributes, + }).catch(e => lazy.logConsole.error( `Error while setting icon for search engine ${options.engineData.name}:`, e.message @@ -77,7 +82,7 @@ export class OpenSearchEngine extends SearchEngine { } if (options.engineData) { - this.#setEngineData(options.engineData); + this.#setEngineData(options.engineData, options.originAttributes); // As this is a new engine, we must set the verification hash for the load // path set in the constructor. @@ -189,8 +194,10 @@ export class OpenSearchEngine extends SearchEngine { * * @param {OpenSearchProperties} data * The OpenSearch data. + * @param {object} originAttributes + * The origin attributes for any additional downloads */ - #setEngineData(data) { + #setEngineData(data, originAttributes) { let name = data.name.trim(); if (Services.search.getEngineByName(name)) { throw Components.Exception( @@ -258,11 +265,12 @@ export class OpenSearchEngine extends SearchEngine { } for (let image of data.images) { - this._setIcon(image.url, image.size).catch(e => - lazy.logConsole.error( - `Error while setting icon for search engine ${data.name}:`, - e.message - ) + this._setIcon(image.url, { size: image.size, originAttributes }).catch( + e => + lazy.logConsole.error( + `Error while setting icon for search engine ${data.name}:`, + e.message + ) ); } } ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -585,15 +585,19 @@ export class SearchEngine { * @param {string} iconURL * A URI string pointing to the engine's icon. * Must have http[s], data, or moz-extension protocol. - * @param {number} [size] + * @param {object} options + * The options object + * @param {number} [options.size] * Width and height of the icon (determined automatically if not provided). - * @param {boolean} [override] + * @param {boolean} [options.override] * Whether the new URI should override an existing one. + * @param {object} [options.originAttributes] + * The origin attributes to use to load the icon. * @returns {Promise<void>} * Resolves when the icon was set. * Rejects with an Error if there was an error. */ - async _setIcon(iconURL, size, override = true) { + async _setIcon(iconURL, options = { override: true }) { lazy.logConsole.debug( "_setIcon: Setting icon url for", this.name, @@ -601,8 +605,12 @@ export class SearchEngine { limitURILength(iconURL) ); - [iconURL, size] = await this._downloadAndRescaleIcon(iconURL, size); - this._addIconToMap(iconURL, size, override); + let size; + [iconURL, size] = await this._downloadAndRescaleIcon(iconURL, { + size: options.size, + originAttributes: options.originAttributes, + }); + this._addIconToMap(iconURL, size, options.override); if (this._engineAddedToStore) { lazy.SearchUtils.notifyAction( @@ -620,18 +628,24 @@ export class SearchEngine { * @param {string} iconURL * A URI string pointing to the engine's icon. * Must have http[s], data, or moz-extension protocol. - * @param {number} [size] + * @param {object} options + * The options object + * @param {number} [options.size] * Width and height of the icon (determined automatically if not provided). + * @param {object} [options.originAttributes] + * The origin attributes to use to load the icon. * @returns {Promise<[string, number]>} * Resolves to [dataURL, size] if successful and rejects if there was an error. */ - async _downloadAndRescaleIcon(iconURL, size) { + async _downloadAndRescaleIcon(iconURL, options = {}) { let uri = lazy.SearchUtils.makeURI(iconURL); if (!uri) { throw new Error(`Invalid URI`); } + let size = options.size; + switch (uri.scheme) { case "moz-extension": { if (!size) { @@ -644,7 +658,10 @@ export class SearchEngine { case "data": case "http": case "https": { - let [byteArray, contentType] = await lazy.SearchUtils.fetchIcon(uri); + let [byteArray, contentType] = await lazy.SearchUtils.fetchIcon( + uri, + options.originAttributes + ); if (byteArray.length > lazy.SearchUtils.MAX_ICON_SIZE) { lazy.logConsole.debug( `Rescaling icon for search engine ${this.name}.` ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -772,7 +772,11 @@ export class SearchService { null, originAttributes ); - engine = new lazy.OpenSearchEngine({ engineData, faviconURL: iconURL }); + engine = new lazy.OpenSearchEngine({ + engineData, + faviconURL: iconURL, + originAttributes, + }); } catch (ex) { throw Components.Exception( "addEngine: Error adding engine:\n" + ex, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -511,13 +511,19 @@ export var SearchUtils = { * * @param {string|nsIURI} uri * The URI to the icon. + * @param {object} [originAttributes] + * The origin attributes to download the icon. * @returns {Promise<[Uint8Array, string]>} * Resolves to an array containing the data and the mime type. * Rejects if the icon cannot be fetched. */ - async fetchIcon(uri) { + async fetchIcon(uri, originAttributes = null) { return new Promise((resolve, reject) => { - let chan = SearchUtils.makeChannel(uri, Ci.nsIContentPolicy.TYPE_IMAGE); + let chan = SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE, + originAttributes + ); let listener = new SearchUtils.LoadListener( chan, /^image\//, View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/979… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/979… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.4.0esr-15.0-1] Bug 1993166 - Improve origin attributes on opensearch. r=Standard8,urlbar-reviewers
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch base-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 803d875f by Pier Angelo Vendrame at 2025-10-15T17:37:02+00:00 Bug 1993166 - Improve origin attributes on opensearch. r=Standard8,urlbar-reviewers Differential Revision: https://phabricator.services.mozilla.com/D268183 - - - - - 5 changed files: - browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs Changes: ===================================== browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs ===================================== @@ -286,10 +286,22 @@ class ProviderContextualSearch extends ActionsProvider { let { type, engine } = this.#resultEngine; if (type == OPEN_SEARCH_ENGINE) { + let originAttributes; + try { + let currentURI = Services.io.newURI(queryContext.currentPage); + originAttributes = { + firstPartyDomain: Services.eTLD.getSchemelessSite(currentURI), + }; + } catch {} let openSearchEngineData = await lazy.loadAndParseOpenSearchEngine( - Services.io.newURI(engine.uri) + Services.io.newURI(engine.uri), + null, + originAttributes ); - engine = new lazy.OpenSearchEngine({ engineData: openSearchEngineData }); + engine = new lazy.OpenSearchEngine({ + engineData: openSearchEngineData, + originAttributes, + }); } this.#performSearch( ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -56,6 +56,8 @@ export class OpenSearchEngine extends SearchEngine { * @param {string} [options.faviconURL] * The website favicon, to be used if the engine data hasn't specified an * icon. + * @param {object} [options.originAttributes] + * The origin attributes to use to download additional resources. */ constructor(options = {}) { super({ @@ -68,7 +70,10 @@ export class OpenSearchEngine extends SearchEngine { }); if (options.faviconURL) { - this._setIcon(options.faviconURL, undefined, false).catch(e => + this._setIcon(options.faviconURL, { + override: false, + originAttributes: options.originAttributes, + }).catch(e => lazy.logConsole.error( `Error while setting icon for search engine ${options.engineData.name}:`, e.message @@ -77,7 +82,7 @@ export class OpenSearchEngine extends SearchEngine { } if (options.engineData) { - this.#setEngineData(options.engineData); + this.#setEngineData(options.engineData, options.originAttributes); // As this is a new engine, we must set the verification hash for the load // path set in the constructor. @@ -189,8 +194,10 @@ export class OpenSearchEngine extends SearchEngine { * * @param {OpenSearchProperties} data * The OpenSearch data. + * @param {object} originAttributes + * The origin attributes for any additional downloads */ - #setEngineData(data) { + #setEngineData(data, originAttributes) { let name = data.name.trim(); if (Services.search.getEngineByName(name)) { throw Components.Exception( @@ -258,11 +265,12 @@ export class OpenSearchEngine extends SearchEngine { } for (let image of data.images) { - this._setIcon(image.url, image.size).catch(e => - lazy.logConsole.error( - `Error while setting icon for search engine ${data.name}:`, - e.message - ) + this._setIcon(image.url, { size: image.size, originAttributes }).catch( + e => + lazy.logConsole.error( + `Error while setting icon for search engine ${data.name}:`, + e.message + ) ); } } ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -585,15 +585,19 @@ export class SearchEngine { * @param {string} iconURL * A URI string pointing to the engine's icon. * Must have http[s], data, or moz-extension protocol. - * @param {number} [size] + * @param {object} options + * The options object + * @param {number} [options.size] * Width and height of the icon (determined automatically if not provided). - * @param {boolean} [override] + * @param {boolean} [options.override] * Whether the new URI should override an existing one. + * @param {object} [options.originAttributes] + * The origin attributes to use to load the icon. * @returns {Promise<void>} * Resolves when the icon was set. * Rejects with an Error if there was an error. */ - async _setIcon(iconURL, size, override = true) { + async _setIcon(iconURL, options = { override: true }) { lazy.logConsole.debug( "_setIcon: Setting icon url for", this.name, @@ -601,8 +605,12 @@ export class SearchEngine { limitURILength(iconURL) ); - [iconURL, size] = await this._downloadAndRescaleIcon(iconURL, size); - this._addIconToMap(iconURL, size, override); + let size; + [iconURL, size] = await this._downloadAndRescaleIcon(iconURL, { + size: options.size, + originAttributes: options.originAttributes, + }); + this._addIconToMap(iconURL, size, options.override); if (this._engineAddedToStore) { lazy.SearchUtils.notifyAction( @@ -620,18 +628,24 @@ export class SearchEngine { * @param {string} iconURL * A URI string pointing to the engine's icon. * Must have http[s], data, or moz-extension protocol. - * @param {number} [size] + * @param {object} options + * The options object + * @param {number} [options.size] * Width and height of the icon (determined automatically if not provided). + * @param {object} [options.originAttributes] + * The origin attributes to use to load the icon. * @returns {Promise<[string, number]>} * Resolves to [dataURL, size] if successful and rejects if there was an error. */ - async _downloadAndRescaleIcon(iconURL, size) { + async _downloadAndRescaleIcon(iconURL, options = {}) { let uri = lazy.SearchUtils.makeURI(iconURL); if (!uri) { throw new Error(`Invalid URI`); } + let size = options.size; + switch (uri.scheme) { case "moz-extension": { if (!size) { @@ -644,7 +658,10 @@ export class SearchEngine { case "data": case "http": case "https": { - let [byteArray, contentType] = await lazy.SearchUtils.fetchIcon(uri); + let [byteArray, contentType] = await lazy.SearchUtils.fetchIcon( + uri, + options.originAttributes + ); if (byteArray.length > lazy.SearchUtils.MAX_ICON_SIZE) { lazy.logConsole.debug( `Rescaling icon for search engine ${this.name}.` ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -772,7 +772,11 @@ export class SearchService { null, originAttributes ); - engine = new lazy.OpenSearchEngine({ engineData, faviconURL: iconURL }); + engine = new lazy.OpenSearchEngine({ + engineData, + faviconURL: iconURL, + originAttributes, + }); } catch (ex) { throw Components.Exception( "addEngine: Error adding engine:\n" + ex, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -511,13 +511,19 @@ export var SearchUtils = { * * @param {string|nsIURI} uri * The URI to the icon. + * @param {object} [originAttributes] + * The origin attributes to download the icon. * @returns {Promise<[Uint8Array, string]>} * Resolves to an array containing the data and the mime type. * Rejects if the icon cannot be fetched. */ - async fetchIcon(uri) { + async fetchIcon(uri, originAttributes = null) { return new Promise((resolve, reject) => { - let chan = SearchUtils.makeChannel(uri, Ci.nsIContentPolicy.TYPE_IMAGE); + let chan = SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE, + originAttributes + ); let listener = new SearchUtils.LoadListener( chan, /^image\//, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/803d875… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/803d875… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.4.0esr-15.0-1] Bug 1993166 - Improve origin attributes on opensearch. r=Standard8,urlbar-reviewers
by morgan (＠morgan) 15 Oct '25

15 Oct '25

morgan pushed to branch tor-browser-140.4.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 39767109 by Pier Angelo Vendrame at 2025-10-15T17:28:31+00:00 Bug 1993166 - Improve origin attributes on opensearch. r=Standard8,urlbar-reviewers Differential Revision: https://phabricator.services.mozilla.com/D268183 - - - - - 5 changed files: - browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs Changes: ===================================== browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs ===================================== @@ -286,10 +286,22 @@ class ProviderContextualSearch extends ActionsProvider { let { type, engine } = this.#resultEngine; if (type == OPEN_SEARCH_ENGINE) { + let originAttributes; + try { + let currentURI = Services.io.newURI(queryContext.currentPage); + originAttributes = { + firstPartyDomain: Services.eTLD.getSchemelessSite(currentURI), + }; + } catch {} let openSearchEngineData = await lazy.loadAndParseOpenSearchEngine( - Services.io.newURI(engine.uri) + Services.io.newURI(engine.uri), + null, + originAttributes ); - engine = new lazy.OpenSearchEngine({ engineData: openSearchEngineData }); + engine = new lazy.OpenSearchEngine({ + engineData: openSearchEngineData, + originAttributes, + }); } this.#performSearch( ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -56,6 +56,8 @@ export class OpenSearchEngine extends SearchEngine { * @param {string} [options.faviconURL] * The website favicon, to be used if the engine data hasn't specified an * icon. + * @param {object} [options.originAttributes] + * The origin attributes to use to download additional resources. */ constructor(options = {}) { super({ @@ -68,7 +70,10 @@ export class OpenSearchEngine extends SearchEngine { }); if (options.faviconURL) { - this._setIcon(options.faviconURL, undefined, false).catch(e => + this._setIcon(options.faviconURL, { + override: false, + originAttributes: options.originAttributes, + }).catch(e => lazy.logConsole.error( `Error while setting icon for search engine ${options.engineData.name}:`, e.message @@ -77,7 +82,7 @@ export class OpenSearchEngine extends SearchEngine { } if (options.engineData) { - this.#setEngineData(options.engineData); + this.#setEngineData(options.engineData, options.originAttributes); // As this is a new engine, we must set the verification hash for the load // path set in the constructor. @@ -189,8 +194,10 @@ export class OpenSearchEngine extends SearchEngine { * * @param {OpenSearchProperties} data * The OpenSearch data. + * @param {object} originAttributes + * The origin attributes for any additional downloads */ - #setEngineData(data) { + #setEngineData(data, originAttributes) { let name = data.name.trim(); if (Services.search.getEngineByName(name)) { throw Components.Exception( @@ -258,11 +265,12 @@ export class OpenSearchEngine extends SearchEngine { } for (let image of data.images) { - this._setIcon(image.url, image.size).catch(e => - lazy.logConsole.error( - `Error while setting icon for search engine ${data.name}:`, - e.message - ) + this._setIcon(image.url, { size: image.size, originAttributes }).catch( + e => + lazy.logConsole.error( + `Error while setting icon for search engine ${data.name}:`, + e.message + ) ); } } ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -585,15 +585,19 @@ export class SearchEngine { * @param {string} iconURL * A URI string pointing to the engine's icon. * Must have http[s], data, or moz-extension protocol. - * @param {number} [size] + * @param {object} options + * The options object + * @param {number} [options.size] * Width and height of the icon (determined automatically if not provided). - * @param {boolean} [override] + * @param {boolean} [options.override] * Whether the new URI should override an existing one. + * @param {object} [options.originAttributes] + * The origin attributes to use to load the icon. * @returns {Promise<void>} * Resolves when the icon was set. * Rejects with an Error if there was an error. */ - async _setIcon(iconURL, size, override = true) { + async _setIcon(iconURL, options = { override: true }) { lazy.logConsole.debug( "_setIcon: Setting icon url for", this.name, @@ -601,8 +605,12 @@ export class SearchEngine { limitURILength(iconURL) ); - [iconURL, size] = await this._downloadAndRescaleIcon(iconURL, size); - this._addIconToMap(iconURL, size, override); + let size; + [iconURL, size] = await this._downloadAndRescaleIcon(iconURL, { + size: options.size, + originAttributes: options.originAttributes, + }); + this._addIconToMap(iconURL, size, options.override); if (this._engineAddedToStore) { lazy.SearchUtils.notifyAction( @@ -620,18 +628,24 @@ export class SearchEngine { * @param {string} iconURL * A URI string pointing to the engine's icon. * Must have http[s], data, or moz-extension protocol. - * @param {number} [size] + * @param {object} options + * The options object + * @param {number} [options.size] * Width and height of the icon (determined automatically if not provided). + * @param {object} [options.originAttributes] + * The origin attributes to use to load the icon. * @returns {Promise<[string, number]>} * Resolves to [dataURL, size] if successful and rejects if there was an error. */ - async _downloadAndRescaleIcon(iconURL, size) { + async _downloadAndRescaleIcon(iconURL, options = {}) { let uri = lazy.SearchUtils.makeURI(iconURL); if (!uri) { throw new Error(`Invalid URI`); } + let size = options.size; + switch (uri.scheme) { case "moz-extension": { if (!size) { @@ -644,7 +658,10 @@ export class SearchEngine { case "data": case "http": case "https": { - let [byteArray, contentType] = await lazy.SearchUtils.fetchIcon(uri); + let [byteArray, contentType] = await lazy.SearchUtils.fetchIcon( + uri, + options.originAttributes + ); if (byteArray.length > lazy.SearchUtils.MAX_ICON_SIZE) { lazy.logConsole.debug( `Rescaling icon for search engine ${this.name}.` ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -772,7 +772,11 @@ export class SearchService { null, originAttributes ); - engine = new lazy.OpenSearchEngine({ engineData, faviconURL: iconURL }); + engine = new lazy.OpenSearchEngine({ + engineData, + faviconURL: iconURL, + originAttributes, + }); } catch (ex) { throw Components.Exception( "addEngine: Error adding engine:\n" + ex, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -511,13 +511,19 @@ export var SearchUtils = { * * @param {string|nsIURI} uri * The URI to the icon. + * @param {object} [originAttributes] + * The origin attributes to download the icon. * @returns {Promise<[Uint8Array, string]>} * Resolves to an array containing the data and the mime type. * Rejects if the icon cannot be fetched. */ - async fetchIcon(uri) { + async fetchIcon(uri, originAttributes = null) { return new Promise((resolve, reject) => { - let chan = SearchUtils.makeChannel(uri, Ci.nsIContentPolicy.TYPE_IMAGE); + let chan = SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE, + originAttributes + ); let listener = new SearchUtils.LoadListener( chan, /^image\//, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3976710… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3976710… You're receiving this email because of your account on gitlab.torproject.org.

1 0