- tbb-commits - lists.torproject.org

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: fix: keep thread references
by asciiwolf (＠asciiwolf) 27 Sep '25

27 Sep '25

asciiwolf pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 6a0d6235 by BTD Master at 2025-09-27T10:12:08+01:00 fix: keep thread references - - - - - b44e2146 by asciiwolf at 2025-09-27T11:02:42+00:00 Merge branch 'keep-thread-references' into 'main' Keep thread references Closes #35 See merge request tpo/applications/torbrowser-launcher!34 - - - - - 1 changed file: - torbrowser_launcher/launcher.py Changes: ===================================== torbrowser_launcher/launcher.py ===================================== @@ -71,6 +71,7 @@ class Launcher(QtWidgets.QMainWindow): self.url_list = url_list self.force_redownload = False + self._threads = [] # This is the current version of Tor Browser, which should get updated with every release self.min_version = "13.0" @@ -350,9 +351,11 @@ class Launcher(QtWidgets.QMainWindow): t.progress_update.connect(progress_update) t.download_complete.connect(download_complete) t.download_error.connect(download_error) + self._threads.append(t) t.start() time.sleep(0.2) + def try_default_mirror(self): # change mirror to default and relaunch TBL self.common.settings["mirror"] = self.common.default_mirror @@ -420,6 +423,7 @@ class Launcher(QtWidgets.QMainWindow): t = VerifyThread(self.common) t.error.connect(error) t.success.connect(success) + self._threads.append(t) t.start() time.sleep(0.2) @@ -449,6 +453,7 @@ class Launcher(QtWidgets.QMainWindow): t = ExtractThread(self.common) t.error.connect(error) t.success.connect(success) + self._threads.append(t) t.start() time.sleep(0.2) View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][build-dependencies-fix-2] Add missing qtgui dependency
by asciiwolf (＠asciiwolf) 27 Sep '25

27 Sep '25

asciiwolf pushed to branch build-dependencies-fix-2 at The Tor Project / Applications / torbrowser-launcher Commits: e9e605e9 by AsciiWolf at 2025-09-27T12:46:09+02:00 Add missing qtgui dependency - - - - - 2 changed files: - BUILD.md - stdeb.cfg Changes: ===================================== BUILD.md ===================================== @@ -12,7 +12,7 @@ Then install dependencies, build a package, and install: ### Debian, Ubuntu, Linux Mint, etc. ```sh -sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-pyside6.qtwidgets python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor +sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-pyside6.qtgui python3-pyside6.qtwidgets python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor ./build_deb.sh sudo dpkg -i deb_dist/torbrowser-launcher_*.deb ``` ===================================== stdeb.cfg ===================================== @@ -1,6 +1,6 @@ [DEFAULT] Package3: torbrowser-launcher -Depends3: python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 -Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 +Depends3: python3-pyside6.qtcore, python3-pyside6.qtgui, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 +Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtgui, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 Recommends: tor Suite: oracular View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][build-dependencies-fix-2] Add missing qtgui dependency
by asciiwolf (＠asciiwolf) 27 Sep '25

27 Sep '25

asciiwolf pushed to branch build-dependencies-fix-2 at The Tor Project / Applications / torbrowser-launcher Commits: 4d3d3ebf by AsciiWolf at 2025-09-27T12:38:19+02:00 Add missing qtgui dependency - - - - - 1 changed file: - stdeb.cfg Changes: ===================================== stdeb.cfg ===================================== @@ -1,6 +1,6 @@ [DEFAULT] Package3: torbrowser-launcher -Depends3: python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 -Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 +Depends3: python3-pyside6.qtcore, python3-pyside6.qtgui, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 +Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtgui, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 Recommends: tor Suite: oracular View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][build-dependencies-fix-2] WIP: Add missing qtgui dependency
by asciiwolf (＠asciiwolf) 27 Sep '25

27 Sep '25

asciiwolf pushed to branch build-dependencies-fix-2 at The Tor Project / Applications / torbrowser-launcher Commits: 6bb4ff02 by AsciiWolf at 2025-09-27T12:08:16+02:00 WIP: Add missing qtgui dependency - - - - - 1 changed file: - stdeb.cfg Changes: ===================================== stdeb.cfg ===================================== @@ -1,6 +1,6 @@ [DEFAULT] Package3: torbrowser-launcher -Depends3: python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 -Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 +Depends3: python3-pyside6.qtcore, python3-pyside6.qtgui, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 +Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtgui, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 Recommends: tor Suite: oracular View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch build-dependencies-fix-2
by asciiwolf (＠asciiwolf) 27 Sep '25

27 Sep '25

asciiwolf pushed new branch build-dependencies-fix-2 at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted branch build-dependencies-fix
by asciiwolf (＠asciiwolf) 26 Sep '25

26 Sep '25

asciiwolf deleted branch build-dependencies-fix at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: Fix build dependencies
by asciiwolf (＠asciiwolf) 26 Sep '25

26 Sep '25

asciiwolf pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 5a136337 by asciiwolf at 2025-09-26T00:28:52+02:00 Fix build dependencies - - - - - f4b5c127 by asciiwolf at 2025-09-26T13:08:48+00:00 Merge branch 'build-dependencies-fix' into 'main' Fix build dependencies See merge request tpo/applications/torbrowser-launcher!33 - - - - - 2 changed files: - BUILD.md - stdeb.cfg Changes: ===================================== BUILD.md ===================================== @@ -12,7 +12,7 @@ Then install dependencies, build a package, and install: ### Debian, Ubuntu, Linux Mint, etc. ```sh -sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor +sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-pyside6.qtwidgets python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor ./build_deb.sh sudo dpkg -i deb_dist/torbrowser-launcher_*.deb ``` ===================================== stdeb.cfg ===================================== @@ -1,6 +1,6 @@ [DEFAULT] Package3: torbrowser-launcher -Depends3: python3-pyside6.qtcore, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 -Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 +Depends3: python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 +Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 Recommends: tor Suite: oracular View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted tag v0.3.8
by boklm (＠boklm) 26 Sep '25

26 Sep '25

boklm deleted tag v0.3.8 at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] TB 44027 [android]: Update PBM lockscreen
by clairehurst (＠clairehurst) 26 Sep '25

26 Sep '25

