August 2024 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 42247: Android helpers for the TorProvider
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 431ff1b6 by Pier Angelo Vendrame at 2024-08-28T20:33:14+00:00 fixup! Bug 42247: Android helpers for the TorProvider Bug 42607: Stop shipping GeoIP databases for now. - - - - - 1 changed file: - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java Changes: ===================================== mobile/android/geckoview/src/main/java/org/… [View More]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] Bug 41736: Customize toolbar for mullvad-browser.
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 07162010 by Henry Wilkes at 2024-08-28T20:30:43+00:00 Bug 41736: Customize toolbar for mullvad-browser. - - - - - 1 changed file: - browser/components/customizableui/CustomizableUI.sys.mjs Changes: ===================================== browser/components/customizableui/CustomizableUI.sys.mjs ===================================== @@ -65,6 +65,11 @@ var kVersion = 20; … [View More]var kVersionBaseBrowser = 2; const NoScriptId = "_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action"; +/** + * The current version for mullvad browser. + */ +var kVersionMullvadBrowser = 1; + /** * Buttons removed from built-ins by version they were removed. kVersion must be * bumped any time a new id is added to this. Use the button id as key, and @@ -228,6 +233,7 @@ var CustomizableUIInternal = { this._updateForNewProtonVersion(); this._markObsoleteBuiltinButtonsSeen(); this._updateForBaseBrowser(); + this._updateForMullvadBrowser(); this.registerArea( CustomizableUI.AREA_FIXED_OVERFLOW_PANEL, @@ -264,7 +270,11 @@ var CustomizableUIInternal = { // Base-browser additions tor-browser#41736. If you want to add to, remove // from, or rearrange this list, then bump the kVersionBaseBrowser and // update existing saved states in _updateForBaseBrowser. - "security-level-button", + // Or if the change is only meant for mullvad-browser, bump + // kVersionMullvadBrowser instead and update the existing saved states in + // _updateForMullvadBrowser. + // Do not show the security-level-button by default in Mullvad Browser. + // See mullvad-browser#329 "new-identity-button", "downloads-button", AppConstants.MOZ_DEV_EDITION ? "developer-button" : null, @@ -930,6 +940,44 @@ var CustomizableUIInternal = { } }, + _updateForMullvadBrowser() { + if (!gSavedState) { + // Use the defaults. + return; + } + + const currentVersion = gSavedState.currentVersionMullvadBrowser; + + if (currentVersion < 1) { + // Remove security-level-button if: + // + it hasn't been moved out of the navbar by the user, and + // + the user does not have a custom security level. + // + // NOTE: _updateForBaseBrowser adds this button when + // currentVersionBaseBrowser < 1. This should only happen when + // currentVersionMullvadBrowser < 1, and this method runs after, so should + // reverse it. + const navbarPlacements = + gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + const buttonIndex = navbarPlacements.indexOf("security-level-button"); + // Test if security level icon exists in the navbar. + // Even though a user may have moved the button within the navbar, + // there is no simple way to know whether the button was moved, or if + // other components were moved around it. + if (buttonIndex >= 0) { + // NOTE: We expect the SecurityLevel module to already be initialized. + const { SecurityLevelPrefs } = ChromeUtils.importESModule( + "resource://gre/modules/SecurityLevel.sys.mjs" + ); + if (!SecurityLevelPrefs.securityCustom) { + navbarPlacements.splice(buttonIndex, 1); + } + } + } + } + }, + _placeNewDefaultWidgetsInArea(aArea) { let futurePlacedWidgets = gFuturePlacements.get(aArea); let savedPlacements = @@ -2773,6 +2821,10 @@ var CustomizableUIInternal = { gSavedState.currentVersionBaseBrowser = 0; } + if (!("currentVersionMullvadBrowser" in gSavedState)) { + gSavedState.currentVersionMullvadBrowser = 0; + } + gSeenWidgets = new Set(gSavedState.seen || []); gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []); gNewElementCount = gSavedState.newElementCount || 0; @@ -2856,6 +2908,7 @@ var CustomizableUIInternal = { dirtyAreaCache: gDirtyAreaCache, currentVersion: kVersion, currentVersionBaseBrowser: kVersionBaseBrowser, + currentVersionMullvadBrowser: kVersionMullvadBrowser, newElementCount: gNewElementCount, }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/071… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/071… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: ba8dff6e by Henry Wilkes at 2024-08-28T20:09:34+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42803: Force focus ring to show for built-in bridge radio options. - - - - - 1 changed file: - browser/components/torpreferences/content/builtinBridgeDialog.js Changes: ===================================== browser/… [View More]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 5a5a977a by Pier Angelo Vendrame at 2024-08-28T19:54:12+00:00 fixup! Firefox preference overrides. Bug 42685: Re-enable textmetrics. They do not add entropy (see the issue), so re-enable them for compatibility. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ====… [View More]

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 8fe2c105 by Pier Angelo Vendrame at 2024-08-28T19:52:42+00:00 fixup! Firefox preference overrides. Bug 42685: Re-enable textmetrics. They do not add entropy (see the issue), so re-enable them for compatibility. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===========… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 80c99d24 by Pier Angelo Vendrame at 2024-08-28T18:22:45+02:00 fixup! Firefox preference overrides. Bug 42685: Re-enable textmetrics. They do not add entropy (see the issue), so re-enable them for compatibility. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ============… [View More]

1 0

[Git][tpo/applications/mullvad-browser-update-responses][main] alpha: new version, 14.0a3
by morgan (＠morgan) 28 Aug '24

28 Aug '24

morgan pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 97b2f35d by Morgan at 2024-08-28T18:12:13+00:00 alpha: new version, 14.0a3 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/13.5a8-14.0a2-linux-x86_64-ALL.xml - − update_1/alpha/13.5a8-14.0a2-macos-ALL.xml - − update_1/alpha/13.5a8-14.0a2-windows-x86_64-ALL.xml - − update_1/alpha/13.5a9-14.0a2-linux-x86_64-ALL.xml - − update_1/alpha/13.5a9-14.0a2-macos-ALL.… [View More]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] 2 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 28 Aug '24

28 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a6251e60 by cypherpunks1 at 2024-08-28T17:41:16+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 42730: Revert some changes - - - - - 09069722 by cypherpunks1 at 2024-08-28T17:41:17+02:00 Bug 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - 8 changed files: - browser/components/BrowserGlue.sys.mjs - … [View More]mobile/shared/chrome/geckoview/geckoview.js - services/settings/Attachments.sys.mjs - services/settings/RemoteSettingsClient.sys.mjs - services/settings/dumps/gen_last_modified.py - services/settings/remote-settings.sys.mjs - toolkit/modules/AppConstants.sys.mjs - toolkit/modules/IgnoreLists.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -3368,6 +3368,11 @@ BrowserGlue.prototype = { lazy.RemoteSecuritySettings.init(); }, + function RemoteSettingsPollChanges() { + // Support clients that use the "sync" event or "remote-settings:changes-poll-end". + lazy.RemoteSettings.pollChanges({ trigger: "timer" }); + }, + function BrowserUsageTelemetryReportProfileCount() { lazy.BrowserUsageTelemetry.reportProfileCount(); }, ===================================== mobile/shared/chrome/geckoview/geckoview.js ===================================== @@ -21,6 +21,7 @@ ChromeUtils.defineESModuleGetters(this, { InitializationTracker: "resource://gre/modules/GeckoViewTelemetry.sys.mjs", RemoteSecuritySettings: "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs", + RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs", }); @@ -922,6 +923,10 @@ function startup() { Blocklist.loadBlocklistAsync(); }); + InitLater(() => { + RemoteSettings.pollChanges({ trigger: "timer" }); + }); + // This should always go last, since the idle tasks (except for the ones with // timeouts) should execute in order. Note that this observer notification is // not guaranteed to fire, since the window could close before we get here. ===================================== services/settings/Attachments.sys.mjs ===================================== @@ -223,6 +223,10 @@ export class Downloader { fallbackToDump = false; } + avoidDownload = true; + fallbackToCache = true; + fallbackToDump = true; + const dumpInfo = new LazyRecordAndBuffer(() => this._readAttachmentDump(attachmentId) ); @@ -444,6 +448,8 @@ export class Downloader { attachment: { location, hash, size }, } = record; + return (await this.#fetchAttachment(record)).buffer; + // eslint-disable-next-line no-unreachable const remoteFileUrl = (await this._baseAttachmentsURL()) + location; const { retries = 3, checkHash = true } = options; ===================================== services/settings/RemoteSettingsClient.sys.mjs ===================================== @@ -424,11 +424,19 @@ export class RemoteSettingsClient extends EventEmitter { order = "", // not sorted by default. dumpFallback = true, emptyListFallback = true, - forceSync = false, loadDumpIfNewer = true, - syncIfEmpty = true, } = options; - let { verifySignature = false } = options; + + const hasLocalDump = await lazy.Utils.hasLocalDump( + this.bucketName, + this.collectionName + ); + if (!hasLocalDump) { + return []; + } + const forceSync = false; + const syncIfEmpty = true; + let verifySignature = false; const hasParallelCall = !!this._importingPromise; let data; @@ -598,6 +606,10 @@ export class RemoteSettingsClient extends EventEmitter { * @param {Object} options See #maybeSync() options. */ async sync(options) { + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + if (lazy.Utils.shouldSkipRemoteActivityDueToTests) { return; } @@ -664,7 +676,7 @@ export class RemoteSettingsClient extends EventEmitter { let thrownError = null; try { // If network is offline, we can't synchronize. - if (lazy.Utils.isOffline) { + if (!AppConstants.BASE_BROWSER_VERSION && lazy.Utils.isOffline) { throw new RemoteSettingsClient.NetworkOfflineError(); } @@ -1046,14 +1058,8 @@ export class RemoteSettingsClient extends EventEmitter { options = {} ) { const { retry = false } = options; - const since = retry || !localTimestamp ? undefined : `"${localTimestamp}"`; - // Fetch collection metadata and list of changes from server. - lazy.console.debug( - `${this.identifier} Fetch changes from server (expected=${expectedTimestamp}, since=${since})` - ); - const { metadata, remoteTimestamp, remoteRecords } = - await this._fetchChangeset(expectedTimestamp, since); + let metadata, remoteTimestamp; // We build a sync result, based on remote changes. const syncResult = { @@ -1062,24 +1068,20 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; - // If data wasn't changed, return empty sync result. - // This can happen when we update the signature but not the data. - lazy.console.debug( - `${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}` - ); - if (localTimestamp && remoteTimestamp < localTimestamp) { + + try { + await this._importJSONDump(); + } catch (e) { return syncResult; } - await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { - clear: retry, - }); - // Read the new local data, after updating. const newLocal = await this.db.list(); const newRecords = newLocal.map(r => this._cleanLocalFields(r)); // And verify the signature on what is now stored. - if (this.verifySignature) { + if (metadata === undefined) { + // When working only with dumps, we do not have signatures. + } else if (this.verifySignature) { try { await this._validateCollectionSignature( newRecords, ===================================== services/settings/dumps/gen_last_modified.py ===================================== @@ -63,8 +63,10 @@ def main(output): dumps_locations = [] if buildconfig.substs["MOZ_BUILD_APP"] == "browser": dumps_locations += ["services/settings/dumps/"] + dumps_locations += ["services/settings/static-dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/android": dumps_locations += ["services/settings/dumps/"] + dumps_locations += ["services/settings/static-dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/ios": dumps_locations += ["services/settings/dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "comm/mail": ===================================== services/settings/remote-settings.sys.mjs ===================================== @@ -91,6 +91,7 @@ export async function jexlFilterFunc(entry, environment) { function remoteSettingsFunction() { const _clients = new Map(); let _invalidatePolling = false; + let _initialized = false; // If not explicitly specified, use the default signer. const defaultOptions = { @@ -194,21 +195,49 @@ function remoteSettingsFunction() { trigger = "manual", full = false, } = {}) => { + if (AppConstants.BASE_BROWSER_VERSION) { + // Called multiple times on GeckoView due to bug 1730026 + if (_initialized) { + return; + } + _initialized = true; + let importedFromDump = false; + for (const client of _clients.values()) { + const hasLocalDump = await lazy.Utils.hasLocalDump( + client.bucketName, + client.collectionName + ); + if (hasLocalDump) { + const lastModified = await client.getLastModified(); + const lastModifiedDump = await lazy.Utils.getLocalDumpLastModified( + client.bucketName, + client.collectionName + ); + if (lastModified < lastModifiedDump) { + await client.maybeSync(lastModifiedDump, { + loadDump: true, + trigger, + }); + importedFromDump = true; + } + } + } + if (importedFromDump) { + Services.obs.notifyObservers(null, "remote-settings:changes-poll-end"); + } + return; + } + if (lazy.Utils.shouldSkipRemoteActivityDueToTests) { return; } // When running in full mode, we ignore last polling status. - if (full || AppConstants.BASE_BROWSER_VERSION) { + if (full) { lazy.gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF); lazy.gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE); lazy.gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG); } - if (AppConstants.BASE_BROWSER_VERSION) { - // tor-browser#41704: pollChanges is always online, so do not allow it. - return; - } - let pollTelemetryArgs = { source: TELEMETRY_SOURCE_POLL, trigger, ===================================== toolkit/modules/AppConstants.sys.mjs ===================================== @@ -423,11 +423,11 @@ export var AppConstants = Object.freeze({ #ifdef MOZ_THUNDERBIRD "https://thunderbird-settings.thunderbird.net/v1", #else - "https://firefox.settings.services.mozilla.com/v1", + "", #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: -#ifdef MOZ_THUNDERBIRD +#if defined(MOZ_THUNDERBIRD) || defined(BASE_BROWSER_VERSION) false, #else true, ===================================== toolkit/modules/IgnoreLists.sys.mjs ===================================== @@ -5,16 +5,18 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.sys.mjs", }); -class IgnoreListsManager { - _ignoreListSettings = null; +const SETTINGS_IGNORELIST_KEY = "hijack-blocklists"; +class IgnoreListsManager { async init() { - // TODO: Restore the initialization, once we use only the local dumps for - // the remote settings. + if (!this._ignoreListSettings) { + this._ignoreListSettings = lazy.RemoteSettings(SETTINGS_IGNORELIST_KEY); + } } async getAndSubscribe(listener) { @@ -24,7 +26,7 @@ class IgnoreListsManager { const settings = await this._getIgnoreList(); // Listen for future updates after we first get the values. - this._ignoreListSettings?.on("sync", listener); + this._ignoreListSettings.on("sync", listener); return settings; } @@ -65,14 +67,6 @@ class IgnoreListsManager { * could be obtained. */ async _getIgnoreListSettings(firstTime = true) { - if (!this._ignoreListSettings) { - const dump = await fetch( - "resource:///defaults/settings/main/hijack-blocklists.json" - ); - const { data } = await dump.json(); - return data; - } - let result = []; try { result = await this._ignoreListSettings.get({ View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/71… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/71… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] 2 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 28 Aug '24

28 Aug '24

Pier Angelo Vendrame pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 4281e5b9 by cypherpunks1 at 2024-08-28T17:40:16+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 42730: Revert some changes - - - - - 0f01ba03 by cypherpunks1 at 2024-08-28T17:40:20+02:00 Bug 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - 8 changed files: - browser/components/BrowserGlue.sys.mjs - mobile/… [View More]shared/chrome/geckoview/geckoview.js - services/settings/Attachments.sys.mjs - services/settings/RemoteSettingsClient.sys.mjs - services/settings/dumps/gen_last_modified.py - services/settings/remote-settings.sys.mjs - toolkit/modules/AppConstants.sys.mjs - toolkit/modules/IgnoreLists.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -3387,6 +3387,11 @@ BrowserGlue.prototype = { lazy.RemoteSecuritySettings.init(); }, + function RemoteSettingsPollChanges() { + // Support clients that use the "sync" event or "remote-settings:changes-poll-end". + lazy.RemoteSettings.pollChanges({ trigger: "timer" }); + }, + function BrowserUsageTelemetryReportProfileCount() { lazy.BrowserUsageTelemetry.reportProfileCount(); }, ===================================== mobile/shared/chrome/geckoview/geckoview.js ===================================== @@ -21,6 +21,7 @@ ChromeUtils.defineESModuleGetters(this, { InitializationTracker: "resource://gre/modules/GeckoViewTelemetry.sys.mjs", RemoteSecuritySettings: "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs", + RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs", }); @@ -922,6 +923,10 @@ function startup() { Blocklist.loadBlocklistAsync(); }); + InitLater(() => { + RemoteSettings.pollChanges({ trigger: "timer" }); + }); + // This should always go last, since the idle tasks (except for the ones with // timeouts) should execute in order. Note that this observer notification is // not guaranteed to fire, since the window could close before we get here. ===================================== services/settings/Attachments.sys.mjs ===================================== @@ -223,6 +223,10 @@ export class Downloader { fallbackToDump = false; } + avoidDownload = true; + fallbackToCache = true; + fallbackToDump = true; + const dumpInfo = new LazyRecordAndBuffer(() => this._readAttachmentDump(attachmentId) ); @@ -444,6 +448,8 @@ export class Downloader { attachment: { location, hash, size }, } = record; + return (await this.#fetchAttachment(record)).buffer; + // eslint-disable-next-line no-unreachable const remoteFileUrl = (await this._baseAttachmentsURL()) + location; const { retries = 3, checkHash = true } = options; ===================================== services/settings/RemoteSettingsClient.sys.mjs ===================================== @@ -424,11 +424,19 @@ export class RemoteSettingsClient extends EventEmitter { order = "", // not sorted by default. dumpFallback = true, emptyListFallback = true, - forceSync = false, loadDumpIfNewer = true, - syncIfEmpty = true, } = options; - let { verifySignature = false } = options; + + const hasLocalDump = await lazy.Utils.hasLocalDump( + this.bucketName, + this.collectionName + ); + if (!hasLocalDump) { + return []; + } + const forceSync = false; + const syncIfEmpty = true; + let verifySignature = false; const hasParallelCall = !!this._importingPromise; let data; @@ -598,6 +606,10 @@ export class RemoteSettingsClient extends EventEmitter { * @param {Object} options See #maybeSync() options. */ async sync(options) { + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + if (lazy.Utils.shouldSkipRemoteActivityDueToTests) { return; } @@ -664,7 +676,7 @@ export class RemoteSettingsClient extends EventEmitter { let thrownError = null; try { // If network is offline, we can't synchronize. - if (lazy.Utils.isOffline) { + if (!AppConstants.BASE_BROWSER_VERSION && lazy.Utils.isOffline) { throw new RemoteSettingsClient.NetworkOfflineError(); } @@ -1046,14 +1058,8 @@ export class RemoteSettingsClient extends EventEmitter { options = {} ) { const { retry = false } = options; - const since = retry || !localTimestamp ? undefined : `"${localTimestamp}"`; - // Fetch collection metadata and list of changes from server. - lazy.console.debug( - `${this.identifier} Fetch changes from server (expected=${expectedTimestamp}, since=${since})` - ); - const { metadata, remoteTimestamp, remoteRecords } = - await this._fetchChangeset(expectedTimestamp, since); + let metadata, remoteTimestamp; // We build a sync result, based on remote changes. const syncResult = { @@ -1062,24 +1068,20 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; - // If data wasn't changed, return empty sync result. - // This can happen when we update the signature but not the data. - lazy.console.debug( - `${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}` - ); - if (localTimestamp && remoteTimestamp < localTimestamp) { + + try { + await this._importJSONDump(); + } catch (e) { return syncResult; } - await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { - clear: retry, - }); - // Read the new local data, after updating. const newLocal = await this.db.list(); const newRecords = newLocal.map(r => this._cleanLocalFields(r)); // And verify the signature on what is now stored. - if (this.verifySignature) { + if (metadata === undefined) { + // When working only with dumps, we do not have signatures. + } else if (this.verifySignature) { try { await this._validateCollectionSignature( newRecords, ===================================== services/settings/dumps/gen_last_modified.py ===================================== @@ -63,8 +63,10 @@ def main(output): dumps_locations = [] if buildconfig.substs["MOZ_BUILD_APP"] == "browser": dumps_locations += ["services/settings/dumps/"] + dumps_locations += ["services/settings/static-dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/android": dumps_locations += ["services/settings/dumps/"] + dumps_locations += ["services/settings/static-dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/ios": dumps_locations += ["services/settings/dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "comm/mail": ===================================== services/settings/remote-settings.sys.mjs ===================================== @@ -91,6 +91,7 @@ export async function jexlFilterFunc(entry, environment) { function remoteSettingsFunction() { const _clients = new Map(); let _invalidatePolling = false; + let _initialized = false; // If not explicitly specified, use the default signer. const defaultOptions = { @@ -194,21 +195,49 @@ function remoteSettingsFunction() { trigger = "manual", full = false, } = {}) => { + if (AppConstants.BASE_BROWSER_VERSION) { + // Called multiple times on GeckoView due to bug 1730026 + if (_initialized) { + return; + } + _initialized = true; + let importedFromDump = false; + for (const client of _clients.values()) { + const hasLocalDump = await lazy.Utils.hasLocalDump( + client.bucketName, + client.collectionName + ); + if (hasLocalDump) { + const lastModified = await client.getLastModified(); + const lastModifiedDump = await lazy.Utils.getLocalDumpLastModified( + client.bucketName, + client.collectionName + ); + if (lastModified < lastModifiedDump) { + await client.maybeSync(lastModifiedDump, { + loadDump: true, + trigger, + }); + importedFromDump = true; + } + } + } + if (importedFromDump) { + Services.obs.notifyObservers(null, "remote-settings:changes-poll-end"); + } + return; + } + if (lazy.Utils.shouldSkipRemoteActivityDueToTests) { return; } // When running in full mode, we ignore last polling status. - if (full || AppConstants.BASE_BROWSER_VERSION) { + if (full) { lazy.gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF); lazy.gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE); lazy.gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG); } - if (AppConstants.BASE_BROWSER_VERSION) { - // tor-browser#41704: pollChanges is always online, so do not allow it. - return; - } - let pollTelemetryArgs = { source: TELEMETRY_SOURCE_POLL, trigger, ===================================== toolkit/modules/AppConstants.sys.mjs ===================================== @@ -423,11 +423,11 @@ export var AppConstants = Object.freeze({ #ifdef MOZ_THUNDERBIRD "https://thunderbird-settings.thunderbird.net/v1", #else - "https://firefox.settings.services.mozilla.com/v1", + "", #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: -#ifdef MOZ_THUNDERBIRD +#if defined(MOZ_THUNDERBIRD) || defined(BASE_BROWSER_VERSION) false, #else true, ===================================== toolkit/modules/IgnoreLists.sys.mjs ===================================== @@ -5,16 +5,18 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.sys.mjs", }); -class IgnoreListsManager { - _ignoreListSettings = null; +const SETTINGS_IGNORELIST_KEY = "hijack-blocklists"; +class IgnoreListsManager { async init() { - // TODO: Restore the initialization, once we use only the local dumps for - // the remote settings. + if (!this._ignoreListSettings) { + this._ignoreListSettings = lazy.RemoteSettings(SETTINGS_IGNORELIST_KEY); + } } async getAndSubscribe(listener) { @@ -24,7 +26,7 @@ class IgnoreListsManager { const settings = await this._getIgnoreList(); // Listen for future updates after we first get the values. - this._ignoreListSettings?.on("sync", listener); + this._ignoreListSettings.on("sync", listener); return settings; } @@ -65,14 +67,6 @@ class IgnoreListsManager { * could be obtained. */ async _getIgnoreListSettings(firstTime = true) { - if (!this._ignoreListSettings) { - const dump = await fetch( - "resource:///defaults/settings/main/hijack-blocklists.json" - ); - const { data } = await dump.json(); - return data; - } - let result = []; try { result = await this._ignoreListSettings.get({ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec9235… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ec9235… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 28 Aug '24

28 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 196b0053 by cypherpunks1 at 2024-08-28T05:34:49-08:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 42730: Revert some changes - - - - - 902c51f9 by cypherpunks1 at 2024-08-28T06:27:27-08:00 Bug 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - 8 changed files: - browser/components/BrowserGlue.sys.mjs - mobile/… [View More]shared/chrome/geckoview/geckoview.js - services/settings/Attachments.sys.mjs - services/settings/RemoteSettingsClient.sys.mjs - services/settings/dumps/gen_last_modified.py - services/settings/remote-settings.sys.mjs - toolkit/modules/AppConstants.sys.mjs - toolkit/modules/IgnoreLists.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -3497,6 +3497,11 @@ BrowserGlue.prototype = { lazy.RemoteSecuritySettings.init(); }, + function RemoteSettingsPollChanges() { + // Support clients that use the "sync" event or "remote-settings:changes-poll-end". + lazy.RemoteSettings.pollChanges({ trigger: "timer" }); + }, + function BrowserUsageTelemetryReportProfileCount() { lazy.BrowserUsageTelemetry.reportProfileCount(); }, ===================================== mobile/shared/chrome/geckoview/geckoview.js ===================================== @@ -21,6 +21,7 @@ ChromeUtils.defineESModuleGetters(this, { InitializationTracker: "resource://gre/modules/GeckoViewTelemetry.sys.mjs", RemoteSecuritySettings: "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs", + RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs", }); @@ -922,6 +923,10 @@ function startup() { Blocklist.loadBlocklistAsync(); }); + InitLater(() => { + RemoteSettings.pollChanges({ trigger: "timer" }); + }); + // This should always go last, since the idle tasks (except for the ones with // timeouts) should execute in order. Note that this observer notification is // not guaranteed to fire, since the window could close before we get here. ===================================== services/settings/Attachments.sys.mjs ===================================== @@ -223,6 +223,10 @@ export class Downloader { fallbackToDump = false; } + avoidDownload = true; + fallbackToCache = true; + fallbackToDump = true; + const dumpInfo = new LazyRecordAndBuffer(() => this._readAttachmentDump(attachmentId) ); @@ -444,6 +448,8 @@ export class Downloader { attachment: { location, hash, size }, } = record; + return (await this.#fetchAttachment(record)).buffer; + // eslint-disable-next-line no-unreachable const remoteFileUrl = (await this._baseAttachmentsURL()) + location; const { retries = 3, checkHash = true } = options; ===================================== services/settings/RemoteSettingsClient.sys.mjs ===================================== @@ -424,11 +424,19 @@ export class RemoteSettingsClient extends EventEmitter { order = "", // not sorted by default. dumpFallback = true, emptyListFallback = true, - forceSync = false, loadDumpIfNewer = true, - syncIfEmpty = true, } = options; - let { verifySignature = false } = options; + + const hasLocalDump = await lazy.Utils.hasLocalDump( + this.bucketName, + this.collectionName + ); + if (!hasLocalDump) { + return []; + } + const forceSync = false; + const syncIfEmpty = true; + let verifySignature = false; const hasParallelCall = !!this._importingPromise; let data; @@ -598,6 +606,10 @@ export class RemoteSettingsClient extends EventEmitter { * @param {Object} options See #maybeSync() options. */ async sync(options) { + if (AppConstants.BASE_BROWSER_VERSION) { + return; + } + if (lazy.Utils.shouldSkipRemoteActivityDueToTests) { return; } @@ -664,7 +676,7 @@ export class RemoteSettingsClient extends EventEmitter { let thrownError = null; try { // If network is offline, we can't synchronize. - if (lazy.Utils.isOffline) { + if (!AppConstants.BASE_BROWSER_VERSION && lazy.Utils.isOffline) { throw new RemoteSettingsClient.NetworkOfflineError(); } @@ -1046,14 +1058,8 @@ export class RemoteSettingsClient extends EventEmitter { options = {} ) { const { retry = false } = options; - const since = retry || !localTimestamp ? undefined : `"${localTimestamp}"`; - // Fetch collection metadata and list of changes from server. - lazy.console.debug( - `${this.identifier} Fetch changes from server (expected=${expectedTimestamp}, since=${since})` - ); - const { metadata, remoteTimestamp, remoteRecords } = - await this._fetchChangeset(expectedTimestamp, since); + let metadata, remoteTimestamp; // We build a sync result, based on remote changes. const syncResult = { @@ -1062,24 +1068,20 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; - // If data wasn't changed, return empty sync result. - // This can happen when we update the signature but not the data. - lazy.console.debug( - `${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}` - ); - if (localTimestamp && remoteTimestamp < localTimestamp) { + + try { + await this._importJSONDump(); + } catch (e) { return syncResult; } - await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { - clear: retry, - }); - // Read the new local data, after updating. const newLocal = await this.db.list(); const newRecords = newLocal.map(r => this._cleanLocalFields(r)); // And verify the signature on what is now stored. - if (this.verifySignature) { + if (metadata === undefined) { + // When working only with dumps, we do not have signatures. + } else if (this.verifySignature) { try { await this._validateCollectionSignature( newRecords, ===================================== services/settings/dumps/gen_last_modified.py ===================================== @@ -63,8 +63,10 @@ def main(output): dumps_locations = [] if buildconfig.substs["MOZ_BUILD_APP"] == "browser": dumps_locations += ["services/settings/dumps/"] + dumps_locations += ["services/settings/static-dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/android": dumps_locations += ["services/settings/dumps/"] + dumps_locations += ["services/settings/static-dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "mobile/ios": dumps_locations += ["services/settings/dumps/"] elif buildconfig.substs["MOZ_BUILD_APP"] == "comm/mail": ===================================== services/settings/remote-settings.sys.mjs ===================================== @@ -91,6 +91,7 @@ export async function jexlFilterFunc(entry, environment) { function remoteSettingsFunction() { const _clients = new Map(); let _invalidatePolling = false; + let _initialized = false; // If not explicitly specified, use the default signer. const defaultOptions = { @@ -194,21 +195,49 @@ function remoteSettingsFunction() { trigger = "manual", full = false, } = {}) => { + if (AppConstants.BASE_BROWSER_VERSION) { + // Called multiple times on GeckoView due to bug 1730026 + if (_initialized) { + return; + } + _initialized = true; + let importedFromDump = false; + for (const client of _clients.values()) { + const hasLocalDump = await lazy.Utils.hasLocalDump( + client.bucketName, + client.collectionName + ); + if (hasLocalDump) { + const lastModified = await client.getLastModified(); + const lastModifiedDump = await lazy.Utils.getLocalDumpLastModified( + client.bucketName, + client.collectionName + ); + if (lastModified < lastModifiedDump) { + await client.maybeSync(lastModifiedDump, { + loadDump: true, + trigger, + }); + importedFromDump = true; + } + } + } + if (importedFromDump) { + Services.obs.notifyObservers(null, "remote-settings:changes-poll-end"); + } + return; + } + if (lazy.Utils.shouldSkipRemoteActivityDueToTests) { return; } // When running in full mode, we ignore last polling status. - if (full || AppConstants.BASE_BROWSER_VERSION) { + if (full) { lazy.gPrefs.clearUserPref(PREF_SETTINGS_SERVER_BACKOFF); lazy.gPrefs.clearUserPref(PREF_SETTINGS_LAST_UPDATE); lazy.gPrefs.clearUserPref(PREF_SETTINGS_LAST_ETAG); } - if (AppConstants.BASE_BROWSER_VERSION) { - // tor-browser#41704: pollChanges is always online, so do not allow it. - return; - } - let pollTelemetryArgs = { source: TELEMETRY_SOURCE_POLL, trigger, ===================================== toolkit/modules/AppConstants.sys.mjs ===================================== @@ -423,11 +423,11 @@ export var AppConstants = Object.freeze({ #ifdef MOZ_THUNDERBIRD "https://thunderbird-settings.thunderbird.net/v1", #else - "https://firefox.settings.services.mozilla.com/v1", + "", #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: -#ifdef MOZ_THUNDERBIRD +#if defined(MOZ_THUNDERBIRD) || defined(BASE_BROWSER_VERSION) false, #else true, ===================================== toolkit/modules/IgnoreLists.sys.mjs ===================================== @@ -5,16 +5,18 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { + RemoteSettings: "resource://services-settings/remote-settings.sys.mjs", RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.sys.mjs", }); -class IgnoreListsManager { - _ignoreListSettings = null; +const SETTINGS_IGNORELIST_KEY = "hijack-blocklists"; +class IgnoreListsManager { async init() { - // TODO: Restore the initialization, once we use only the local dumps for - // the remote settings. + if (!this._ignoreListSettings) { + this._ignoreListSettings = lazy.RemoteSettings(SETTINGS_IGNORELIST_KEY); + } } async getAndSubscribe(listener) { @@ -24,7 +26,7 @@ class IgnoreListsManager { const settings = await this._getIgnoreList(); // Listen for future updates after we first get the values. - this._ignoreListSettings?.on("sync", listener); + this._ignoreListSettings.on("sync", listener); return settings; } @@ -65,14 +67,6 @@ class IgnoreListsManager { * could be obtained. */ async _getIgnoreListSettings(firstTime = true) { - if (!this._ignoreListSettings) { - const dump = await fetch( - "resource:///defaults/settings/main/hijack-blocklists.json" - ); - const { data } = await dump.json(); - return data; - } - let result = []; try { result = await this._ignoreListSettings.get({ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3a0765… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3a0765… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0