- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 41711: Update our manual machinery for its new home
by boklm (＠boklm) 28 Jul '26

28 Jul '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8b8abf69 by Nicolas Vigier at 2026-07-28T13:41:58+02:00 Bug 41711: Update our manual machinery for its new home - - - - - 7 changed files: - doc/how-to-update-the-manual.txt - projects/browser/build - projects/manual/README.md - projects/manual/build - projects/manual/config - − projects/manual/packagemanual.py - tools/update_manual.py Changes: ===================================== doc/how-to-update-the-manual.txt ===================================== @@ -1,9 +1,3 @@ -1. Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/ -2. Open the latest build stage -3. Download the artifacts (they come in a .zip file). -4. Rename it to manual_$PIPELINEID.zip -5. Upload it to people.tpo -6. Update projects/manual/config - 6.1 Change the version to $PIPELINEID - 6.2 Update the hash in the input_files section - 6.3 Update the URL if it was different from the previous uploader +1. Run ./tools/update_manual.py +2. Upload the new file to tb-build-02.torproject.org:~tb-builder/public_html/ +3. Commit the changes made by the script to projects/manual/config ===================================== projects/browser/build ===================================== @@ -184,7 +184,7 @@ tar -C "${TB_STAGE_DIR}" -xf [% c('input_files_by_name/firefox') %]/browser.tar. find . -exec [% c("touch") %] {} \; for tbdir in "${TBDIRS[@]}" do - find chrome/ | sort | zip -X -@ "$tbdir[% IF c('var/macos') %]/Contents/Resources[% END %]/browser/omni.ja" + find chrome/ defaults/preferences/tor-browser-manual.js | sort | zip -X -@ "$tbdir[% IF c('var/macos') %]/Contents/Resources[% END %]/browser/omni.ja" done popd rm -rf $TMP_MANUAL_PATH ===================================== projects/manual/README.md ===================================== @@ -10,7 +10,11 @@ So, since the manual doesn't contain binary executables, we decided not to build it, but to mirror the latest result of the CI to make sure a build stays reproducible (otherwise, CI artifacts would be deleted after a week). -However, the CI artifacts include a lot of files used by other Tor sites but not -from the manual, so we delete them in our build script to save space in the -builds. Also, the paths to resources need to be updated, because we serve the -manual as an about page, so we need to convert them to full `chrome://` URIs. +The download of the latest CI artifacts can be done by the script +`tools/update_manual.py`. + +However, the CI artifacts include a lot of files used by other Tor sites +but not from the manual, so they need to be deleted, and some of the +files need to be adapted for offline use. This is done by the script +`package_marble_build_artifacts.py` (which has tests in +`test_package_marble_build_artifacts.py`). ===================================== projects/manual/build ===================================== @@ -1,19 +1,26 @@ #!/bin/bash [% c("var/set_default_env") -%] -mkdir -p chrome/browser/content/browser/manual -unzip $rootdir/[% c('input_files_by_name/manual') %] -python3 $rootdir/[% c('input_files_by_name/package_script') %] public chrome/browser/content/browser/manual +manual_dir='chrome/browser/content/browser/aboutmanual' +mkdir -p "$manual_dir" manual-src +unzip -d manual-src $rootdir/[% c('input_files_by_name/manual') %] +python3 $rootdir/[% c('input_files_by_name/package_script') %] \ + --in-dir manual-src/public --out-dir "$manual_dir" \ + --out-locales "$rootdir/supported-locales.txt" -pushd chrome/browser/content/browser/manual/static -find -name '*.map' -delete -rm -rf fonts -rm -rf css/digital-climate-strike css/images -# We prune unused images in the Python script, but empty directories remain -find images -type d -empty -delete -popd +# Check for the expected characters, which will also ensure this can +# form a valid javascript string literal. +# Note that $() will strip any trailing newlines, if any. +supported_locales="$(cat "$rootdir/supported-locales.txt")" +if [[ ! "$supported_locales" =~ ^[a-zA-Z,-]*$ ]]; then + echo 'Error: unexpected characters in supported-locales.txt' >&2 + exit 1 +fi + +mkdir -p defaults/preferences +echo 'pref("torbrowser.manual.available-locales", "'"$supported_locales"'");' > defaults/preferences/tor-browser-manual.js [% c('tar', { - tar_src => [ 'chrome' ], + tar_src => [ 'chrome', 'defaults' ], tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), }) %] ===================================== 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: 321660 +version: 402523 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -21,8 +21,8 @@ var: input_files: - project: container-image - - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' + - URL: 'https://build-sources.tbb.torproject.org/marble-support_[% c("version") %].zip' name: manual - sha256sum: 9adb7d8ca2c9cb7dbd8d13d46135ea9f42636eafd053192fc5e233f2426cd8a3 - - filename: packagemanual.py + sha256sum: e0f09c869719bf9dc0ae2761f121cae7cd9b5324f817f2cc0a5861c58442f3ff + - filename: package_marble_build_artifacts.py name: package_script ===================================== projects/manual/packagemanual.py deleted ===================================== @@ -1,69 +0,0 @@ -#!/usr/bin/env python3 -from pathlib import Path -import re -import sys -import shutil - - -PAGE_NAME = 'offline-docs' -STATIC_PATH = 'chrome://browser/content/manual/static' - -if len(sys.argv) < 3: - print(f'Usage: {sys.argv[0]} lektor-out-directory target-directory') - sys.exit(1) - -source = Path(sys.argv[1]) -target = Path(sys.argv[2]) -if not target.exists(): - target.mkdir(exist_ok=True) - -static_re = re.compile('"(?:../)*static/([^"]+)"') -link_re = re.compile('href="../([^"]+)"') - - -def clean_urls(match): - m = re.match(r'(?:../)?([^/#]+)[/]?[#]?(.*)', match.group(1)) - slug = m.group(1) - if m.group(2): - anchor = '_' + m.group(2) - else: - anchor = '' - return f'href="#{slug}{anchor}"' - - -remove_images = [] -for p in (source / 'static/images').glob('**/*'): - if p.is_file(): - rel = p.relative_to(source) - remove_images.append(rel) - -htmls = source.rglob(f'{PAGE_NAME}/index.html') -for page in htmls: - with page.open(encoding='utf8') as f: - contents = f.read() - - remove_images = list(filter( - lambda im: contents.find(str(im)) == -1, remove_images)) - - contents = static_re.sub(f'"{STATIC_PATH}/\\1"', contents) - contents = link_re.sub(clean_urls, contents) - - rel = page.relative_to(source) - dest_name = str(list(rel.parents)[-2].name) - if dest_name == PAGE_NAME: - dest_name = 'en' - dest_name += '.html' - with (target / dest_name).open('w', encoding='utf8') as f: - f.write(contents) - - -def ignore_images(path, names): - return [ - n - for n in names - if Path(path, n).relative_to(source) in remove_images - ] - - -shutil.rmtree(target / 'static', ignore_errors=True) -shutil.copytree(source / 'static', target / 'static', ignore=ignore_images) ===================================== tools/update_manual.py ===================================== @@ -10,7 +10,7 @@ from fetch_changelogs import load_token, AUTH_HEADER GITLAB = "https://gitlab.torproject.org" API_URL = f"{GITLAB}/api/v4" -PROJECT_ID = 23 +PROJECT_ID = 3354 REF_NAME = "main" @@ -66,7 +66,7 @@ def update_manual(auth_token, base_path): raise RuntimeError("No usable job found") pipeline_id = int(job["pipeline"]["id"]) - manual_fname = f"manual_{pipeline_id}.zip" + manual_fname = f"marble-support_{pipeline_id}.zip" url = f"https://build-sources.tbb.torproject.org/{manual_fname}" r = requests.head(url) needs_upload = r.status_code != 200 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. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] 6 commits: fixup! TB 44694: [android] Remove new Tab bar feature
by brizental (＠brizental) 28 Jul '26