clairehurst pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 9538f500 by clairehurst at 2025-09-24T19:03:40-06:00 TB 44027 [android]: Update PBM lockscreen tor-browser#44027 Update PBM lockscreen - - - - - 14 changed files: - + mobile/android/fenix/app/src/beta/res/drawable/tor_browser_app_icon.png - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/biometricauthentication/UnlockPrivateTabsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/biometricauthentication/UnlockPrivateTabsScreen.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/lifecycle/PrivateBrowsingLockFeature.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/biometric/BiometricUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - + mobile/android/fenix/app/src/main/res/drawable/tor_browser_app_icon.png - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/tabs_preferences.xml - + mobile/android/fenix/app/src/nightly/res/drawable/tor_browser_app_icon.png - + mobile/android/fenix/app/src/release/res/drawable/tor_browser_app_icon.png Changes: ===================================== mobile/android/fenix/app/src/beta/res/drawable/tor_browser_app_icon.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/beta/res/drawable/tor_browser_app_icon.png differ ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/biometricauthentication/UnlockPrivateTabsFragment.kt ===================================== @@ -56,8 +56,7 @@ class UnlockPrivateTabsFragment : Fragment(), UserInteractionHandler { UnlockPrivateTabsScreen( onUnlockClicked = { requestPrompt() }, onLeaveClicked = { - PrivateBrowsingLocked.seeOtherTabsClicked.record() - closeFragment() + requireActivity().moveTaskToBack(true) }, ) @@ -67,13 +66,14 @@ class UnlockPrivateTabsFragment : Fragment(), UserInteractionHandler { } override fun onBackPressed(): Boolean { - closeFragment() + requireActivity().moveTaskToBack(true) return true } private fun requestPrompt() { DefaultBiometricUtils.bindBiometricsCredentialsPromptOrShowWarning( - titleRes = R.string.pbm_authentication_unlock_private_tabs, + titleRes = R.string.tor_authentication_unlock_private_tabs, + titleRes2 = R.string.app_name, view = requireView(), onShowPinVerification = { intent -> startForResult.launch(intent) }, onAuthSuccess = ::onAuthSuccess, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/biometricauthentication/UnlockPrivateTabsScreen.kt ===================================== @@ -31,6 +31,14 @@ import org.mozilla.fenix.ext.isLargeWindow import org.mozilla.fenix.theme.FirefoxTheme import org.mozilla.fenix.theme.Theme +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.size +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp +import org.mozilla.fenix.compose.parseHtml + private const val FILL_WIDTH_LARGE_WINDOW = 0.5f private const val FILL_WIDTH_DEFAULT = 1.0f @@ -72,16 +80,30 @@ private fun Header() { modifier = Modifier.padding(horizontal = 16.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { - Image( - painter = painterResource(id = R.drawable.ic_pbm_firefox_logo), - contentDescription = null, // decorative only. - modifier = Modifier.padding(32.dp), - ) + Row ( + verticalAlignment = Alignment.CenterVertically + ) { + Image( + painter = painterResource(id = R.drawable.tor_browser_app_icon), + contentDescription = null, // decorative only. + Modifier + .size(62.dp) + .padding(end = 10.dp), + ) + Text( + text = stringResource(R.string.app_name), + color = FirefoxTheme.colors.textPrimary, + fontWeight = FontWeight.Bold, + fontSize = 29.sp, + letterSpacing = 0.18.sp, + lineHeight = 52.sp, + ) + } Spacer(modifier = Modifier.height(24.dp)) Text( - text = stringResource(id = R.string.pbm_authentication_unlock_private_tabs), + text = stringResource(id = R.string.tor_authentication_unlock_private_tabs, stringResource(R.string.app_name)), color = FirefoxTheme.colors.textPrimary, textAlign = TextAlign.Center, style = FirefoxTheme.typography.headline6, @@ -109,15 +131,6 @@ private fun Footer(onUnlockClicked: () -> Unit, onLeaveClicked: () -> Unit) { modifier = Modifier.fillMaxWidth(), onClick = onUnlockClicked, ) - - Spacer(modifier = Modifier.height(8.dp)) - - TextButton( - text = stringResource(R.string.pbm_authentication_leave_private_tabs), - onClick = onLeaveClicked, - textColor = FirefoxTheme.colors.textActionPrimary, - upperCaseText = false, - ) } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/lifecycle/PrivateBrowsingLockFeature.kt ===================================== @@ -312,7 +312,8 @@ fun Fragment.verifyUser( onVerified: (() -> Unit)? = null, ) { biometricUtils.bindBiometricsCredentialsPromptOrShowWarning( - titleRes = R.string.pbm_authentication_unlock_private_tabs, + titleRes = R.string.tor_authentication_unlock_private_tabs, + titleRes2 = R.string.app_name, view = requireView(), onShowPinVerification = { intent -> fallbackVerification.launch(intent) }, onAuthSuccess = { handleVerificationSuccess(requireContext(), onVerified) }, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt ===================================== @@ -17,6 +17,16 @@ import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.utils.view.addToRadioGroup +import android.content.Intent +import android.provider.Settings +import androidx.activity.result.ActivityResultLauncher +import androidx.biometric.BiometricManager +import androidx.preference.Preference +import org.mozilla.fenix.ext.registerForActivityResult +import org.mozilla.fenix.settings.biometric.DefaultBiometricUtils +import org.mozilla.fenix.settings.biometric.ext.isAuthenticatorAvailable +import org.mozilla.fenix.settings.biometric.ext.isHardwareAvailable + /** * Lets the user customize auto closing tabs. */ @@ -40,6 +50,31 @@ class TabsSettingsFragment : PreferenceFragmentCompat() { findPreference<PreferenceCategory>(getString(R.string.pref_key_inactive_tabs_category))?.apply { isVisible = !context.settings().shouldDisableNormalMode } + + startForResult = registerForActivityResult( + onFailure = { }, + onSuccess = { onSuccessfulAuthenticationUsingFallbackPrompt() }, + ) + } + + private lateinit var startForResult: ActivityResultLauncher<Intent> + + private fun onSuccessfulAuthenticationUsingFallbackPrompt() { + val newValue = !requireContext().settings().privateBrowsingLockedEnabled + requireContext().settings().privateBrowsingLockedEnabled = newValue + // Update switch state manually + requirePreference<SwitchPreference>(R.string.pref_key_private_browsing_locked_enabled).apply { + isChecked = !isChecked + } + } + + private fun onSuccessfulAuthenticationUsingPrimaryPrompt( + pbmLockEnabled: Boolean, + preference: Preference, + ) { + requireContext().settings().privateBrowsingLockedEnabled = pbmLockEnabled + // Update switch state manually + (preference as? SwitchPreference)?.isChecked = pbmLockEnabled } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -86,6 +121,67 @@ class TabsSettingsFragment : PreferenceFragmentCompat() { radioOneMonth.onClickListener(::enableInactiveTabsSetting) setupRadioGroups() + /** + * Changes in this file for "tor-browser#44027 Update PBM lockscreen" were copied from + * [PrivateBrowsingFragment] and changed to make sense and work for TBA such as removing + * any use of nimbus/glean that was being used for business logic which was making the + * release build variant not work. We should check [PrivateBrowsingFragment] for updates + * when we rebase + * */ + setUpHideBrowsingSessionPreference() + } + + private fun setUpHideBrowsingSessionPreference() { + val biometricManager = BiometricManager.from(requireContext()) + val deviceCapable = biometricManager.isHardwareAvailable() + val userHasEnabledCapability = biometricManager.isAuthenticatorAvailable() + + requirePreference<SwitchPreference>(R.string.pref_key_private_browsing_locked_enabled).apply { + title = getString(R.string.preferences_tor_lock_screen_title, getString(R.string.app_name)) + summary = getString(R.string.preferences_tor_lock_screen_summary, getString(R.string.app_name)) + isChecked = context.settings().privateBrowsingLockedEnabled && + biometricManager.isAuthenticatorAvailable() + isVisible = deviceCapable + isEnabled = userHasEnabledCapability + + setOnPreferenceChangeListener { preference, newValue -> + val pbmLockEnabled = newValue as? Boolean + ?: return@setOnPreferenceChangeListener false + + val titleRes = if (pbmLockEnabled) { + R.string.tor_authentication_enable_lock + } else { + R.string.tor_authentication_disable_lock + } + + DefaultBiometricUtils.bindBiometricsCredentialsPromptOrShowWarning( + titleRes = titleRes, + titleRes2 = R.string.app_name, + view = requireView(), + onShowPinVerification = { intent -> startForResult.launch(intent) }, + onAuthSuccess = { + onSuccessfulAuthenticationUsingPrimaryPrompt( + pbmLockEnabled = pbmLockEnabled, + preference = preference, + ) + }, + onAuthFailure = { }, + ) + + // Cancel toggle change until biometric is successful + false + } + } + + requirePreference<Preference>(R.string.pref_key_private_browsing_lock_device_feature_enabled).apply { + title = getString(R.string.tor_authentication_lock_device_feature_disabled, getString(R.string.app_name)) + isVisible = deviceCapable && !userHasEnabledCapability + + setOnPreferenceClickListener { + context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS)) + true + } + } } private fun setupRadioGroups() { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/biometric/BiometricUtils.kt ===================================== @@ -42,6 +42,7 @@ interface BiometricUtils { */ fun bindBiometricsCredentialsPromptOrShowWarning( @StringRes titleRes: Int = R.string.logins_biometric_prompt_message_2, + @StringRes titleRes2: Int = R.string.empty_string, view: View, onShowPinVerification: (Intent) -> Unit, onAuthSuccess: () -> Unit, @@ -56,6 +57,7 @@ object DefaultBiometricUtils : BiometricUtils { @Suppress("Deprecation") override fun bindBiometricsCredentialsPromptOrShowWarning( @StringRes titleRes: Int, + @StringRes titleRes2: Int, view: View, onShowPinVerification: (Intent) -> Unit, onAuthSuccess: () -> Unit, @@ -90,7 +92,7 @@ object DefaultBiometricUtils : BiometricUtils { // Use the BiometricPrompt first if (BiometricPromptFeature.canUseFeature(BiometricManager.from(context))) { biometricPromptFeature.get() - ?.requestAuthentication(context.resources.getString(titleRes)) + ?.requestAuthentication(context.resources.getString(titleRes, context.resources.getString(titleRes2))) return } @@ -99,7 +101,7 @@ object DefaultBiometricUtils : BiometricUtils { if (manager?.isKeyguardSecure == true) { val confirmDeviceCredentialIntent = manager.createConfirmDeviceCredentialIntent( context.resources.getString(R.string.logins_biometric_prompt_message_pin), - context.resources.getString(titleRes), + context.resources.getString(titleRes, context.resources.getString(titleRes2)), ) onShowPinVerification(confirmDeviceCredentialIntent) } else { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt ===================================== @@ -205,7 +205,7 @@ fun TabsTrayBanner( // After this bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1965545 // is resolved, we should swap the button 1 and button 2 click actions. Banner( - message = stringResource(id = R.string.private_tab_cfr_title), + message = stringResource(id = R.string.tor_tab_cfr_title, stringResource(R.string.app_name)), button1Text = stringResource(id = R.string.private_tab_cfr_negative), button2Text = stringResource(id = R.string.private_tab_cfr_positive), onButton1Click = { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt ===================================== @@ -265,7 +265,7 @@ class TabsTrayFragment : AppCompatDialogFragment() { shouldShowTabAutoCloseBanner = requireContext().settings().shouldShowAutoCloseTabsBanner && requireContext().settings().canShowCfr, shouldShowLockPbmBanner = - if (FxNimbus.features.privateBrowsingLock.value().enabled) { + if (true) { shouldShowLockPbmBanner( isPrivateMode = (activity as HomeActivity).browsingModeManager.mode.isPrivate, hasPrivateTabs = requireComponents.core.store.state.privateTabs.isNotEmpty(), @@ -775,10 +775,11 @@ class TabsTrayFragment : AppCompatDialogFragment() { val isAuthenticatorAvailable = BiometricManager.from(requireContext()).isAuthenticatorAvailable() if (!isAuthenticatorAvailable) { - findNavController().navigate(TabsTrayFragmentDirections.actionGlobalPrivateBrowsingFragment()) + findNavController().navigate(TabsTrayFragmentDirections.actionGlobalTabSettingsFragment()) } else { DefaultBiometricUtils.bindBiometricsCredentialsPromptOrShowWarning( - titleRes = R.string.pbm_authentication_enable_lock, + titleRes = R.string.tor_authentication_enable_lock, + titleRes2 = R.string.app_name, view = requireView(), onShowPinVerification = { intent -> enablePbmPinLauncher.launch(intent) }, onAuthSuccess = { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -334,10 +334,9 @@ class Settings(private val appContext: Context) : PreferencesHolder { default = false, ) - var privateBrowsingLockedEnabled by lazyFeatureFlagPreference( + var privateBrowsingLockedEnabled by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_private_browsing_locked_enabled), - featureFlag = FxNimbus.features.privateBrowsingLock.value().enabled, - default = { false }, + default = false, ) var shouldReturnToBrowser by booleanPreference( ===================================== mobile/android/fenix/app/src/main/res/drawable/tor_browser_app_icon.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/main/res/drawable/tor_browser_app_icon.png differ ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -142,4 +142,21 @@  <string name="notification_close_tor_browser_tabs_long">Tap or swipe this notification to close %s’s tabs</string> +  +  + <string name="tor_authentication_unlock_private_tabs">Unlock %s tabs</string> +  + <string name="tor_authentication_enable_lock">Enable %s tabs screen lock</string> +  + <string name="tor_authentication_disable_lock">Disable %s tabs screen lock</string> +  + <string name="tor_authentication_lock_device_feature_disabled">Set up screen lock to hide %s tabs</string> +  + <string name="tor_tab_cfr_title">Use screen lock to hide %s tabs?</string> + +  + <string name="preferences_tor_lock_screen_title">Use screen lock to hide %s tabs</string> +  + <string name="preferences_tor_lock_screen_summary">View %s tabs with your fingerprint, PIN, or face unlock.</string> + </resources> ===================================== mobile/android/fenix/app/src/main/res/xml/tabs_preferences.xml ===================================== @@ -57,4 +57,14 @@ android:key="@string/pref_key_inactive_tabs" android:title="@string/preferences_inactive_tabs_title"/> </androidx.preference.PreferenceCategory> + + <PreferenceCategory + android:key="@string/pref_key_pbm_lock_category_divider" + android:layout="@xml/preference_category_divider" + android:selectable="false" /> + <SwitchPreference + android:defaultValue="false" + android:key="pref_key_private_browsing_locked_enabled" /> + <Preference + android:key="@string/pref_key_private_browsing_lock_device_feature_enabled" /> </androidx.preference.PreferenceScreen> ===================================== mobile/android/fenix/app/src/nightly/res/drawable/tor_browser_app_icon.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable/tor_browser_app_icon.png differ ===================================== mobile/android/fenix/app/src/release/res/drawable/tor_browser_app_icon.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable/tor_browser_app_icon.png differ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9538f50… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9538f50… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][build-dependencies-fix] Fix build dependencies
by asciiwolf (＠asciiwolf) 25 Sep '25

