Verified Commit fe047aeb authored by Alex Catarineu's avatar Alex Catarineu Committed by Pier Angelo Vendrame
Browse files

Bug 31740: Remove some unnecessary RemoteSettings instances 

More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.

Avoid creating instance for 'anti-tracking-url-decoration'.

If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.

Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.

We also clear the collections database on the v2 -> v3 migration.
parent a7e0c3d5

browser/components/search/SearchSERPTelemetry.sys.mjs

+5 −2
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ class TelemetryHandler { 
   * can be tracked.

   */

  async init() {

    if (this._initialized) {

    // eslint-disable-next-line no-constant-condition

    if (this._initialized || true) {

      return;

    }
@@ -908,7 +909,7 @@ class TelemetryHandler { 
   * @returns {Array | null} Returns an array of provider name and the provider information.

   */

  _getProviderInfoForURL(url) {

    return this._searchProviderInfo.find(info =>

    return this._searchProviderInfo?.find(info =>

      info.searchPageRegexp.test(url)

    );

  }
@@ -2501,6 +2502,8 @@ class DomainToCategoriesMap { 
   * reuse the store if the version in each record matches the store.

   */

  async #setupClientAndStore() {

    return;

    // eslint-disable-next-line no-unreachable

    if (this.#client && !this.empty) {

      return;

    }

docshell/base/nsAboutRedirector.cpp

+2 −0
Original line number Diff line number Diff line
@@ -200,8 +200,10 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

#ifndef BASE_BROWSER_VERSION

    {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",

     nsIAboutModule::ALLOW_SCRIPT},

#endif

#ifdef MOZ_WEBRTC

    {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html",

     nsIAboutModule::ALLOW_SCRIPT},

netwerk/url-classifier/UrlClassifierFeatureBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { 


  nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService =

      do_GetService("@mozilla.org/url-classifier/exception-list-service;1");

  if (NS_WARN_IF(!exceptionListService)) {

  if (!exceptionListService) {

    return;

  }

netwerk/url-classifier/components.conf

+0 −6
Original line number Diff line number Diff line
@@ -13,10 +13,4 @@ Classes = [ 
        'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',

        'headers': ['mozilla/net/ChannelClassifierService.h'],

    },

    {

        'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',

        'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'],

        'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs',

        'constructor': 'UrlClassifierExceptionListService',

    },

]

security/manager/ssl/RemoteSecuritySettings.sys.mjs

+27 −0
Original line number Diff line number Diff line
@@ -251,6 +251,16 @@ export var RemoteSecuritySettings = { 


class IntermediatePreloads {

  constructor() {

    this.maybeInit();

  }



  maybeInit() {

    if (

      this.client ||

      !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true)

    ) {

      return;

    }

    this.client = RemoteSettings("intermediates", {

      bucketName: SECURITY_STATE_BUCKET,

      signerName: SECURITY_STATE_SIGNER,
@@ -276,6 +286,7 @@ class IntermediatePreloads { 
      );

      return;

    }

    this.maybeInit();



    // Download attachments that are awaiting download, up to a max.

    const maxDownloadsPerRun = Services.prefs.getIntPref(
@@ -494,6 +505,16 @@ function compareFilters(filterA, filterB) { 


class CRLiteFilters {

  constructor() {

    this.maybeInit();

  }



  maybeInit() {

    if (

      this.client ||

      !Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true)

    ) {

      return;

    }

    this.client = RemoteSettings("cert-revocations", {

      bucketName: SECURITY_STATE_BUCKET,

      signerName: SECURITY_STATE_SIGNER,
@@ -507,6 +528,10 @@ class CRLiteFilters { 
  }



  async cleanAttachmentCache() {

    if (!this.client) {

      return;

    }



    // Bug 1795710 - misuse of Remote Settings `downloadToDisk` caused us to

    // keep filters and stashes on disk indefinitely. We're no longer caching

    // these downloads, so if there are any filters still in the cache they can
@@ -555,6 +580,8 @@ class CRLiteFilters { 
      return;

    }



    this.maybeInit();



    let hasPriorFilter = await hasPriorData(

      Ci.nsICertStorage.DATA_TYPE_CRLITE_FILTER_FULL

    );