28 Jul '26

brizental pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: eac41a90 by Beatriz Rizental at 2026-07-28T16:18:31+02:00 fixup! TB 44694: [android] Remove new Tab bar feature Bug 45147: Enable android unit test builds. - - - - - 94f970fe by Beatriz Rizental at 2026-07-28T16:18:31+02:00 fixup! TB 44098: [android] Disable sync Bug 45147: Enable android unit test builds. - - - - - 5202d68f by Beatriz Rizental at 2026-07-28T16:18:31+02:00 fixup! TB 42655: [android] Implement "New circuit for this site" on Android Bug 45147: Enable android unit test builds. - - - - - de1a09f1 by Beatriz Rizental at 2026-07-28T16:18:31+02:00 fixup! [android] Disable features and functionality Bug 45147: Enable android unit test builds. - - - - - 092ce022 by Beatriz Rizental at 2026-07-28T16:18:31+02:00 fixup! [android] Delete unused media Bug 45147: Enable android unit test builds. - - - - - a054fea8 by Beatriz Rizental at 2026-07-28T16:18:31+02:00 fixup! [android] Modify UI/UX Bug 45147: Enable android unit test builds. - - - - - 7 changed files: - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/bookmarks/BookmarksMiddlewareTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/compose/MainMenuTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/setup/store/ChecklistItemTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/tabstray/TabManagerCfrControllerTest.kt Changes: ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/bookmarks/BookmarksMiddlewareTest.kt ===================================== @@ -1230,31 +1230,8 @@ class BookmarksMiddlewareTest { assertFalse(exited) } - @Test - fun `GIVEN current screen is an empty list and the top-level is loaded WHEN sign into sync is clicked THEN navigate to sign into sync `() = - runTest { - coEvery { - bookmarksStorage.countBookmarksInTrees( - listOf( - BookmarkRoot.Menu.id, - BookmarkRoot.Toolbar.id, - BookmarkRoot.Unfiled.id, - ), - ) - } returns 0u - coEvery { bookmarksStorage.getTree(BookmarkRoot.Mobile.id) } returns Result.success( - generateBookmarkTree(), - ) - var navigated = false - navigateToSignIntoSync = { navigated = true } - val middleware = buildMiddleware(this) - val store = middleware.makeStore() - testScheduler.advanceUntilIdle() - - store.dispatch(SignIntoSyncClicked) - - assertTrue(navigated) - } + // tor-browser#44098: sign-into-sync from bookmarks was removed, along with the + // SignIntoSyncClicked action this test used to dispatch. @Test fun `GIVEN current screen is a subfolder WHEN close is clicked THEN exit bookmarks `() = ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/compose/MainMenuTest.kt ===================================== @@ -94,6 +94,7 @@ class MainMenuTest { onIPProtectionClick = {}, onIPProtectionNavigate = {}, onShareButtonClick = {}, + onNewCircuitButtonClick = {}, extensionsMenuItemDescription = null, moreSettingsSubmenu = {}, extensionSubmenu = {}, ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt ===================================== @@ -4,7 +4,6 @@ package org.mozilla.fenix.components.metrics -import com.google.android.gms.ads.identifier.AdvertisingIdClient import com.google.android.gms.common.GooglePlayServicesNotAvailableException import com.google.android.gms.common.GooglePlayServicesRepairableException import io.mockk.every @@ -13,6 +12,7 @@ import kotlinx.coroutines.test.runTest import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals import org.junit.Assert.assertNull +import org.junit.Ignore import org.junit.Test import java.io.IOException @@ -34,21 +34,18 @@ class MetricsUtilsTest { @Test fun `getAdvertisingID() returns null if the API returns null info`() { - val mockInfo: AdvertisingIdClient.Info = mockk() - every { mockInfo.id } returns null - - assertNull(MetricsUtils.getAdvertisingID { mockInfo.id }) + assertNull(MetricsUtils.getAdvertisingID { null }) } + @Ignore("tor-browser#40014: the Google Advertising ID is neutered, so getAdvertisingID() always returns null") @Test fun `getAdvertisingID() returns a valid string if the API returns a valid ID`() { val testId = "test-value-id" - val mockInfo: AdvertisingIdClient.Info = mockk() - every { mockInfo.id } returns testId - assertEquals(testId, MetricsUtils.getAdvertisingID({ mockInfo.id })) + assertEquals(testId, MetricsUtils.getAdvertisingID({ testId })) } + @Ignore("tor-browser#40014: getHashedIdentifier() derives from getAdvertisingID(), which always returns null") @Test fun `getHashedIdentifier() returns a hashed identifier`() = runTest { val testId = "test-value-id" ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt ===================================== @@ -224,7 +224,7 @@ class BrowserToolbarMiddlewareTest { coEvery { bookmarksStorage.getBookmarksWithUrl(any()) } returns Result.success(listOf(mockk())) settings.shouldUseBottomToolbar = false settings.shouldUseExpandedToolbar = false - settings.isTabStripEnabled = false + // settings.isTabStripEnabled = false } @Test @@ -1266,7 +1266,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN on a small screen with tabstrip is disabled and not using the extended layout THEN don't show a share button as page end action`() { - settings.isTabStripEnabled = false + // settings.isTabStripEnabled = false settings.shouldUseExpandedToolbar = false val browserScreenStore = buildBrowserScreenStore() @@ -1278,7 +1278,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN on a wide screen with tabstrip is disabled THEN show a share button as page end action`() { - settings.isTabStripEnabled = false + // settings.isTabStripEnabled = false val browserScreenStore = buildBrowserScreenStore() val middleware = buildMiddleware( browserScreenStore = browserScreenStore, @@ -1292,7 +1292,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN on a large screen with tabstrip is enabled THEN don't show a share button as page end action`() { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true val browserScreenStore = buildBrowserScreenStore() val middleware = buildMiddleware(appStore, browserScreenStore) val toolbarStore = buildStore(middleware) @@ -1302,7 +1302,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN the current tab shows a content page WHEN the share shortcut is clicked THEN record telemetry and start sharing the local resource`() = runTest(testDispatcher) { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.shouldUseExpandedToolbar = false settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value val browserScreenStore = buildBrowserScreenStore() @@ -1337,7 +1337,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN the current tab shows a remote PDF WHEN the share shortcut is clicked THEN record telemetry and start sharing the remote resource`() { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.shouldUseExpandedToolbar = false settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value val browserScreenStore = buildBrowserScreenStore() @@ -1382,7 +1382,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN the current tab shows a normal webpage WHEN the share shortcut is clicked THEN record telemetry and open the share dialog`() { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.shouldUseExpandedToolbar = false settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value settings.nativeShareSheetEnabled = false @@ -1430,7 +1430,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `WHEN the share shortcut is clicked THEN the share use case is invoked with the current tab's details`() { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.shouldUseExpandedToolbar = false settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value @@ -1471,7 +1471,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN on a small width with tabstrip is enabled and not using the extended layout THEN don't show a share button as browser end action`() { settings.shouldUseExpandedToolbar = false - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true val browserScreenStore = buildBrowserScreenStore() val middleware = buildMiddleware( browserScreenStore = browserScreenStore, @@ -1491,7 +1491,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN expanded toolbar with tabstrip and tall window WHEN changing to short window THEN show new tab, tab counter and menu`() = runTest(testDispatcher) { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.shouldUseExpandedToolbar = true val browserScreenStore = buildBrowserScreenStore() var isWideScreen = false @@ -1526,7 +1526,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN on a wide window with tabstrip and extended layout enabled THEN don't show a share button as browser end action`() { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.shouldUseExpandedToolbar = true val browserScreenStore = buildBrowserScreenStore() @@ -1539,7 +1539,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `WHEN cycling through tall window and wide window THEN update what end page actions should be shown`() { val appStore = AppStore() - settings.isTabStripEnabled = false + // settings.isTabStripEnabled = false settings.shouldUseExpandedToolbar = false val readerModeStatus: ReaderModeStatus = mockk(relaxed = true) { every { isAvailable } returns true @@ -3156,7 +3156,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN share shortcut is selected THEN update end page actions without share action`() = runTest(testDispatcher) { - settings.isTabStripEnabled = false + // settings.isTabStripEnabled = false settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value val browserScreenStore = buildBrowserScreenStore() val middleware = buildMiddleware( @@ -3353,7 +3353,7 @@ class BrowserToolbarMiddlewareTest { @Test fun `GIVEN simple toolbar use share shortcut AND wide window with tabstrip enabled WHEN initializing toolbar THEN only show one Share in end browser actions`() { - settings.isTabStripEnabled = true + // settings.isTabStripEnabled = true settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value val middleware = buildMiddleware( ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/setup/store/ChecklistItemTest.kt ===================================== @@ -7,6 +7,7 @@ package org.mozilla.fenix.home.setup.store import androidx.annotation.StringRes import io.mockk.every import io.mockk.mockk +import mozilla.components.lib.crash.R as crashR import org.junit.Assert.assertEquals import org.junit.Test import org.mozilla.fenix.R @@ -149,7 +150,7 @@ class ChecklistItemTest { ChecklistItem.Task( type = ChecklistItem.Task.Type.SIGN_IN, title = R.string.setup_checklist_task_account_sync, - icon = R.drawable.ic_fx_accounts_avatar, + icon = crashR.drawable.mozac_lib_crash_notification, isCompleted = isCompleted, ), ) @@ -185,7 +186,7 @@ class ChecklistItemTest { ChecklistItem.Task( type = ChecklistItem.Task.Type.SIGN_IN, title = R.string.setup_checklist_task_account_sync, - icon = R.drawable.ic_fx_accounts_avatar, + icon = crashR.drawable.mozac_lib_crash_notification, isCompleted = isCompleted, ), ), @@ -258,7 +259,7 @@ class ChecklistItemTest { ChecklistItem.Task( type = ChecklistItem.Task.Type.SIGN_IN, title = R.string.setup_checklist_task_account_sync, - icon = R.drawable.ic_fx_accounts_avatar, + icon = crashR.drawable.mozac_lib_crash_notification, isCompleted = isCompleted, ), ), ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt ===================================== @@ -220,46 +220,7 @@ internal class DefaultCookieBannerDetailsControllerTest { } } - @Test - fun `GIVEN cookie banner mode is site not supported WHEN handleRequestSiteSupportPressed THEN request report site domain`() = - runTest(testDispatcher) { - val store = BrowserStore( - BrowserState( - customTabs = listOf( - createCustomTab( - url = "https://www.mozilla.org", - id = "mozilla", - ), - ), - ), - ) - every { testContext.components.core.store } returns store - coEvery { controller.getTabDomain(any()) } returns "mozilla.org" - every { protectionsStore.dispatch(any()) } returns mockk() - - val job = Pings.cookieBannerReportSite.testBeforeNextSubmit { - assertNotNull(CookieBanners.reportSiteDomain.testGetValue()) - assertEquals("mozilla.org", CookieBanners.reportSiteDomain.testGetValue()) - } - controller.handleRequestSiteSupportPressed() - testScheduler.advanceUntilIdle() - - job.join() - - assertNotNull(CookieBanners.reportDomainSiteButton.testGetValue()) - testScheduler.advanceUntilIdle() - coVerifyOrder { - protectionsStore.dispatch( - ProtectionsAction.RequestReportSiteDomain( - "mozilla.org", - ), - ) - protectionsStore.dispatch( - ProtectionsAction.UpdateCookieBannerMode( - cookieBannerUIMode = CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED, - ), - ) - cookieBannersStorage.saveSiteDomain("mozilla.org") - } - } + // tor-browser#42089: the ability to submit site support requests was removed, along with + // handleRequestSiteSupportPressed(), ProtectionsAction.RequestReportSiteDomain and + // CookieBannerUIMode.REQUEST_UNSUPPORTED_SITE_SUBMITTED this test used to exercise. } ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/tabstray/TabManagerCfrControllerTest.kt ===================================== @@ -100,7 +100,7 @@ class TabManagerCfrControllerTest { @Test fun `GIVEN an adjacent tab WHEN maybeMarkTabSwipeCfrReady is called THEN shouldShowTabSwipeCfr is set`() { settings.hasShownTabSwipeCFR = false - settings.isTabStripEnabled = false + // settings.isTabStripEnabled = false settings.isSwipeToolbarToSwitchTabsEnabled = true settings.shouldShowTabSwipeCFR = false val adjacentTab = createTab(id = "tab2", url = "") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/51b776… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/51b776… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-153.0esr-16.0-1] BB 45085: [android] Confine GooglePlayIntegrityClient to Components.kt
by brizental (＠brizental) 28 Jul '26