25 Sep '25

asciiwolf pushed to branch build-dependencies-fix at The Tor Project / Applications / torbrowser-launcher Commits: 5a136337 by asciiwolf at 2025-09-26T00:28:52+02:00 Fix build dependencies - - - - - 2 changed files: - BUILD.md - stdeb.cfg Changes: ===================================== BUILD.md ===================================== @@ -12,7 +12,7 @@ Then install dependencies, build a package, and install: ### Debian, Ubuntu, Linux Mint, etc. ```sh -sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor +sudo apt install build-essential dh-python python3-all python3-stdeb python3-pyside6.qtcore python3-pyside6.qtwidgets python3-gpg python3-requests python3-setuptools python3-socks python3-packaging gnupg2 tor ./build_deb.sh sudo dpkg -i deb_dist/torbrowser-launcher_*.deb ``` ===================================== stdeb.cfg ===================================== @@ -1,6 +1,6 @@ [DEFAULT] Package3: torbrowser-launcher -Depends3: python3-pyside6.qtcore, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 -Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 +Depends3: python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-socks, python3-packaging, gnupg2 +Build-Depends: dh-python, python3-pyside6.qtcore, python3-pyside6.qtwidgets, python3-gpg, python3-requests, python3-setuptools, python3-socks, python3-packaging, gnupg2 Recommends: tor Suite: oracular View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch build-dependencies-fix
by asciiwolf (＠asciiwolf) 25 Sep '25

25 Sep '25

asciiwolf pushed new branch build-dependencies-fix at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new tag v0.3.8
by boklm (＠boklm) 25 Sep '25

25 Sep '25

boklm pushed new tag v0.3.8 at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/v… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: Add gitlab issue template to document steps for making a release
by boklm (＠boklm) 25 Sep '25

25 Sep '25

