- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 3 commits: fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in...
by henry (＠henry) 10 Mar '25

10 Mar '25

henry pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 03900c02 by Henry Wilkes at 2025-03-10T11:05:42+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43463: Use TorConnect.frequentRegionCodes promise to populate the locations popup. Also ensure the initial value is "automatic". - - - - - 8e2dc3e0 by Henry Wilkes at 2025-03-10T11:05:44+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 43463: Renamed TorConnect getCountryCodes to getFrequentRegions. - - - - - 48d3af20 by Henry Wilkes at 2025-03-10T11:05:45+00:00 fixup! TB 40597: Implement TorSettings module TB 43463: Load Moat regions from a local file rather than using Moat. Also rename getCountryCodes to getFrequentRegions. - - - - - 10 changed files: - .eslintignore - .prettierignore - browser/components/torpreferences/content/connectionPane.js - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/components/torconnect/content/aboutTorConnect.js - toolkit/content/jar.mn - + toolkit/content/moat_countries_dev_build.json - toolkit/modules/Moat.sys.mjs - toolkit/modules/RemotePageAccessManager.sys.mjs - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== .eslintignore ===================================== @@ -304,4 +304,5 @@ browser/app/profile/001-base-profile.js browser/app/profile/000-tor-browser.js mobile/android/app/000-tor-browser-android.js toolkit/content/pt_config.json +toolkit/content/moat_contries_dev_build.json toolkit/components/lox/lox_wasm.jsm ===================================== .prettierignore ===================================== @@ -1533,4 +1533,5 @@ browser/app/profile/001-base-profile.js browser/app/profile/000-tor-browser.js mobile/android/app/000-tor-browser-android.js toolkit/content/pt_config.json +toolkit/content/moat_countries_dev_build.json toolkit/components/lox/lox_wasm.jsm ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2529,65 +2529,48 @@ const gConnectionPane = (function () { regionCode: location.value, }); }); - this._populateLocations = () => { - const currentValue = location.value; - locationEntries.textContent = ""; - const createItem = (value, label, disabled) => { - const item = document.createXULElement("menuitem"); - item.setAttribute("value", value); - item.setAttribute("label", label); - if (disabled) { - item.setAttribute("disabled", "true"); - } - return item; - }; - const addLocations = codes => { - const items = []; - for (const code of codes) { - items.push( - createItem( - code, - TorConnect.countryNames[code] - ? TorConnect.countryNames[code] - : code - ) - ); - } - items.sort((left, right) => left.label.localeCompare(right.label)); - locationEntries.append(...items); - }; - locationEntries.append( - createItem("automatic", TorStrings.settings.bridgeLocationAutomatic) - ); - if (TorConnect.countryCodes.length) { - locationEntries.append( - createItem("", TorStrings.settings.bridgeLocationFrequent, true) - ); - addLocations(TorConnect.countryCodes); - locationEntries.append( - createItem("", TorStrings.settings.bridgeLocationOther, true) + const createItem = (value, label, disabled) => { + const item = document.createXULElement("menuitem"); + item.setAttribute("value", value); + item.setAttribute("label", label); + if (disabled) { + item.setAttribute("disabled", "true"); + } + return item; + }; + const addLocations = codes => { + const items = []; + for (const code of codes) { + items.push( + createItem( + code, + TorConnect.countryNames[code] + ? TorConnect.countryNames[code] + : code + ) ); } - addLocations(Object.keys(TorConnect.countryNames)); - location.value = currentValue; + items.sort((left, right) => left.label.localeCompare(right.label)); + locationEntries.append(...items); }; + // Add automatic before waiting for getFrequentRegions. + locationEntries.append( + createItem("automatic", TorStrings.settings.bridgeLocationAutomatic) + ); + location.value = "automatic"; + TorConnect.getFrequentRegions().then(frequentCodes => { + locationEntries.append( + createItem("", TorStrings.settings.bridgeLocationFrequent, true) + ); + addLocations(frequentCodes); + locationEntries.append( + createItem("", TorStrings.settings.bridgeLocationOther, true) + ); + addLocations(Object.keys(TorConnect.countryNames)); + }); this._showAutoconfiguration = () => { - if ( - !TorConnect.canBeginAutoBootstrap || - !TorConnect.potentiallyBlocked - ) { - locationGroup.setAttribute("hidden", "true"); - return; - } - // Populate locations, even though we will show only the automatic - // item for a moment. In my opinion showing the button immediately is - // better then waiting for the Moat query to finish (after a while) - // and showing the controls only after that. - this._populateLocations(); - locationGroup.removeAttribute("hidden"); - if (!TorConnect.countryCodes.length) { - TorConnect.getCountryCodes().then(() => this._populateLocations()); - } + locationGroup.hidden = + !TorConnect.canBeginAutoBootstrap || !TorConnect.potentiallyBlocked; }; this._showAutoconfiguration(); } ===================================== toolkit/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -132,8 +132,8 @@ export class TorConnectParent extends JSWindowActorParent { stage: TorConnect.stage, quickstartEnabled: TorConnect.quickstart, }; - case "torconnect:get-country-codes": - return TorConnect.getCountryCodes(); + case "torconnect:get-frequent-regions": + return TorConnect.getFrequentRegions(); } return undefined; } ===================================== toolkit/components/torconnect/content/aboutTorConnect.js ===================================== @@ -610,7 +610,7 @@ class AboutTorConnect { showLocationForm(isChoose, buttonLabel) { this.hideButtons(); - RPMSendQuery("torconnect:get-country-codes").then(codes => { + RPMSendQuery("torconnect:get-frequent-regions").then(codes => { if (codes && codes.length) { this.populateFrequentLocations(codes); this.setLocation(); ===================================== toolkit/content/jar.mn ===================================== @@ -158,4 +158,9 @@ toolkit.jar: content/global/third_party/d3/d3.js (/third_party/js/d3/d3.js) content/global/third_party/cfworker/json-schema.js (/third_party/js/cfworker/json-schema.js) + # The pt_config.json content should be replaced in the omni.ja in + # tor-browser-build. See tor-browser#42343. content/global/pt_config.json (pt_config.json) + # The moat_countries.json content should be replaced in the omni.ja in + # tor-browser-build. See tor-browser#43463. + content/global/moat_countries.json (moat_countries_dev_build.json) ===================================== toolkit/content/moat_countries_dev_build.json ===================================== @@ -0,0 +1,7 @@ +[ + { + "_comment1": "Used for dev build, replaced for release builds in tor-browser-build.", + "_comment2": "List is taken from tpo/anti-censorship/rdsys-admin 810fb24b:conf/circumvention.json and filtered with `jq -c keys`." + }, + "by","cn","eg","hk","ir","mm","ru","tm" +] ===================================== toolkit/modules/Moat.sys.mjs ===================================== @@ -335,20 +335,6 @@ export class MoatRPC { return settings; } - // Request a list of country codes with available censorship circumvention - // settings. - // - // returns an array of ISO 3166-1 alpha-2 country codes which we can query - // settings for. - async circumvention_countries() { - const args = {}; - const { response } = await this.#makeRequest( - "circumvention/countries", - args - ); - return response; - } - // Request a copy of the builtin bridges, takes the following parameters: // - transports: optional, an array of transports we would like the latest // bridge strings for; if empty (or not given) returns all of them ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -255,7 +255,7 @@ export let RemotePageAccessManager = { ], RPMSendQuery: [ "torconnect:get-init-args", - "torconnect:get-country-codes", + "torconnect:get-frequent-regions", ], }, "about:welcome": { ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -817,8 +817,14 @@ export const TorConnect = { }; }, - // list of country codes Moat has settings for - _countryCodes: [], + /** + * Promise that resolves to a list of region codes that Moat has special + * bridge settings for. + * + * @type {Promise<string[]>} + */ + _moatRegionsPromise: null, + _countryNames: Object.freeze( (() => { const codes = Services.intl.getAvailableLocaleDisplayNames("region"); @@ -892,6 +898,18 @@ export const TorConnect = { return; } + this._moatRegionsPromise = fetch( + "chrome://global/content/moat_countries.json" + ) + .then(req => req.json()) + // Filter out the "_comment" object in the moat_countries_dev_build.json + // file. + .then(regionList => regionList.filter(r => typeof r === "string")) + .catch(e => { + lazy.logger.error("Failed to fetch Moat region codes", e); + return []; + }); + let observeTopic = addTopic => { Services.obs.addObserver(this, addTopic); lazy.logger.debug(`Observing topic '${addTopic}'`); @@ -1113,10 +1131,6 @@ export const TorConnect = { return null; }, - get countryCodes() { - return this._countryCodes; - }, - get countryNames() { return this._countryNames; }, @@ -1526,25 +1540,12 @@ export const TorConnect = { this._makeStageRequest(TorConnectStage.ChooseRegion); }, - /* - Further external commands and helper methods + /** + * Get the list of regions that Moat has settings for. + * + * @returns {string[]} - The list of region codes. */ - - async getCountryCodes() { - // Difference with the getter: this is to be called by TorConnectParent, and - // downloads the country codes if they are not already in cache. - if (this._countryCodes.length) { - return this._countryCodes; - } - const mrpc = new lazy.MoatRPC(); - try { - await mrpc.init(); - this._countryCodes = await mrpc.circumvention_countries(); - } catch (err) { - lazy.logger.error("An error occurred while fetching country codes", err); - } finally { - mrpc.uninit(); - } - return this._countryCodes; + async getFrequentRegions() { + return this._moatRegionsPromise ?? []; }, }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8bb1b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8bb1b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 2 commits: fixup! TB 40041 [android]: Implement Tor Network Settings
by Dan Ballard (＠dan) 07 Mar '25

07 Mar '25

Dan Ballard pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 496a888f by clairehurst at 2025-03-07T04:03:11+00:00 fixup! TB 40041 [android]: Implement Tor Network Settings tor-browser#43329 [Android] Remove remaining traces of the old Bootstrap - - - - - 8bb1b960 by clairehurst at 2025-03-07T04:03:11+00:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap tor-browser#43329 [Android] Remove remaining traces of the old Bootstrap # Conflicts: # mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - - - - - 3 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - − mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt - mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -158,8 +158,6 @@ import org.mozilla.fenix.search.toolbar.SearchSelectorMenu import org.mozilla.fenix.tabstray.Page import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.theme.FirefoxTheme -import org.mozilla.fenix.tor.TorBootstrapFragmentDirections -import org.mozilla.fenix.tor.TorBootstrapStatus import org.mozilla.fenix.tor.TorConnectionAssistViewModel import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD import org.mozilla.fenix.utils.allowUndo @@ -262,7 +260,6 @@ class HomeFragment : Fragment(), UserInteractionHandler { private val bottomToolbarContainerIntegration = ViewBoundFeatureWrapper<BottomToolbarContainerIntegration>() private lateinit var savedLoginsLauncher: ActivityResultLauncher<Intent> - private lateinit var torBootstrapStatus: TorBootstrapStatus override fun onCreate(savedInstanceState: Bundle?) { // DO NOT ADD ANYTHING ABOVE THIS getProfilerTime CALL! @@ -295,12 +292,6 @@ class HomeFragment : Fragment(), UserInteractionHandler { val activity = activity as HomeActivity val components = requireComponents - torBootstrapStatus = TorBootstrapStatus( - !BuildConfig.DISABLE_TOR, - components.torController, - ::dispatchModeChanges - ) - val currentWallpaperName = requireContext().settings().currentWallpaperName applyWallpaper( wallpaperName = currentWallpaperName, @@ -1037,7 +1028,6 @@ class HomeFragment : Fragment(), UserInteractionHandler { override fun onStop() { dismissRecommendPrivateBrowsingShortcut() super.onStop() - torBootstrapStatus.unregisterTorListener() } override fun onStart() { @@ -1090,15 +1080,6 @@ class HomeFragment : Fragment(), UserInteractionHandler { } } - private fun dispatchModeChanges(isBootstrapping: Boolean) { - if (isBootstrapping) { - val directions = - TorBootstrapFragmentDirections - .actionStartupTorbootstrap() - findNavController().navigate(directions) - } - } - @VisibleForTesting internal fun removeCollectionWithUndo(tabCollection: TabCollection) { val snackbarMessage = getString(R.string.snackbar_collection_deleted) @@ -1122,7 +1103,6 @@ class HomeFragment : Fragment(), UserInteractionHandler { override fun onResume() { super.onResume() - torBootstrapStatus.registerTorListener() if (browsingModeManager.mode == BrowsingMode.Private) { activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt deleted ===================================== @@ -1,45 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.tor - -@SuppressWarnings("LongParameterList", "TooManyFunctions") -class TorBootstrapStatus( - private val shouldStartTor: Boolean, - private val torController: TorController, - private val dispatchModeChanges: (isShouldBootstrap: Boolean) -> Unit - ) : TorEvents { - - init { - torController.registerTorListener(this) - } - - fun isBootstrapping() = (shouldStartTor && !torController.isBootstrapped) - - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorConnecting() { - } - - override fun onTorConnected() { - dispatchModeChanges(isBootstrapping()) - } - - override fun onTorStopped() { - dispatchModeChanges(isBootstrapping()) - } - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorStatusUpdate(entry: String?, status: String?, progress: Double?) { - } - - fun unregisterTorListener() { - torController.unregisterTorListener(this) - } - - fun registerTorListener() { - torController.registerTorListener(this) - } - -} ===================================== mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -15,12 +15,6 @@ app:popUpTo="@id/startupFragment" app:popUpToInclusive="true" /> - <action - android:id="@+id/action_startup_torbootstrap" - app:destination="@id/torbootstrapFragment" - app:popUpTo="@id/startupFragment" - app:popUpToInclusive="true" /> - <action android:id="@+id/action_startup_tor_connection_assist" app:destination="@+id/torConnectionAssistFragment" @@ -248,25 +242,6 @@ app:popExitAnim="@anim/slide_out_right" /> </fragment> - <fragment - android:id="@+id/torbootstrapFragment" - android:name="org.mozilla.fenix.tor.TorBootstrapFragment" - tools:layout="@layout/fragment_home"> - - <action - android:id="@+id/action_home" - app:destination="@id/homeFragment" - app:popUpTo="@id/torbootstrapFragment" - app:popUpToInclusive="true" /> - <action - android:id="@+id/action_torbootstrapFragment_to_SettingsFragment" - app:destination="@id/settingsFragment" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@anim/slide_in_left" - app:popExitAnim="@anim/slide_out_right" /> - </fragment> - <fragment android:id="@+id/torConnectionAssistFragment" android:name="org.mozilla.fenix.tor.TorConnectionAssistFragment" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e68b04… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e68b04… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41387: Fix Lyrebird for Android with Go 1.23.
by Pier Angelo Vendrame (＠pierov) 06 Mar '25

06 Mar '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 34b8f1ae by Pier Angelo Vendrame at 2025-03-06T16:52:55+01:00 Bug 41387: Fix Lyrebird for Android with Go 1.23. - - - - - 1 changed file: - projects/lyrebird/build Changes: ===================================== projects/lyrebird/build ===================================== @@ -17,7 +17,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %] -go build -mod=vendor -ldflags '-s' ./cmd/lyrebird +go build -mod=vendor -ldflags '-s[% IF c("var/android") %] -checklinkname=0[% END %]' ./cmd/lyrebird cp -a lyrebird[% IF c("var/windows") %].exe[% END %] $distdir cd $distdir View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41383: Add clairehurst to list of accepted firefox/geckoview signers
by morgan (＠morgan) 06 Mar '25

06 Mar '25

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: e2aea614 by Morgan at 2025-03-06T11:29:19+00:00 Bug 41383: Add clairehurst to list of accepted firefox/geckoview signers - - - - - 3 changed files: - + keyring/clairehurst.gpg - projects/firefox/config - projects/geckoview/config Changes: ===================================== keyring/clairehurst.gpg ===================================== Binary files /dev/null and b/keyring/clairehurst.gpg differ ===================================== projects/firefox/config ===================================== @@ -6,6 +6,7 @@ tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git gpg_keyring: - boklm.gpg + - clairehurst.gpg - dan_b.gpg - ma1.gpg - morgan.gpg ===================================== projects/geckoview/config ===================================== @@ -6,6 +6,7 @@ tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git gpg_keyring: - boklm.gpg + - clairehurst.gpg - dan_b.gpg - ma1.gpg - morgan.gpg View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] Bug 41383: Add clairehurst to list of accepted firefox/geckoview signers
by morgan (＠morgan) 06 Mar '25

06 Mar '25

morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: 08b0f096 by Morgan at 2025-03-06T11:28:47+00:00 Bug 41383: Add clairehurst to list of accepted firefox/geckoview signers - - - - - 3 changed files: - + keyring/clairehurst.gpg - projects/firefox/config - projects/geckoview/config Changes: ===================================== keyring/clairehurst.gpg ===================================== Binary files /dev/null and b/keyring/clairehurst.gpg differ ===================================== projects/firefox/config ===================================== @@ -6,6 +6,7 @@ tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git gpg_keyring: - boklm.gpg + - clairehurst.gpg - dan_b.gpg - ma1.gpg - morgan.gpg ===================================== projects/geckoview/config ===================================== @@ -6,6 +6,7 @@ tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git gpg_keyring: - boklm.gpg + - clairehurst.gpg - dan_b.gpg - ma1.gpg - morgan.gpg View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41383: Add clairehurst to list of accepted firefox/geckoview signers
by morgan (＠morgan) 06 Mar '25

06 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d4b60fd3 by Morgan at 2025-03-06T11:20:46+00:00 Bug 41383: Add clairehurst to list of accepted firefox/geckoview signers - - - - - 3 changed files: - + keyring/clairehurst.gpg - projects/firefox/config - projects/geckoview/config Changes: ===================================== keyring/clairehurst.gpg ===================================== Binary files /dev/null and b/keyring/clairehurst.gpg differ ===================================== projects/firefox/config ===================================== @@ -6,6 +6,7 @@ tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git gpg_keyring: - boklm.gpg + - clairehurst.gpg - dan_b.gpg - ma1.gpg - morgan.gpg ===================================== projects/geckoview/config ===================================== @@ -6,6 +6,7 @@ tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git gpg_keyring: - boklm.gpg + - clairehurst.gpg - dan_b.gpg - ma1.gpg - morgan.gpg View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.8.0esr-14.5-1] 3 commits: Bug 1917556 - [marionette] Fix Mn tests with Python 3.12 r=webdriver-reviewers,whimboo
by Pier Angelo Vendrame (＠pierov) 06 Mar '25

06 Mar '25

Pier Angelo Vendrame pushed to branch base-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 9492cb87 by Julian Descottes at 2025-03-06T10:46:29+01:00 Bug 1917556 - [marionette] Fix Mn tests with Python 3.12 r=webdriver-reviewers,whimboo Differential Revision: https://phabricator.services.mozilla.com/D221448 - - - - - 29861015 by Beatriz Rizental at 2025-03-06T10:47:06+01:00 fixup! Base Browser's .mozconfigs. - - - - - 63d64ecc by Beatriz Rizental at 2025-03-06T10:47:15+01:00 BB 43535: Enable tests - - - - - 5 changed files: - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64-dev - mozconfig-macos-dev - testing/marionette/harness/marionette_harness/runner/base.py - testing/specialpowers/api.js Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -16,3 +16,5 @@ ac_add_options --disable-install-strip ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +ac_add_options --enable-tests ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -19,3 +19,5 @@ ac_add_options --disable-base-browser-update # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme + +ac_add_options --enable-tests ===================================== mozconfig-macos-dev ===================================== @@ -19,3 +19,5 @@ ac_add_options --disable-update-agent # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme + +ac_add_options --enable-tests ===================================== testing/marionette/harness/marionette_harness/runner/base.py ===================================== @@ -222,7 +222,7 @@ class MarionetteTestResult(StructuredTestResult, TestResultCollection): self.logger.info("END LOG:") def stopTest(self, *args, **kwargs): - unittest._TextTestResult.stopTest(self, *args, **kwargs) + unittest.TextTestResult.stopTest(self, *args, **kwargs) if self.marionette.check_for_crash(): # this tells unittest.TestSuite not to continue running tests self.shouldStop = True ===================================== testing/specialpowers/api.js ===================================== @@ -40,6 +40,18 @@ this.specialpowers = class extends ExtensionAPI { uri, resProto.ALLOW_CONTENT_ACCESS ); + } else { + // This is a hack! + // For some reason, this specific substituion has an extra `/` in the path. + // This is a workaround to fix it. + // + // TODO (#43545): Remove this once we have a proper fix. + let uri = resProto.getSubstitution("testing-common"); + resProto.setSubstitution( + "testing-common", + Services.io.newURI(uri.spec.replace("file:////", "file:///")), + resProto.ALLOW_CONTENT_ACCESS + ); } SpecialPowersParent.registerActor(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cb0e95… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cb0e95… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.8.0esr-14.5-1] 4 commits: Bug 1917556 - [marionette] Fix Mn tests with Python 3.12 r=webdriver-reviewers,whimboo
by Pier Angelo Vendrame (＠pierov) 06 Mar '25

06 Mar '25

Pier Angelo Vendrame pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 3d30c6e9 by Julian Descottes at 2025-03-06T10:30:48+01:00 Bug 1917556 - [marionette] Fix Mn tests with Python 3.12 r=webdriver-reviewers,whimboo Differential Revision: https://phabricator.services.mozilla.com/D221448 - - - - - a21c94fd by Beatriz Rizental at 2025-03-06T10:30:48+01:00 fixup! Base Browser's .mozconfigs. - - - - - d5d98c87 by Beatriz Rizental at 2025-03-06T10:30:48+01:00 fixup! TB 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - e68b047e by Beatriz Rizental at 2025-03-06T10:30:49+01:00 BB 43535: Enable tests - - - - - 7 changed files: - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64-dev - mozconfig-macos-dev - testing/marionette/harness/marionette_harness/runner/base.py - testing/specialpowers/api.js - tools/torbrowser/Makefile - + tools/torbrowser/prepare-tests.sh Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -18,3 +18,5 @@ ac_add_options --disable-install-strip ac_add_options --with-base-browser-version=dev-build ac_add_options --disable-base-browser-update + +ac_add_options --enable-tests ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -21,3 +21,5 @@ ac_add_options --disable-base-browser-update # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme + +ac_add_options --enable-tests ===================================== mozconfig-macos-dev ===================================== @@ -25,3 +25,5 @@ ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser #copied from the diff between mozconfig-linux-x86_64 and mozconfig-linux-x86_64-dev export MOZ_APP_REMOTINGNAME="Tor Browser Dev" ac_add_options --with-branding=browser/branding/tb-nightly + +ac_add_options --enable-tests ===================================== testing/marionette/harness/marionette_harness/runner/base.py ===================================== @@ -222,7 +222,7 @@ class MarionetteTestResult(StructuredTestResult, TestResultCollection): self.logger.info("END LOG:") def stopTest(self, *args, **kwargs): - unittest._TextTestResult.stopTest(self, *args, **kwargs) + unittest.TextTestResult.stopTest(self, *args, **kwargs) if self.marionette.check_for_crash(): # this tells unittest.TestSuite not to continue running tests self.shouldStop = True ===================================== testing/specialpowers/api.js ===================================== @@ -40,6 +40,18 @@ this.specialpowers = class extends ExtensionAPI { uri, resProto.ALLOW_CONTENT_ACCESS ); + } else { + // This is a hack! + // For some reason, this specific substituion has an extra `/` in the path. + // This is a workaround to fix it. + // + // TODO (#43545): Remove this once we have a proper fix. + let uri = resProto.getSubstitution("testing-common"); + resProto.setSubstitution( + "testing-common", + Services.io.newURI(uri.spec.replace("file:////", "file:///")), + resProto.ALLOW_CONTENT_ACCESS + ); } SpecialPowersParent.registerActor(); ===================================== tools/torbrowser/Makefile ===================================== @@ -53,6 +53,9 @@ build: deploy: ./deploy.sh $(BINARIES) $(BUILD_OUTPUT) +prepare-tests: + ./prepare-tests.sh $(BINARIES) $(BUILD_OUTPUT) + all: build deploy run: ===================================== tools/torbrowser/prepare-tests.sh ===================================== @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +BINARIES="$1" +BUILD_OUTPUT="$2" + +if [ ! -d "$BUILD_OUTPUT" ]; then + echo "Error: $BUILD_OUTPUT directory does not exist." + echo "Make sure to run `mach ./build` or `make -C tools/torbrowser build`." + exit 1 +fi + +if [ ! -d "$BINARIES" ]; then + echo "Error: $BINARIES directory does not exist." + echo "Make sure to run `make -C tools/torbrowser fetch`." + exit 1 +fi + +if [ "$(uname)" = "Darwin" ]; then + cp -r "$BINARIES/Tor Browser.app/Contents/MacOS/Tor" "$BUILD_OUTPUT/dist/firefox/"*.app/Contents/MacOS + cp -r "$BINARIES/Tor Browser.app/Contents/Resources/fonts" "$BUILD_OUTPUT/dist/firefox/"*.app/Contents/Resources +else + cp -r "$BINARIES/dev/Browser/fonts" "$BUILD_OUTPUT/dist/bin" + cp -r "$BINARIES/dev/Browser/TorBrowser" "$BUILD_OUTPUT/dist/bin" +fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/347af8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/347af8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-128.8.0esr-14.5-1-build1
by clairehurst (＠clairehurst) 05 Mar '25

05 Mar '25

clairehurst pushed new tag base-browser-128.8.0esr-14.5-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-128.8.0esr-14.5-1
by clairehurst (＠clairehurst) 05 Mar '25

05 Mar '25

clairehurst pushed new branch mullvad-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0