28 Jul '26

brizental pushed to branch mullvad-browser-153.0esr-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 7e4d093f by Beatriz Rizental at 2026-07-28T11:20:40-03:00 BB 45085: [android] Confine GooglePlayIntegrityClient to Components.kt Uplifting: https://phabricator.services.mozilla.com/D313912 - - - - - 4 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ClientUUID.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/llm/Llm.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -583,7 +583,7 @@ open class FenixApplication : Application(), Provider, ThemeProvider { } runOnVisualCompleteness(queue) { GlobalScope.launch(IO) { - components.integrityClient.warmUp() + components.warmUpIntegrityClient() } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ClientUUID.kt ===================================== @@ -7,7 +7,6 @@ package org.mozilla.fenix.components import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit -import mozilla.components.lib.integrity.googleplay.RequestHashProvider import mozilla.components.lib.llm.mlpa.UserIdProvider import mozilla.components.lib.llm.mlpa.service.UserId import mozilla.components.support.ktx.kotlin.toHexString @@ -39,9 +38,15 @@ fun interface Hasher { /** * Generates and persists a stable per-install UUID, used to identify this client - * consistently across [UserIdProvider] and [RequestHashProvider] consumers. + * consistently across [UserIdProvider] consumers and other callers that need a + * stable per-request hash derived from that UUID. */ -interface ClientUUID : UserIdProvider, RequestHashProvider { +interface ClientUUID : UserIdProvider { + /** + * Generates a hash derived from the client's stable UUID. + */ + fun generateHash(): String + companion object { /** * Convenience initializer that creates a [SharedPreferences] to be used by [ClientUUID]. ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt ===================================== @@ -19,6 +19,7 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.SupervisorJob import mozilla.components.concept.ai.controls.AIFeatureBlock import mozilla.components.concept.ai.controls.AIFeatureRegistry +import mozilla.components.concept.integrity.IntegrityClient import mozilla.components.feature.addons.AddonManager import mozilla.components.feature.addons.amo.AMOAddonsProvider import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker @@ -32,6 +33,8 @@ import mozilla.components.lib.ai.controls.default import mozilla.components.lib.crash.store.CrashAction import mozilla.components.lib.crash.store.CrashMiddleware import mozilla.components.lib.integrity.googleplay.GooglePlayIntegrityClient +import mozilla.components.lib.integrity.googleplay.IntegrityConsumer +import mozilla.components.lib.integrity.googleplay.RequestHashProvider import mozilla.components.lib.llm.mlpa.MlpaTokenStorage import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore @@ -434,14 +437,25 @@ class Components(private val context: Context) { ) } - val integrityClient by lazyMonitored { + private val googlePlayIntegrityClient by lazyMonitored { GooglePlayIntegrityClient.create( context = context, projectNumberToken = BuildConfig.GPS_INTEGRITY_TOKEN, - requestHashProvider = clientUUID, + requestHashProvider = RequestHashProvider { clientUUID.generateHash() }, ) } + val integrityClient: IntegrityClient by lazyMonitored { + googlePlayIntegrityClient.forConsumer(IntegrityConsumer.Summarize) + } + + /** + * Eagerly initializes the underlying Play Integrity token provider. This is exposed + * separately from [integrityClient] because warm-up is specific to the Google + * Play-backed implementation and isn't part of the [IntegrityClient] concept. + */ + suspend fun warmUpIntegrityClient(): Boolean = googlePlayIntegrityClient.warmUp() + val termsOfUsePromptRepository by lazyMonitored { DefaultTermsOfUsePromptRepository(settings) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/llm/Llm.kt ===================================== @@ -5,8 +5,7 @@ package org.mozilla.fenix.components.llm import mozilla.components.concept.fetch.Client -import mozilla.components.lib.integrity.googleplay.GooglePlayIntegrityClient -import mozilla.components.lib.integrity.googleplay.IntegrityConsumer +import mozilla.components.concept.integrity.IntegrityClient import mozilla.components.lib.llm.mlpa.MlpaLlmProvider import mozilla.components.lib.llm.mlpa.MlpaTokenProvider import mozilla.components.lib.llm.mlpa.MlpaTokenStorage @@ -25,7 +24,7 @@ class Llm( private val client: Client, private val storage: MlpaTokenStorage, private val fxaTokenProvider: FxaAccessTokenProvider, - private val integrityClient: GooglePlayIntegrityClient, + private val integrityClient: IntegrityClient, private val userIdProvider: UserIdProvider, ) { @@ -36,7 +35,7 @@ class Llm( MlpaTokenProvider.choose( MlpaTokenProvider.fxaTokenProvider(fxaTokenProvider), MlpaTokenProvider.mlpaIntegrityHandshake( - integrityClient = integrityClient.forConsumer(IntegrityConsumer.Summarize), + integrityClient = integrityClient, authenticationService = fenixMlpaService, userIdProvider = userIdProvider, storage = storage, View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/7e4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/7e4… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-153.0esr-16.0-1] BB 44908: Do not read AutoConfig from /etc/firefox when --disable-system-preferences
by brizental (＠brizental) 28 Jul '26