boklm pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 0f6b565b by Nicolas Vigier at 2025-09-25T11:30:15+02:00 Add gitlab issue template to document steps for making a release Closes #14 - - - - - 0bb03dc4 by Nicolas Vigier at 2025-09-25T11:55:54+02:00 0.3.8 release - - - - - 4 changed files: - + .gitlab/issue_templates/Release Prep.md - CHANGELOG.md - share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml - share/torbrowser-launcher/version Changes: ===================================== .gitlab/issue_templates/Release Prep.md ===================================== @@ -0,0 +1,7 @@ +# Release Prep for Tor Browser Launcher + +- [ ] Update the version in `share/torbrowser-launcher/version` +- [ ] Add new release tag to `share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml` +- [ ] Update `CHANGELOG.md` +- [ ] Open/review/merge MR with the changes +- [ ] Run `git-tag_release.sh` ===================================== CHANGELOG.md ===================================== @@ -1,5 +1,35 @@ # Tor Browser Launcher Changelog +## 0.3.8 + +* Update Tor Browser gpg key for new subkey (tor-browser-build#40964) +* Migrate code from PyQt5 to PySide6 +* Fix window icon under wayland +* Move setup.py to setuptools +* AppArmor + * Update/Add Additional Abstractions + * Remove duplicate rule + * Allow the Wayland Proxy to run + * Don't grant full D-Bus session bus access + * Allow unprivileged user namespaces + * Allow reading cgroups-v2 CPU bandwidth quota information + * Allow executing Firefox' own VA-API probe utility + * Allow reading intel-media-driver feature files +* Desktop files + * Rename desktop files to rDNS format + * Add Spanish language + * Add Arabic language + * Sort translated desktop strings by language +* AppStream metadata (metainfo.xml) + * Add developer name + * Add developer tag + * Remove references to Bundle/TBB + * Add Arabic language +* Documentation + * Update README.md for Flatpak name change + * Remove modem sound references + * Add gitlab issue template to document steps for making a release + ## 0.3.7 * Use Tor Browser 13.0 new filenames ===================================== share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml ===================================== @@ -45,6 +45,7 @@ <update_contact>boklm(a)torproject.org</update_contact> <content_rating type="oars-1.1"/> <releases> + <release version="0.3.8" date="2025-09-25"/> <release version="0.3.7" date="2024-01-12"/> <release version="0.3.6" date="2022-12-13"/> </releases> ===================================== share/torbrowser-launcher/version ===================================== @@ -1 +1 @@ -0.3.7 +0.3.8 View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_NIGHTLY_144_END
by Pier Angelo Vendrame (＠pierov) 24 Sep '25

24 Sep '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_NIGHTLY_144_END
by Pier Angelo Vendrame (＠pierov) 24 Sep '25