28 Jul '26

brizental pushed to branch mullvad-browser-153.0esr-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 16c34621 by Beatriz Rizental at 2026-07-28T11:19:42-03:00 BB 44908: Do not read AutoConfig from /etc/firefox when --disable-system-preferences Uplifting: https://phabricator.services.mozilla.com/D314532 - - - - - 1 changed file: - extensions/pref/autoconfig/src/nsReadConfig.cpp Changes: ===================================== extensions/pref/autoconfig/src/nsReadConfig.cpp ===================================== @@ -243,7 +243,7 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName, nsCOMPtr<nsIInputStream> inStr; if (isBinDir) { nsCOMPtr<nsIFile> jsFile; -#if defined(MOZ_WIDGET_GTK) +#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) bool exists; rv = @@ -257,15 +257,15 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName, if (NS_FAILED(rv)) return rv; if (!exists) { -#endif // defined(MOZ_WIDGET_GTK) +#endif // defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(jsFile)); if (NS_FAILED(rv)) return rv; rv = jsFile->AppendNative(nsDependentCString(aFileName)); if (NS_FAILED(rv)) return rv; -#if defined(MOZ_WIDGET_GTK) +#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) } -#endif // defined(MOZ_WIDGET_GTK) +#endif // defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile); if (NS_FAILED(rv)) return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/16c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/16c… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] 3 commits: BB 45085: [android] Confine GooglePlayIntegrityClient to Components.kt
by brizental (＠brizental) 28 Jul '26

28 Jul '26

brizental pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: d4d29dca by Beatriz Rizental at 2026-07-28T15:50:37+02:00 BB 45085: [android] Confine GooglePlayIntegrityClient to Components.kt Uplifting: https://phabricator.services.mozilla.com/D313912 - - - - - 584d0657 by Beatriz Rizental at 2026-07-28T15:50:37+02:00 fixup! [android] Disable features and functionality Bug 45085: Disable GooglePlayIntegrity - - - - - 51b77601 by Beatriz Rizental at 2026-07-28T15:50:37+02:00 fixup! [android] Disable features and functionality Bug 45134: Return deterministic NIL value for ClientUUID - - - - - 6 changed files: - mobile/android/fenix/app/build.gradle - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ClientUUID.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/llm/Llm.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/ClientUUIDTest.kt Changes: ===================================== mobile/android/fenix/app/build.gradle ===================================== @@ -564,7 +564,6 @@ dependencies { implementation project(':components:lib-push-firebase') implementation project(':components:lib-state') implementation project(':components:lib-accelerometer-sensormanager') - implementation project(':components:lib-integrity-googleplay') implementation project(':components:lib-llm-mlpa') implementation project(':components:lib-shake') implementation project(':components:lib-ai-controls') ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -592,7 +592,7 @@ open class FenixApplication : Application(), Provider, ThemeProvider { } runOnVisualCompleteness(queue) { GlobalScope.launch(IO) { - components.integrityClient.warmUp() + components.warmUpIntegrityClient() } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ClientUUID.kt ===================================== @@ -6,8 +6,6 @@ package org.mozilla.fenix.components import android.content.Context import android.content.SharedPreferences -import androidx.core.content.edit -import mozilla.components.lib.integrity.googleplay.RequestHashProvider import mozilla.components.lib.llm.mlpa.UserIdProvider import mozilla.components.lib.llm.mlpa.service.UserId import mozilla.components.support.ktx.kotlin.toHexString @@ -39,9 +37,15 @@ fun interface Hasher { /** * Generates and persists a stable per-install UUID, used to identify this client - * consistently across [UserIdProvider] and [RequestHashProvider] consumers. + * consistently across [UserIdProvider] consumers and other callers that need a + * stable per-request hash derived from that UUID. */ -interface ClientUUID : UserIdProvider, RequestHashProvider { +interface ClientUUID : UserIdProvider { + /** + * Generates a hash derived from the client's stable UUID. + */ + fun generateHash(): String + companion object { /** * Convenience initializer that creates a [SharedPreferences] to be used by [ClientUUID]. @@ -62,12 +66,9 @@ internal class PrefsBackedClientUUID( private val generateUUID: () -> String = { UUID.randomUUID().toString() }, private val hasher: Hasher = Hasher.sha256, ) : ClientUUID { + // tor-browser#45134: never expose a unique, trackable per-install identifier. private val uuid: String by lazy { - getPrefs().let { prefs -> - prefs.getString(KEY, null) ?: generateUUID().also { - prefs.edit { putString(KEY, it) } - } - } + NIL_UUID } override fun getUserId() = UserId(uuid) @@ -76,5 +77,6 @@ internal class PrefsBackedClientUUID( companion object { private const val KEY = "uuid" + private const val NIL_UUID = "00000000-0000-0000-0000-000000000000" } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt ===================================== @@ -19,6 +19,7 @@ import kotlinx.coroutines.MainScope import kotlinx.coroutines.SupervisorJob import mozilla.components.concept.ai.controls.AIFeatureBlock import mozilla.components.concept.ai.controls.AIFeatureRegistry +import mozilla.components.concept.integrity.IntegrityClient import mozilla.components.feature.addons.AddonManager import mozilla.components.feature.addons.amo.AMOAddonsProvider import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker @@ -31,7 +32,6 @@ import mozilla.components.lib.ai.controls.dataStore import mozilla.components.lib.ai.controls.default import mozilla.components.lib.crash.store.CrashAction import mozilla.components.lib.crash.store.CrashMiddleware -import mozilla.components.lib.integrity.googleplay.GooglePlayIntegrityClient import mozilla.components.lib.llm.mlpa.MlpaTokenStorage import mozilla.components.lib.publicsuffixlist.PublicSuffixList import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore @@ -437,14 +437,18 @@ class Components(private val context: Context) { ) } - val integrityClient by lazyMonitored { - GooglePlayIntegrityClient.create( - context = context, - projectNumberToken = BuildConfig.GPS_INTEGRITY_TOKEN, - requestHashProvider = clientUUID, - ) + // tor-browser#45085: Disable Google Play Integrity + val integrityClient: IntegrityClient by lazyMonitored { + IntegrityClient { Result.failure(IllegalStateException("Google Play Integrity is disabled")) } } + /** + * Eagerly initializes the underlying Play Integrity token provider. This is exposed + * separately from [integrityClient] because warm-up is specific to the Google + * Play-backed implementation and isn't part of the [IntegrityClient] concept. + */ + suspend fun warmUpIntegrityClient(): Boolean = false // tor-browser#45085: no-op + val termsOfUsePromptRepository by lazyMonitored { DefaultTermsOfUsePromptRepository(settings) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/llm/Llm.kt ===================================== @@ -5,8 +5,7 @@ package org.mozilla.fenix.components.llm import mozilla.components.concept.fetch.Client -import mozilla.components.lib.integrity.googleplay.GooglePlayIntegrityClient -import mozilla.components.lib.integrity.googleplay.IntegrityConsumer +import mozilla.components.concept.integrity.IntegrityClient import mozilla.components.lib.llm.mlpa.MlpaLlmProvider import mozilla.components.lib.llm.mlpa.MlpaTokenProvider import mozilla.components.lib.llm.mlpa.MlpaTokenStorage @@ -25,7 +24,7 @@ class Llm( private val client: Client, private val storage: MlpaTokenStorage, private val fxaTokenProvider: FxaAccessTokenProvider, - private val integrityClient: GooglePlayIntegrityClient, + private val integrityClient: IntegrityClient, private val userIdProvider: UserIdProvider, ) { @@ -36,7 +35,7 @@ class Llm( MlpaTokenProvider.choose( MlpaTokenProvider.fxaTokenProvider(fxaTokenProvider), MlpaTokenProvider.mlpaIntegrityHandshake( - integrityClient = integrityClient.forConsumer(IntegrityConsumer.Summarize), + integrityClient = integrityClient, authenticationService = fenixMlpaService, userIdProvider = userIdProvider, storage = storage, ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/ClientUUIDTest.kt ===================================== @@ -7,9 +7,25 @@ package org.mozilla.fenix.components import mozilla.components.lib.llm.mlpa.service.UserId import mozilla.components.support.test.fakes.android.FakeSharedPreferences import org.junit.Assert.assertEquals +import org.junit.Ignore import org.junit.Test class ClientUUIDTest { + @Test + fun `that the client uuid is always the nil uuid, regardless of generateUUID`() { + val prefs = FakeSharedPreferences() + val nilUuid = UserId("00000000-0000-0000-0000-000000000000") + + val first = PrefsBackedClientUUID({ prefs }, generateUUID = { "my-generated-uuid" }) + assertEquals(nilUuid, first.getUserId()) + // idempotency check + assertEquals(nilUuid, first.getUserId()) + + val second = PrefsBackedClientUUID({ prefs }, generateUUID = { "another-generated-uuid" }) + assertEquals(nilUuid, second.getUserId()) + } + + @Ignore("tor-browser#45134: PrefsBackedClientUUID always returns the nil uuid, see the test above") @Test fun `that a client uuid will only be generated the first time`() { val prefs = FakeSharedPreferences() @@ -25,6 +41,7 @@ class ClientUUIDTest { assertEquals(UserId("my-generated-uuid"), second.getUserId()) } + @Ignore("tor-browser#45134: PrefsBackedClientUUID always returns the nil uuid, so the hash is no longer derived from generateUUID's output") @Test fun `that generateHash uses the provided hasher`() { val prefs = FakeSharedPreferences() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5436a4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5436a4… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] BB 44908: Do not read AutoConfig from /etc/firefox when --disable-system-preferences
by brizental (＠brizental) 28 Jul '26