24 Sep '25

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

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.3.0esr-15.0-1] BB 19741: Fix FPI with OpenSearch.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 63fc47b1 by Pier Angelo Vendrame at 2025-09-23T22:07:08+02:00 BB 19741: Fix FPI with OpenSearch. - - - - - 4 changed files: - browser/components/search/SearchUIUtils.sys.mjs - toolkit/components/search/OpenSearchLoader.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/nsISearchService.idl Changes: ===================================== browser/components/search/SearchUIUtils.sys.mjs ===================================== @@ -181,7 +181,11 @@ export var SearchUIUtils = { */ async addOpenSearchEngine(locationURL, image, browsingContext) { try { - await Services.search.addOpenSearchEngine(locationURL, image); + await Services.search.addOpenSearchEngine( + locationURL, + image, + browsingContext?.originAttributes + ); } catch (ex) { let titleMsgName; let descMsgName; ===================================== toolkit/components/search/OpenSearchLoader.sys.mjs ===================================== @@ -97,10 +97,17 @@ const MOZSEARCH_LOCALNAME = "SearchPlugin"; * The uri from which to load the OpenSearch engine data. * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. + * @param {object} [originAttributes] + * The first party domain of the site loading that manifest. The domain of the + * manifest will be used if not provided. * @returns {Promise<OpenSearchProperties>} * The properties of the loaded OpenSearch engine. */ -export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { +export async function loadAndParseOpenSearchEngine( + sourceURI, + lastModified, + originAttributes +) { if (!sourceURI) { throw Components.Exception( "Must have URI when calling _install!", @@ -116,7 +123,7 @@ export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { lazy.logConsole.debug("Downloading OpenSearch engine from:", sourceURI.spec); - let xmlData = await loadEngineXML(sourceURI, lastModified); + let xmlData = await loadEngineXML(sourceURI, lastModified, originAttributes); let xmlDocument = await parseXML(xmlData); lazy.logConsole.debug("Loading search plugin"); @@ -147,11 +154,13 @@ export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { * The uri from which to load the OpenSearch engine data. * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. + * @param {object} [originAttributes] + * The origin attributes to use to load the manifest. * @returns {Promise} * A promise that is resolved with the data if the engine is successfully loaded * and rejected otherwise. */ -function loadEngineXML(sourceURI, lastModified) { +function loadEngineXML(sourceURI, lastModified, originAttributes = null) { var chan = lazy.SearchUtils.makeChannel( sourceURI, // OpenSearchEngine is loading a definition file for a search engine, @@ -164,6 +173,17 @@ function loadEngineXML(sourceURI, lastModified) { ? Ci.nsILoadInfo.ALREADY_HTTPS : Ci.nsILoadInfo.NO_UPGRADE; + if (!originAttributes) { + originAttributes = {}; + try { + originAttributes.firstPartyDomain = + Services.eTLD.getSchemelessSite(sourceURI); + } catch (ex) { + console.error("Failed to get first party domain for the manifest", ex); + } + } + chan.loadInfo.originAttributes = originAttributes; + if (lastModified && chan instanceof Ci.nsIHttpChannel) { chan.setRequestHeader("If-Modified-Since", lastModified, false); } ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -762,13 +762,15 @@ export class SearchService { }); } - async addOpenSearchEngine(engineURL, iconURL) { + async addOpenSearchEngine(engineURL, iconURL, originAttributes) { lazy.logConsole.debug("addOpenSearchEngine: Adding", engineURL); await this.init(); let engine; try { let engineData = await lazy.loadAndParseOpenSearchEngine( - Services.io.newURI(engineURL) + Services.io.newURI(engineURL), + null, + originAttributes ); engine = new lazy.OpenSearchEngine({ engineData, faviconURL: iconURL }); } catch (ex) { ===================================== toolkit/components/search/nsISearchService.idl ===================================== @@ -340,10 +340,14 @@ interface nsISearchService : nsISupports * icon. This value may be overridden by an icon specified in the * engine description file. * + * @param originAttributes [optional] + The origin attributes to use to load this manifest. + * * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ - Promise addOpenSearchEngine(in AString engineURL, in AString iconURL); + Promise addOpenSearchEngine(in AString engineURL, in AString iconURL, + [optional] in jsval originAttributes); /** * Adds a new search engine defined by the user. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/63f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/63f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.3.0esr-15.0-1] BB 19741: Fix FPI with OpenSearch.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch base-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: e4038e7b by Pier Angelo Vendrame at 2025-09-23T22:05:37+02:00 BB 19741: Fix FPI with OpenSearch. - - - - - 4 changed files: - browser/components/search/SearchUIUtils.sys.mjs - toolkit/components/search/OpenSearchLoader.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/nsISearchService.idl Changes: ===================================== browser/components/search/SearchUIUtils.sys.mjs ===================================== @@ -181,7 +181,11 @@ export var SearchUIUtils = { */ async addOpenSearchEngine(locationURL, image, browsingContext) { try { - await Services.search.addOpenSearchEngine(locationURL, image); + await Services.search.addOpenSearchEngine( + locationURL, + image, + browsingContext?.originAttributes + ); } catch (ex) { let titleMsgName; let descMsgName; ===================================== toolkit/components/search/OpenSearchLoader.sys.mjs ===================================== @@ -97,10 +97,17 @@ const MOZSEARCH_LOCALNAME = "SearchPlugin"; * The uri from which to load the OpenSearch engine data. * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. + * @param {object} [originAttributes] + * The first party domain of the site loading that manifest. The domain of the + * manifest will be used if not provided. * @returns {Promise<OpenSearchProperties>} * The properties of the loaded OpenSearch engine. */ -export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { +export async function loadAndParseOpenSearchEngine( + sourceURI, + lastModified, + originAttributes +) { if (!sourceURI) { throw Components.Exception( "Must have URI when calling _install!", @@ -116,7 +123,7 @@ export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { lazy.logConsole.debug("Downloading OpenSearch engine from:", sourceURI.spec); - let xmlData = await loadEngineXML(sourceURI, lastModified); + let xmlData = await loadEngineXML(sourceURI, lastModified, originAttributes); let xmlDocument = await parseXML(xmlData); lazy.logConsole.debug("Loading search plugin"); @@ -147,11 +154,13 @@ export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { * The uri from which to load the OpenSearch engine data. * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. + * @param {object} [originAttributes] + * The origin attributes to use to load the manifest. * @returns {Promise} * A promise that is resolved with the data if the engine is successfully loaded * and rejected otherwise. */ -function loadEngineXML(sourceURI, lastModified) { +function loadEngineXML(sourceURI, lastModified, originAttributes = null) { var chan = lazy.SearchUtils.makeChannel( sourceURI, // OpenSearchEngine is loading a definition file for a search engine, @@ -164,6 +173,17 @@ function loadEngineXML(sourceURI, lastModified) { ? Ci.nsILoadInfo.ALREADY_HTTPS : Ci.nsILoadInfo.NO_UPGRADE; + if (!originAttributes) { + originAttributes = {}; + try { + originAttributes.firstPartyDomain = + Services.eTLD.getSchemelessSite(sourceURI); + } catch (ex) { + console.error("Failed to get first party domain for the manifest", ex); + } + } + chan.loadInfo.originAttributes = originAttributes; + if (lastModified && chan instanceof Ci.nsIHttpChannel) { chan.setRequestHeader("If-Modified-Since", lastModified, false); } ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -762,13 +762,15 @@ export class SearchService { }); } - async addOpenSearchEngine(engineURL, iconURL) { + async addOpenSearchEngine(engineURL, iconURL, originAttributes) { lazy.logConsole.debug("addOpenSearchEngine: Adding", engineURL); await this.init(); let engine; try { let engineData = await lazy.loadAndParseOpenSearchEngine( - Services.io.newURI(engineURL) + Services.io.newURI(engineURL), + null, + originAttributes ); engine = new lazy.OpenSearchEngine({ engineData, faviconURL: iconURL }); } catch (ex) { ===================================== toolkit/components/search/nsISearchService.idl ===================================== @@ -340,10 +340,14 @@ interface nsISearchService : nsISupports * icon. This value may be overridden by an icon specified in the * engine description file. * + * @param originAttributes [optional] + The origin attributes to use to load this manifest. + * * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ - Promise addOpenSearchEngine(in AString engineURL, in AString iconURL); + Promise addOpenSearchEngine(in AString engineURL, in AString iconURL, + [optional] in jsval originAttributes); /** * Adds a new search engine defined by the user. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4038e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4038e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] 2 commits: fixup! TB 3455: Add DomainIsolator, for isolating circuit by domain.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: a285b441 by Pier Angelo Vendrame at 2025-09-23T19:45:32+02:00 fixup! TB 3455: Add DomainIsolator, for isolating circuit by domain. Improve DomainIsolator logs and fix a linter warning. - - - - - 771d640c by Pier Angelo Vendrame at 2025-09-23T19:46:39+02:00 BB 19741: Fix FPI with OpenSearch. - - - - - 5 changed files: - browser/components/search/SearchUIUtils.sys.mjs - toolkit/components/search/OpenSearchLoader.sys.mjs - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/nsISearchService.idl - toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs Changes: ===================================== browser/components/search/SearchUIUtils.sys.mjs ===================================== @@ -181,7 +181,11 @@ export var SearchUIUtils = { */ async addOpenSearchEngine(locationURL, image, browsingContext) { try { - await Services.search.addOpenSearchEngine(locationURL, image); + await Services.search.addOpenSearchEngine( + locationURL, + image, + browsingContext?.originAttributes + ); } catch (ex) { let titleMsgName; let descMsgName; ===================================== toolkit/components/search/OpenSearchLoader.sys.mjs ===================================== @@ -97,10 +97,17 @@ const MOZSEARCH_LOCALNAME = "SearchPlugin"; * The uri from which to load the OpenSearch engine data. * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. + * @param {object} [originAttributes] + * The first party domain of the site loading that manifest. The domain of the + * manifest will be used if not provided. * @returns {Promise<OpenSearchProperties>} * The properties of the loaded OpenSearch engine. */ -export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { +export async function loadAndParseOpenSearchEngine( + sourceURI, + lastModified, + originAttributes +) { if (!sourceURI) { throw Components.Exception( "Must have URI when calling _install!", @@ -116,7 +123,7 @@ export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { lazy.logConsole.debug("Downloading OpenSearch engine from:", sourceURI.spec); - let xmlData = await loadEngineXML(sourceURI, lastModified); + let xmlData = await loadEngineXML(sourceURI, lastModified, originAttributes); let xmlDocument = await parseXML(xmlData); lazy.logConsole.debug("Loading search plugin"); @@ -147,11 +154,13 @@ export async function loadAndParseOpenSearchEngine(sourceURI, lastModified) { * The uri from which to load the OpenSearch engine data. * @param {string} [lastModified] * The UTC date when the engine was last updated, if any. + * @param {object} [originAttributes] + * The origin attributes to use to load the manifest. * @returns {Promise} * A promise that is resolved with the data if the engine is successfully loaded * and rejected otherwise. */ -function loadEngineXML(sourceURI, lastModified) { +function loadEngineXML(sourceURI, lastModified, originAttributes = null) { var chan = lazy.SearchUtils.makeChannel( sourceURI, // OpenSearchEngine is loading a definition file for a search engine, @@ -164,6 +173,17 @@ function loadEngineXML(sourceURI, lastModified) { ? Ci.nsILoadInfo.ALREADY_HTTPS : Ci.nsILoadInfo.NO_UPGRADE; + if (!originAttributes) { + originAttributes = {}; + try { + originAttributes.firstPartyDomain = + Services.eTLD.getSchemelessSite(sourceURI); + } catch (ex) { + console.error("Failed to get first party domain for the manifest", ex); + } + } + chan.loadInfo.originAttributes = originAttributes; + if (lastModified && chan instanceof Ci.nsIHttpChannel) { chan.setRequestHeader("If-Modified-Since", lastModified, false); } ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -762,13 +762,15 @@ export class SearchService { }); } - async addOpenSearchEngine(engineURL, iconURL) { + async addOpenSearchEngine(engineURL, iconURL, originAttributes) { lazy.logConsole.debug("addOpenSearchEngine: Adding", engineURL); await this.init(); let engine; try { let engineData = await lazy.loadAndParseOpenSearchEngine( - Services.io.newURI(engineURL) + Services.io.newURI(engineURL), + null, + originAttributes ); engine = new lazy.OpenSearchEngine({ engineData, faviconURL: iconURL }); } catch (ex) { ===================================== toolkit/components/search/nsISearchService.idl ===================================== @@ -340,10 +340,14 @@ interface nsISearchService : nsISupports * icon. This value may be overridden by an icon specified in the * engine description file. * + * @param originAttributes [optional] + The origin attributes to use to load this manifest. + * * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ - Promise addOpenSearchEngine(in AString engineURL, in AString iconURL); + Promise addOpenSearchEngine(in AString engineURL, in AString iconURL, + [optional] in jsval originAttributes); /** * Adds a new search engine defined by the user. ===================================== toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs ===================================== @@ -500,7 +500,13 @@ class TorDomainIsolatorImpl { const browsers = channel.loadInfo.browsingContext?.topChromeWindow?.gBrowser?.browsers; if (!browsers || !channel.loadInfo.browsingContext?.browserId) { - logger.debug("Missing data to associate to a browser", channel.loadInfo); + if (channel instanceof Ci.nsIHttpChannel) { + logger.debug( + "Missing data to associate to a browser", + channel.loadInfo.loadingPrincipal?.URI?.spec, + channel.loadInfo + ); + } return null; } for (const browser of browsers) { @@ -593,7 +599,7 @@ class TorDomainIsolatorImpl { // Should we modify the lower layer to send a circuit identifier, instead? if ( circuit.length === data.length && - circuit.every((id, index) => id === data[index].fingerprint) + circuit.every((fp, index) => fp === data[index].fingerprint) ) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3a7132… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3a7132… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] fixup! TB 44032: YEC 2025 assets.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 3a71327e by Pier Angelo Vendrame at 2025-09-23T11:42:44+02:00 fixup! TB 44032: YEC 2025 assets. TB 44216: Add a workaround to font CSP assertions. - - - - - 1 changed file: - dom/security/nsContentSecurityUtils.cpp Changes: ===================================== dom/security/nsContentSecurityUtils.cpp ===================================== @@ -1883,7 +1883,7 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) { if (dir.EqualsLiteral("default-src") || dir.EqualsLiteral("object-src") || dir.EqualsLiteral("script-src") || dir.EqualsLiteral("style-src") || dir.EqualsLiteral("img-src") || dir.EqualsLiteral("media-src") || - dir.EqualsLiteral("connect-src")) { + dir.EqualsLiteral("connect-src") || dir.EqualsLiteral("font-src")) { continue; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a71327… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a71327… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.3.0esr-15.0-1] fixup! MB 213: Customize the search engines list
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: aaaa4b20 by Pier Angelo Vendrame at 2025-09-23T14:38:53+02:00 fixup! MB 213: Customize the search engines list BB 44153: Add search engine tests. - - - - - 1 changed file: - toolkit/components/search/tests/xpcshell/test_base_browser.js Changes: ===================================== toolkit/components/search/tests/xpcshell/test_base_browser.js ===================================== @@ -9,10 +9,14 @@ "use strict"; const expectedURLs = { - ddg: "https://duckduckgo.com/?q=test", + leta: "https://leta.mullvad.net/?q=test", + ddg: "https://duckduckgo.com/html/?q=test", + "ddg-html": "https://html.duckduckgo.com/html?q=test", + mojeek: "https://www.mojeek.com/search?q=test", + brave: "https://search.brave.com/search?q=test", startpage: "https://www.startpage.com/sp/search?q=test", }; -const defaultEngine = "ddg"; +const defaultEngine = "leta"; add_setup(async function setup() { await Services.search.init(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/aaa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/aaa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.3.0esr-15.0-1] 3 commits: fixup! BB 43525: Skip Remote Settings for search engine customization.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a9f584b7 by Pier Angelo Vendrame at 2025-09-23T14:17:55+02:00 fixup! BB 43525: Skip Remote Settings for search engine customization. BB 44153: Add tests. - - - - - 0d376fac by Pier Angelo Vendrame at 2025-09-23T14:17:56+02:00 fixup! BB 40925: Implemented the Security Level component BB 44153: Add search engine customization tests. - - - - - 5d26d127 by Pier Angelo Vendrame at 2025-09-23T14:17:57+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 44153: Add search engine customization tests. Change where we ignore upstream's block lists as the previous mechanism made tests timeout. - - - - - 4 changed files: - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/tests/xpcshell/test_base_browser.js - + toolkit/components/search/tests/xpcshell/test_security_level.js - toolkit/components/search/tests/xpcshell/xpcshell.toml Changes: ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -4,6 +4,7 @@ /* eslint no-shadow: error, mozilla/no-aArgs: error */ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -1426,6 +1427,10 @@ export class SearchService { // start listening straight away. Services.obs.addObserver(this, lazy.Region.REGION_TOPIC); + this.#getIgnoreListAndSubscribe().catch(ex => + console.error(ex, "Search Service could not get the ignore list.") + ); + this.#engineSelector = new lazy.SearchEngineSelector( this.#handleConfigurationUpdated.bind(this) ); @@ -1568,7 +1573,6 @@ export class SearchService { * handled via a sync listener. * */ - // eslint-disable-next-line no-unused-private-class-members async #getIgnoreListAndSubscribe() { let listener = this.#handleIgnoreListUpdated.bind(this); const current = await lazy.IgnoreLists.getAndSubscribe(listener); @@ -1593,6 +1597,10 @@ export class SearchService { * The event in the format received from RemoteSettings. */ async #handleIgnoreListUpdated(eventData) { + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + lazy.logConsole.debug("#handleIgnoreListUpdated"); const { data: { current }, ===================================== toolkit/components/search/tests/xpcshell/test_base_browser.js ===================================== @@ -0,0 +1,47 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * This tests the SearchService to check our override of the remote settings is + * working as expected. + */ + +"use strict"; + +const expectedURLs = { + ddg: "https://duckduckgo.com/?q=test", + startpage: "https://www.startpage.com/sp/search?q=test", +}; +const defaultEngine = "ddg"; + +add_setup(async function setup() { + await Services.search.init(); +}); + +add_task(async function test_listEngines() { + const { engines } = + await Services.search.wrappedJSObject._fetchEngineSelectorEngines(); + const foundIdentifiers = engines.map(e => e.identifier); + Assert.deepEqual(foundIdentifiers, Object.keys(expectedURLs)); +}); + +add_task(async function test_default() { + Assert.equal( + (await Services.search.getDefault()).id, + defaultEngine, + `${defaultEngine} is our default search engine in normal mode.` + ); + Assert.equal( + (await Services.search.getDefaultPrivate()).id, + defaultEngine, + `${defaultEngine} is our default search engine in PBM.` + ); +}); + +add_task(function test_checkSearchURLs() { + for (const [id, url] of Object.entries(expectedURLs)) { + const engine = Services.search.getEngineById(id); + const foundUrl = engine.getSubmission("test").uri.spec; + Assert.equal(foundUrl, url, `The URL of ${engine.name} is not altered.`); + } +}); ===================================== toolkit/components/search/tests/xpcshell/test_security_level.js ===================================== @@ -0,0 +1,22 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * This tests that we use the HTML version of DuckDuckGo when in the safest + * security level. + */ + +"use strict"; + +const expectedURLs = { + ddg: "https://html.duckduckgo.com/html?q=test", +}; + +add_task(async function test_securityLevel() { + await Services.search.init(); + for (const [id, url] of Object.entries(expectedURLs)) { + const engine = Services.search.getEngineById(id); + const foundUrl = engine.getSubmission("test").uri.spec; + Assert.equal(foundUrl, url, `${engine.name} is in HTML mode.`); + } +}); ===================================== toolkit/components/search/tests/xpcshell/xpcshell.toml ===================================== @@ -38,6 +38,8 @@ tags = "remote-settings" ["test_async.js"] +["test_base_browser.js"] + ["test_configExpansion.js"] support-files = [ "../../schema/search-config-v2-schema.json", @@ -199,6 +201,9 @@ support-files = [ ["test_searchUrlDomain.js"] +["test_security_level.js"] +prefs = ["browser.security_level.security_slider=1"] + ["test_selectedEngine.js"] ["test_sendSubmissionURL.js"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.3.0esr-15.0-1] 3 commits: fixup! BB 43525: Skip Remote Settings for search engine customization.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch base-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 825dd0b0 by Pier Angelo Vendrame at 2025-09-23T14:15:22+02:00 fixup! BB 43525: Skip Remote Settings for search engine customization. BB 44153: Add tests. - - - - - 53431beb by Pier Angelo Vendrame at 2025-09-23T14:15:36+02:00 fixup! BB 40925: Implemented the Security Level component BB 44153: Add search engine customization tests. - - - - - f9f42b6d by Pier Angelo Vendrame at 2025-09-23T14:15:48+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 44153: Add search engine customization tests. Change where we ignore upstream's block lists as the previous mechanism made tests timeout. - - - - - 4 changed files: - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/tests/xpcshell/test_base_browser.js - + toolkit/components/search/tests/xpcshell/test_security_level.js - toolkit/components/search/tests/xpcshell/xpcshell.toml Changes: ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -4,6 +4,7 @@ /* eslint no-shadow: error, mozilla/no-aArgs: error */ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -1426,6 +1427,10 @@ export class SearchService { // start listening straight away. Services.obs.addObserver(this, lazy.Region.REGION_TOPIC); + this.#getIgnoreListAndSubscribe().catch(ex => + console.error(ex, "Search Service could not get the ignore list.") + ); + this.#engineSelector = new lazy.SearchEngineSelector( this.#handleConfigurationUpdated.bind(this) ); @@ -1568,7 +1573,6 @@ export class SearchService { * handled via a sync listener. * */ - // eslint-disable-next-line no-unused-private-class-members async #getIgnoreListAndSubscribe() { let listener = this.#handleIgnoreListUpdated.bind(this); const current = await lazy.IgnoreLists.getAndSubscribe(listener); @@ -1593,6 +1597,10 @@ export class SearchService { * The event in the format received from RemoteSettings. */ async #handleIgnoreListUpdated(eventData) { + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + lazy.logConsole.debug("#handleIgnoreListUpdated"); const { data: { current }, ===================================== toolkit/components/search/tests/xpcshell/test_base_browser.js ===================================== @@ -0,0 +1,47 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * This tests the SearchService to check our override of the remote settings is + * working as expected. + */ + +"use strict"; + +const expectedURLs = { + ddg: "https://duckduckgo.com/?q=test", + startpage: "https://www.startpage.com/sp/search?q=test", +}; +const defaultEngine = "ddg"; + +add_setup(async function setup() { + await Services.search.init(); +}); + +add_task(async function test_listEngines() { + const { engines } = + await Services.search.wrappedJSObject._fetchEngineSelectorEngines(); + const foundIdentifiers = engines.map(e => e.identifier); + Assert.deepEqual(foundIdentifiers, Object.keys(expectedURLs)); +}); + +add_task(async function test_default() { + Assert.equal( + (await Services.search.getDefault()).id, + defaultEngine, + `${defaultEngine} is our default search engine in normal mode.` + ); + Assert.equal( + (await Services.search.getDefaultPrivate()).id, + defaultEngine, + `${defaultEngine} is our default search engine in PBM.` + ); +}); + +add_task(function test_checkSearchURLs() { + for (const [id, url] of Object.entries(expectedURLs)) { + const engine = Services.search.getEngineById(id); + const foundUrl = engine.getSubmission("test").uri.spec; + Assert.equal(foundUrl, url, `The URL of ${engine.name} is not altered.`); + } +}); ===================================== toolkit/components/search/tests/xpcshell/test_security_level.js ===================================== @@ -0,0 +1,22 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * This tests that we use the HTML version of DuckDuckGo when in the safest + * security level. + */ + +"use strict"; + +const expectedURLs = { + ddg: "https://html.duckduckgo.com/html?q=test", +}; + +add_task(async function test_securityLevel() { + await Services.search.init(); + for (const [id, url] of Object.entries(expectedURLs)) { + const engine = Services.search.getEngineById(id); + const foundUrl = engine.getSubmission("test").uri.spec; + Assert.equal(foundUrl, url, `${engine.name} is in HTML mode.`); + } +}); ===================================== toolkit/components/search/tests/xpcshell/xpcshell.toml ===================================== @@ -38,6 +38,8 @@ tags = "remote-settings" ["test_async.js"] +["test_base_browser.js"] + ["test_configExpansion.js"] support-files = [ "../../schema/search-config-v2-schema.json", @@ -199,6 +201,9 @@ support-files = [ ["test_searchUrlDomain.js"] +["test_security_level.js"] +prefs = ["browser.security_level.security_slider=1"] + ["test_selectedEngine.js"] ["test_sendSubmissionURL.js"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8893f4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8893f4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.3.0esr-15.0-1] 5 commits: dropme! TB 42891: Set the bundled search engine for Tor Browser.
by Pier Angelo Vendrame (＠pierov) 23 Sep '25

23 Sep '25

Pier Angelo Vendrame pushed to branch tor-browser-140.3.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: b17d862b by Pier Angelo Vendrame at 2025-09-23T11:34:13+02:00 dropme! TB 42891: Set the bundled search engine for Tor Browser. Temporarily restore the Base Browser search engine configuration for running tests on it. - - - - - b1f4f5aa by Pier Angelo Vendrame at 2025-09-23T11:34:16+02:00 fixup! BB 43525: Skip Remote Settings for search engine customization. BB 44153: Add tests. - - - - - 030d4788 by Pier Angelo Vendrame at 2025-09-23T11:34:17+02:00 fixup! BB 40925: Implemented the Security Level component BB 44153: Add search engine customization tests. - - - - - cb434512 by Pier Angelo Vendrame at 2025-09-23T11:34:18+02:00 fixup! TB 42891: Set the bundled search engine for Tor Browser. BB 44153: Add search engine customization tests. - - - - - 2901ed30 by Pier Angelo Vendrame at 2025-09-23T11:34:19+02:00 fixup! BB 31740: Remove some unnecessary RemoteSettings instances BB 44153: Add search engine customization tests. Change where we ignore upstream's block lists as the previous mechanism made tests timeout. - - - - - 5 changed files: - toolkit/components/search/SearchService.sys.mjs - toolkit/components/search/content/base-browser-search-engines.json - + toolkit/components/search/tests/xpcshell/test_base_browser.js - + toolkit/components/search/tests/xpcshell/test_security_level.js - toolkit/components/search/tests/xpcshell/xpcshell.toml Changes: ===================================== toolkit/components/search/SearchService.sys.mjs ===================================== @@ -4,6 +4,7 @@ /* eslint no-shadow: error, mozilla/no-aArgs: error */ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -1426,6 +1427,10 @@ export class SearchService { // start listening straight away. Services.obs.addObserver(this, lazy.Region.REGION_TOPIC); + this.#getIgnoreListAndSubscribe().catch(ex => + console.error(ex, "Search Service could not get the ignore list.") + ); + this.#engineSelector = new lazy.SearchEngineSelector( this.#handleConfigurationUpdated.bind(this) ); @@ -1568,7 +1573,6 @@ export class SearchService { * handled via a sync listener. * */ - // eslint-disable-next-line no-unused-private-class-members async #getIgnoreListAndSubscribe() { let listener = this.#handleIgnoreListUpdated.bind(this); const current = await lazy.IgnoreLists.getAndSubscribe(listener); @@ -1593,6 +1597,10 @@ export class SearchService { * The event in the format received from RemoteSettings. */ async #handleIgnoreListUpdated(eventData) { + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + lazy.logConsole.debug("#handleIgnoreListUpdated"); const { data: { current }, ===================================== toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -37,7 +37,7 @@ }, { "base": { - "aliases": ["startpage"], + "aliases": ["startpage", "sp"], "classification": "general", "name": "Startpage", "urls": { ===================================== toolkit/components/search/tests/xpcshell/test_base_browser.js ===================================== @@ -0,0 +1,52 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * This tests the SearchService to check our override of the remote settings is + * working as expected. + */ + +"use strict"; + +const expectedURLs = { + ddg: "https://duckduckgo.com/?q=test", + "ddg-onion": + "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/?q=t…", + startpage: "https://www.startpage.com/sp/search?q=test", + "startpage-onion": + "http://startpagel6srwcjlue4zgq3zevrujfaow726kjytqbbjyrswwmjzcqd.onion/sp/se…", + wikipedia: "https://en.wikipedia.org/wiki/Special:Search?search=test", +}; +const defaultEngine = "ddg"; + +add_setup(async function setup() { + await Services.search.init(); +}); + +add_task(async function test_listEngines() { + const { engines } = + await Services.search.wrappedJSObject._fetchEngineSelectorEngines(); + const foundIdentifiers = engines.map(e => e.identifier); + Assert.deepEqual(foundIdentifiers, Object.keys(expectedURLs)); +}); + +add_task(async function test_default() { + Assert.equal( + (await Services.search.getDefault()).id, + defaultEngine, + `${defaultEngine} is our default search engine in normal mode.` + ); + Assert.equal( + (await Services.search.getDefaultPrivate()).id, + defaultEngine, + `${defaultEngine} is our default search engine in PBM.` + ); +}); + +add_task(function test_checkSearchURLs() { + for (const [id, url] of Object.entries(expectedURLs)) { + const engine = Services.search.getEngineById(id); + const foundUrl = engine.getSubmission("test").uri.spec; + Assert.equal(foundUrl, url, `The URL of ${engine.name} is not altered.`); + } +}); ===================================== toolkit/components/search/tests/xpcshell/test_security_level.js ===================================== @@ -0,0 +1,24 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +/** + * This tests that we use the HTML version of DuckDuckGo when in the safest + * security level. + */ + +"use strict"; + +const expectedURLs = { + ddg: "https://html.duckduckgo.com/html?q=test", + "ddg-onion": + "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/html…", +}; + +add_task(async function test_securityLevel() { + await Services.search.init(); + for (const [id, url] of Object.entries(expectedURLs)) { + const engine = Services.search.getEngineById(id); + const foundUrl = engine.getSubmission("test").uri.spec; + Assert.equal(foundUrl, url, `${engine.name} is in HTML mode.`); + } +}); ===================================== toolkit/components/search/tests/xpcshell/xpcshell.toml ===================================== @@ -38,6 +38,8 @@ tags = "remote-settings" ["test_async.js"] +["test_base_browser.js"] + ["test_configExpansion.js"] support-files = [ "../../schema/search-config-v2-schema.json", @@ -199,6 +201,9 @@ support-files = [ ["test_searchUrlDomain.js"] +["test_security_level.js"] +prefs = ["browser.security_level.security_slider=1"] + ["test_selectedEngine.js"] ["test_sendSubmissionURL.js"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c62f5d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c62f5d… 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 41569: Include the channel name on .desktop files.
by Pier Angelo Vendrame (＠pierov) 22 Sep '25

22 Sep '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fc1adf49 by Pier Angelo Vendrame at 2025-09-22T18:53:24+02:00 Bug 41569: Include the channel name on .desktop files. But only for alpha/nightly. - - - - - 2f802636 by Pier Angelo Vendrame at 2025-09-22T18:53:24+02:00 Bug 41558: Share descriptions between Linux packages and archives. - - - - - 5 changed files: - projects/browser/RelativeLink/start-browser - projects/browser/RelativeLink/start-browser.desktop - projects/linux-packages/browser.desktop.in - projects/linux-packages/config - rbm.conf Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -241,7 +241,7 @@ if test -z "$system_install"; then # Fix up .desktop Icon and Exec Paths, and update the .desktop file from the # canonical version if it was changed by the updater. cp start-[% c('var/project-name') %].desktop ../ - sed -i -e "s,^Name=.*,Name=[% c('var/Project_Name') %],g" ../start-[% c('var/project-name') %].desktop + sed -i -e "s,^Name=.*,Name=[% c('var/display_name') %],g" ../start-[% c('var/project-name') %].desktop sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-[% c('var/project-name') %].desktop sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" start-[% c('var/project-name') %].desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-[% c('var/project-name') %]\" || ([ ! -x \"$PWD/start-[% c('var/project-name') %]\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-[% c('var/project-name') %])' dummy %k,g" ../start-[% c('var/project-name') %].desktop ===================================== projects/browser/RelativeLink/start-browser.desktop ===================================== @@ -24,9 +24,9 @@ [Desktop Entry] Type=Application -Name=[% c("var/Project_Name") %] Setup +Name=[% c("var/display_name") %] Setup GenericName=Web Browser -Comment=[% c("var/Project_Name") %] is +1 for privacy and −1 for mass surveillance +Comment=[% c("var/project_description") %] Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-[% c("var/project-name") %] || ([ ! -x "$(dirname "$*")"/Browser/start-[% c("var/project-name") %] ] && "$(dirname "$*")"/start-[% c("var/project-name") %])' dummy %k X-[% c("var/ProjectName") %]-ExecShell=./Browser/start-[% c("var/project-name") %] --detach ===================================== projects/linux-packages/browser.desktop.in ===================================== @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Name=[% c("var/Project_Name") %] +Name=[% c("var/display_name") %] GenericName=Web Browser Comment=[% c("var/system_pkg/pkg_description") %] Categories=Network;WebBrowser; ===================================== projects/linux-packages/config ===================================== @@ -11,7 +11,7 @@ var: pkg_name: '[% c("var/project-name") %]-[% c("var/channel") %]' pkg_version: '[% c("var/torbrowser_version") %]' pkg_revision: '1' - pkg_description: '[% c("var/display_name") %]' + pkg_description: '[% c("var/project_description") %]' deb_release_date: '[% USE date; date.format(c("timestamp"), format = "%a, %d %b %Y 01:02:03 +0000", locale = "en_US") %]' # https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions/ spdx_license: 'MPL-2.0 AND GPL-3.0-or-later AND OFL-1.1 AND Apache-2.0[% IF c("var/tor-browser") %] AND BSD-3-Clause AND CC0-1.0 AND MIT[% END %]' @@ -122,7 +122,6 @@ targets: var: browser_type: torbrowser system_pkg: - pkg_description: 'Tor Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting, using the Tor network to protect your privacy and anonymity.' pkg_url: 'https://torproject.org/' basebrowser: var: @@ -131,7 +130,6 @@ targets: var: browser_type: mullvadbrowser system_pkg: - pkg_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.' pkg_url: 'https://mullvad.net/browser' release: ===================================== rbm.conf ===================================== @@ -348,6 +348,7 @@ targets: Project_Name: 'Tor Browser' ProjectName: TorBrowser project_initials: tb + project_description: 'Tor Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting, using the Tor network to protect your privacy and anonymity.' basebrowser: var: @@ -366,6 +367,7 @@ targets: Project_Name: 'Mullvad Browser' ProjectName: MullvadBrowser project_initials: mb + project_description: 'Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.' exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' locales: 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/tor-browser-build][main] Bug 44167: Drop the nsis-uninstall patch
by boklm (＠boklm) 22 Sep '25

22 Sep '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8504804a by Beatriz Rizental at 2025-09-22T17:42:15+02:00 Bug 44167: Drop the nsis-uninstall patch - - - - - 3 changed files: - projects/firefox/build - projects/firefox/config - − projects/firefox/nsis-uninstall.patch Changes: ===================================== projects/firefox/build ===================================== @@ -78,7 +78,6 @@ MOZCONFIG_EOF [% IF c("var/windows") -%] # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" - patch -p1 < $rootdir/nsis-uninstall.patch # mingw-w64 does not support SEH on 32bit systems. Be explicit about that. export LDFLAGS="[% c('var/flag_noSEH') %]" [% END -%] ===================================== projects/firefox/config ===================================== @@ -195,8 +195,6 @@ input_files: enable: '[% c("var/has_l10n") && c("var/tor-browser") %]' - filename: fix-info-plist.py enable: '[% c("var/macos") %]' - - filename: nsis-uninstall.patch - enable: '[% c("var/windows") %]' - project: rust name: rust - project: cbindgen ===================================== projects/firefox/nsis-uninstall.patch deleted ===================================== @@ -1,40 +0,0 @@ -From 67c1d7d66d99494102832e12059a84fa439c88e0 Mon Sep 17 00:00:00 2001 -From: Sukhbir Singh <sukhbir(a)torproject.org> -Date: Tue, 12 Jun 2018 21:58:24 -0400 -Subject: [PATCH] Bug 26205: Don't build the uninstaller for Windows during - Firefox compilation - - -diff --git a/browser/Makefile.in b/browser/Makefile.in -index 364f590f5116d..6bda1c5aadaac 100644 ---- a/browser/Makefile.in -+++ b/browser/Makefile.in -@@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk - - ifdef MAKENSISU - --# For Windows build the uninstaller during the application build since the --# uninstaller is included with the application for mar file generation. --libs:: -- $(MAKE) -C installer/windows uninstaller - ifdef ENABLE_TESTS - $(MAKE) -C installer/windows install_deps - endif #ENABLE_TESTS -diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in -index 3827c46cefa8e..f10451b8cada4 100644 ---- a/browser/installer/Makefile.in -+++ b/browser/installer/Makefile.in -@@ -88,10 +88,6 @@ ifdef NECKO_WIFI - DEFINES += -DNECKO_WIFI - endif - --ifdef MAKENSISU --DEFINES += -DHAVE_MAKENSISU=1 --endif -- - ifdef MOZ_DEFAULT_BROWSER_AGENT - DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1 - endif --- -2.27.0 - 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