28 Jul '26

brizental pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 5436a4c1 by Beatriz Rizental at 2026-07-28T15:36:42+02:00 BB 44908: Do not read AutoConfig from /etc/firefox when --disable-system-preferences Uplifting: https://phabricator.services.mozilla.com/D314532 - - - - - 1 changed file: - extensions/pref/autoconfig/src/nsReadConfig.cpp Changes: ===================================== extensions/pref/autoconfig/src/nsReadConfig.cpp ===================================== @@ -243,7 +243,7 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName, nsCOMPtr<nsIInputStream> inStr; if (isBinDir) { nsCOMPtr<nsIFile> jsFile; -#if defined(MOZ_WIDGET_GTK) +#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) bool exists; rv = @@ -257,15 +257,15 @@ nsresult nsReadConfig::openAndEvaluateJSFile(const char* aFileName, if (NS_FAILED(rv)) return rv; if (!exists) { -#endif // defined(MOZ_WIDGET_GTK) +#endif // defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(jsFile)); if (NS_FAILED(rv)) return rv; rv = jsFile->AppendNative(nsDependentCString(aFileName)); if (NS_FAILED(rv)) return rv; -#if defined(MOZ_WIDGET_GTK) +#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) } -#endif // defined(MOZ_WIDGET_GTK) +#endif // defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES) rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile); if (NS_FAILED(rv)) return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5436a4c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5436a4c… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-153.0esr-16.0-1] fixup! BB 9173: Change the default Firefox profile directory to be relative.
by morgan (＠morgan) 28 Jul '26

28 Jul '26

morgan pushed to branch mullvad-browser-153.0esr-16.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 88be53ba by Pier Angelo Vendrame at 2026-07-28T13:34:27+00:00 fixup! BB 9173: Change the default Firefox profile directory to be relative. BB 45074: Do not promote Tor Browser as a PDF viewer. This functionality does not work when in portable mode. - - - - - 1 changed file: - toolkit/actors/AboutPDFParent.sys.mjs Changes: ===================================== toolkit/actors/AboutPDFParent.sys.mjs ===================================== @@ -29,7 +29,14 @@ export class AboutPDFParent extends JSWindowActorParent { } #canSetDefaultPDFHandler() { - if (!ShellService || AppConstants.platform != "win") { + const xreDirProvider = Cc[ + "@mozilla.org/xre/directory-provider;1" + ].getService(Ci.nsIXREDirProvider); + if ( + !ShellService || + AppConstants.platform != "win" || + xreDirProvider.isPortableMode + ) { return false; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/88b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/88b… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] fixup! BB 9173: Change the default Firefox profile directory to be relative.
by morgan (＠morgan) 28 Jul '26

28 Jul '26

morgan pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 572ec37e by Pier Angelo Vendrame at 2026-07-28T13:33:06+00:00 fixup! BB 9173: Change the default Firefox profile directory to be relative. BB 45074: Do not promote Tor Browser as a PDF viewer. This functionality does not work when in portable mode. - - - - - 1 changed file: - toolkit/actors/AboutPDFParent.sys.mjs Changes: ===================================== toolkit/actors/AboutPDFParent.sys.mjs ===================================== @@ -29,7 +29,14 @@ export class AboutPDFParent extends JSWindowActorParent { } #canSetDefaultPDFHandler() { - if (!ShellService || AppConstants.platform != "win") { + const xreDirProvider = Cc[ + "@mozilla.org/xre/directory-provider;1" + ].getService(Ci.nsIXREDirProvider); + if ( + !ShellService || + AppConstants.platform != "win" || + xreDirProvider.isPortableMode + ) { return false; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/572ec37… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/572ec37… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] 6 commits: fixup! BB 41916: Letterboxing preferences UI
by henry (＠henry) 28 Jul '26

28 Jul '26

henry pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: 34750d3a by Henry Wilkes at 2026-07-28T13:15:52+00:00 fixup! BB 41916: Letterboxing preferences UI BB 44959: Swap about:manual link. - - - - - 1f471dc9 by Henry Wilkes at 2026-07-28T13:15:52+00:00 fixup! BB 40925: Implemented the Security Level component BB 44959: Swap about:manual link. - - - - - 2064e1c8 by Henry Wilkes at 2026-07-28T13:15:52+00:00 fixup! TB 11698: Incorporate Tor Browser Manual pages into Tor Browser TB 44959: Integrate the new manual. - - - - - 631c2c54 by Henry Wilkes at 2026-07-28T13:15:52+00:00 fixup! TB 30237: Add v3 onion services client authentication prompt TB 44959: Swap about:manual link. - - - - - da12add2 by Henry Wilkes at 2026-07-28T13:15:52+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 44959: Swap about:manual link. - - - - - 21d6cfe7 by Henry Wilkes at 2026-07-28T13:15:52+00:00 fixup! Add TorStrings module for localization TB 44959: Swap about:manual link. - - - - - 18 changed files: - browser/components/DesktopActorRegistry.sys.mjs - browser/components/about/AboutRedirector.cpp - + browser/components/aboutmanual/AboutManualChild.sys.mjs - + browser/components/aboutmanual/AboutManualParent.sys.mjs - + browser/components/aboutmanual/content/aboutManual.js - + browser/components/aboutmanual/jar.mn - + browser/components/aboutmanual/moz.build - browser/components/moz.build - browser/components/onionservices/content/authPopup.inc.xhtml - browser/components/preferences/config/passwords-autofill.mjs - browser/components/preferences/letterboxing.inc.xhtml - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - browser/components/torpreferences/config/connection.mjs - browser/components/torpreferences/content/connectionPane.inc.xhtml - browser/components/torpreferences/content/provideBridgeDialog.xhtml - toolkit/content/aboutNetError.mjs - toolkit/modules/TorStrings.sys.mjs Changes: ===================================== browser/components/DesktopActorRegistry.sys.mjs ===================================== @@ -126,6 +126,23 @@ let JSWINDOWACTORS = { remoteTypes: ["privilegedabout"], }, + AboutManual: { + parent: { + esModuleURI: + "moz-src:///browser/components/aboutmanual/AboutManualParent.sys.mjs", + }, + child: { + esModuleURI: + "moz-src:///browser/components/aboutmanual/AboutManualChild.sys.mjs", + + events: { + ManualLocaleSelected: { wantUntrusted: true }, + }, + }, + + matches: ["about:manual"], + }, + AboutMessagePreview: { parent: { esModuleURI: "resource:///actors/AboutMessagePreviewParent.sys.mjs", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -212,52 +212,45 @@ static nsAutoCString GetAboutModuleName(nsIURI* aURI) { return path; } -static nsTHashSet<nsCStringHashKey> GetManualLocales() { - nsTHashSet<nsCStringHashKey> locales; - RefPtr<nsZipArchive> zip = Omnijar::GetReader(Omnijar::APP); - if (!zip) { - // Probably a local build started with ./mach run - return locales; - } - UniquePtr<nsZipFind> find; - const nsAutoCString prefix("chrome/browser/content/browser/manual/"); - nsAutoCString needle = prefix; - needle.Append("*.html"); - if (NS_SUCCEEDED(zip->FindInit(needle.get(), getter_Transfers(find)))) { - const char* entryName; - uint16_t entryNameLen; - while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) { - // 5 is to remove the final `.html` - const size_t length = entryNameLen - prefix.Length() - 5; - locales.Insert(nsAutoCString(entryName + prefix.Length(), length)); - } - } - return locales; -} - static nsAutoCString GetManualChromeURI() { - static nsTHashSet<nsCStringHashKey> locales = GetManualLocales(); - - nsAutoCString reqLocale; - intl::LocaleService::GetInstance()->GetAppLocaleAsBCP47(reqLocale); - // Check every time the URL is needed in case the locale has changed. - // It might help also if we start allowing to change language, e.g., with a - // get parameter (see tor-browser#42675). - if (!locales.Contains(reqLocale) && reqLocale.Length() > 2 && - reqLocale[2] == '-') { - // At the moment, codes in our manual output are either 2 letters (en) or - // 5 letters (pt-BR) - reqLocale.SetLength(2); + nsTArray<nsCString> availableLocales; + nsCString availableLocalesStr; + if (NS_SUCCEEDED(mozilla::Preferences::GetCString( + "torbrowser.manual.available-locales", availableLocalesStr)) && + availableLocalesStr.Length() > 0) { + for (const nsACString& locale : availableLocalesStr.Split(',')) { + availableLocales.AppendElement(locale); + } } - if (!locales.Contains(reqLocale)) { - reqLocale = "en"; + nsCString tryLocale; + if (!NS_SUCCEEDED(mozilla::Preferences::GetCString("torbrowser.manual.locale", + tryLocale)) || + !availableLocales.Contains(tryLocale)) { + nsTArray<nsCString> appLocales; + intl::LocaleService::GetInstance()->GetAppLocalesAsBCP47(appLocales); + bool found = false; + for (size_t i = 0; i < appLocales.Length(); i++) { + tryLocale = appLocales[i]; + if (availableLocales.Contains(tryLocale)) { + found = true; + break; + } else if (tryLocale.Length() > 3 && tryLocale[2] == '-') { + // Strip the region code and see if the lang matches. + tryLocale.SetLength(2); + if (availableLocales.Contains(tryLocale)) { + found = true; + break; + } + } + } + if (!found) { + tryLocale.AssignLiteral("en"); + } } - - // %s is the language - constexpr char model[] = "chrome://browser/content/manual/%s.html"; - nsAutoCString url; - url.AppendPrintf(model, reqLocale.get()); - return url; + nsAutoCString uri; + uri.AppendPrintf("chrome://browser/content/aboutmanual/aboutManual-%s.html", + tryLocale.get()); + return uri; } NS_IMETHODIMP ===================================== browser/components/aboutmanual/AboutManualChild.sys.mjs ===================================== @@ -0,0 +1,15 @@ +/** + * Actor child class for the about:manual page. + */ +export class AboutManualChild extends JSWindowActorChild { + handleEvent(event) { + switch (event.type) { + case "ManualLocaleSelected": { + const locale = event.detail; + if (typeof locale === "string") { + this.sendAsyncMessage("AboutManual:LocaleSelected", locale); + } + } + } + } +} ===================================== browser/components/aboutmanual/AboutManualParent.sys.mjs ===================================== @@ -0,0 +1,21 @@ +/** + * Actor parent class for the about:manual page. + */ +export class AboutManualParent extends JSWindowActorParent { + receiveMessage(message) { + switch (message.name) { + case "AboutManual:LocaleSelected": { + const locale = message.data; + if ( + Services.prefs + .getStringPref("torbrowser.manual.available-locales", "") + .split(",") + .includes(locale) + ) { + Services.prefs.setStringPref("torbrowser.manual.locale", locale); + this.browsingContext.reload(Ci.nsIWebNavigation.LOAD_FLAGS_NONE); + } + } + } + } +} ===================================== browser/components/aboutmanual/content/aboutManual.js ===================================== @@ -0,0 +1,67 @@ +"use strict"; + +function changePage(initialLoad) { + let page; + const hash = location.hash; + const id = hash.startsWith("#") ? hash.substr(1) : null; + let targetEl = null; + if (id) { + targetEl = document.getElementById(id); + page = targetEl?.closest(".olm-page"); + } + if (!page) { + if (!initialLoad) { + // Make no change. + return; + } + page = document.getElementById("index"); + } + const currPage = document.querySelector(".olm-page:not(.d-none)"); + if (currPage === page) { + // No change in page. + return; + } + + currPage?.classList.add("d-none"); + page.classList.remove("d-none"); + + // If we are targeting an element that is not a page element, we want to + // scroll it into view (the focus position should have already shifted to + // point to it). + // Otherwise, if we have no target or the target is a page, we want to scroll + // to the top of the document so that the header is visible. + const doScroll = () => { + const scrollEl = targetEl && targetEl !== page ? targetEl : document.body; + scrollEl.scrollIntoView({ + behavior: "instant", + block: "start", + inline: "start", + }); + }; + if (initialLoad) { + window.addEventListener("load", doScroll, { once: true }); + } else { + doScroll(); + } +} + +window.addEventListener("DOMContentLoaded", () => { + const langDropdown = document.getElementById("language-menu-dropdown"); + for (const langButton of langDropdown.querySelectorAll("button")) { + langButton.addEventListener("click", () => { + dispatchEvent( + new CustomEvent("ManualLocaleSelected", { + // The button's lang attribute is expected to match the locale's code. + detail: langButton.getAttribute("lang"), + bubbles: true, + }) + ); + }); + } + + changePage(true); +}); + +window.addEventListener("hashchange", () => { + changePage(false); +}); ===================================== browser/components/aboutmanual/jar.mn ===================================== @@ -0,0 +1,2 @@ +browser.jar: + content/browser/aboutmanual/aboutManual.js (content/aboutManual.js) ===================================== browser/components/aboutmanual/moz.build ===================================== @@ -0,0 +1,6 @@ +JAR_MANIFESTS += ["jar.mn"] + +MOZ_SRC_FILES += [ + "AboutManualChild.sys.mjs", + "AboutManualParent.sys.mjs", +] ===================================== browser/components/moz.build ===================================== @@ -26,6 +26,7 @@ with Files("controlcenter/**"): DIRS += [ "about", + "aboutmanual", "aboutlogins", "abouttor", "aboutwelcome", ===================================== browser/components/onionservices/content/authPopup.inc.xhtml ===================================== @@ -6,7 +6,7 @@ <label class="text-link popup-notification-learnmore-link" is="text-link" - href="about:manual#onion-services_onion-service-authentication" + href="about:manual#features__onion-services___onion-service-auth" useoriginprincipal="true" data-l10n-id="onion-site-authentication-prompt-learn-more" /> ===================================== browser/components/preferences/config/passwords-autofill.mjs ===================================== @@ -792,7 +792,7 @@ SettingGroupManager.registerGroups({ onionSiteAuthentication: { l10nId: "onion-site-authentication-group", headingLevel: 2, - supportPage: "tor-manual:onion-services_onion-service-authentication", + supportPage: "tor-manual:features__onion-services___onion-service-auth", items: [ { id: "onionSiteSavedKeys", ===================================== browser/components/preferences/letterboxing.inc.xhtml ===================================== @@ -10,7 +10,7 @@ <html:span data-l10n-id="letterboxing-overview"></html:span> <html:a is="moz-support-link" - support-page="tor-manual:anti-fingerprinting_letterboxing" + support-page="tor-manual:features__fingerprinting-protections___letterboxing" data-l10n-id="letterboxing-learn-more" ></html:a> </description> ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -18,7 +18,7 @@ <html:a is="moz-support-link" id="securityLevel-learnMore" - support-page="tor-manual:security-settings" + support-page="tor-manual:features__security-levels" data-l10n-id="security-level-panel-learn-more-link" ></html:a> <html:img id="securityLevel-background-image" alt="" /> ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -13,7 +13,7 @@ ></html:span> <html:a is="moz-support-link" - support-page="tor-manual:security-settings" + support-page="tor-manual:features__security-levels" data-l10n-id="security-level-preferences-learn-more-link" ></html:a> </description> ===================================== browser/components/torpreferences/config/connection.mjs ===================================== @@ -13,7 +13,7 @@ SettingGroupManager.registerGroups({ connectionStatus: { inProgress: true, l10nId: "tor-connection-internet-status-group", - supportPage: "tor-manual:about", + supportPage: "tor-manual:getting-started__about-tor-browser", headingLevel: 2, items: [ { ===================================== browser/components/torpreferences/content/connectionPane.inc.xhtml ===================================== @@ -18,7 +18,7 @@ <label class="learnMore text-link" is="text-link" - href="about:manual#about" + href="about:manual#getting-started__about-tor-browser" useoriginprincipal="true" data-l10n-id="tor-connection-browser-learn-more-link" /> @@ -129,7 +129,7 @@ <label class="learnMore text-link" is="text-link" - href="about:manual#bridges" + href="about:manual#circumvention__unblocking-tor" useoriginprincipal="true" data-l10n-id="tor-bridges-learn-more-link" /> ===================================== browser/components/torpreferences/content/provideBridgeDialog.xhtml ===================================== @@ -37,7 +37,7 @@ <label is="text-link" class="learnMore text-link" - href="about:manual#bridges" + href="about:manual#circumvention__unblocking-tor" useoriginprincipal="true" data-l10n-id="user-provide-bridge-dialog-learn-more" /> ===================================== toolkit/content/aboutNetError.mjs ===================================== @@ -372,7 +372,7 @@ function initOnionError() { const learnMore = document.getElementById("learnMoreContainer"); learnMore.hidden = false; const learnMoreLink = document.getElementById("learnMoreLink"); - learnMoreLink.href = "about:manual#onion-services"; + learnMoreLink.href = "about:manual#features__onion-services"; setFocus("#netErrorButtonContainer > .try-again"); ===================================== toolkit/modules/TorStrings.sys.mjs ===================================== @@ -243,7 +243,7 @@ const Loader = { ); return { ...tsb.getStrings(strings), - learnMoreURL: "about:manual#onion-services", + learnMoreURL: "about:manual#features__onion-services", // XUL popups cannot open about: URLs, but we are online when showing the notification, so just use the online version learnMoreURLNotification: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a527ea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a527ea… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-153.0esr-16.0-1] fixup! BB 44711: Hide unwanted setting controls in Base Browser.
by henry (＠henry) 28 Jul '26

28 Jul '26

henry pushed to branch tor-browser-153.0esr-16.0-1 at The Tor Project / Applications / Tor Browser Commits: a527ea6b by Henry Wilkes at 2026-07-28T13:13:39+00:00 fixup! BB 44711: Hide unwanted setting controls in Base Browser. BB 45156: Hide "Customize Firefox Home" in appearance settings. - - - - - 1 changed file: - browser/components/preferences/config/appearance.mjs Changes: ===================================== browser/components/preferences/config/appearance.mjs ===================================== @@ -90,6 +90,8 @@ Preferences.addSetting({ Preferences.addSetting({ id: "related-settings-home-link", + // Hide the "Customize Firefox Home" link. tor-browser#45156. + visible: () => false, onUserClick: e => { e.preventDefault(); window.gotoPref("paneHome"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a527ea6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a527ea6… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0