Commit 5658489a authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! BB 42730: Patch RemoteSettings to use only local dumps as a data source 

BB 45185: Make sure the Rust remote settings client stays offline.
parent c9dd0e06

services/settings/Utils.sys.mjs

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ export var Utils = { 
  log,



  get shouldSkipRemoteActivity() {

    if (AppConstants.BASE_BROWSER_VERSION) {

      return true;

    }

    if (

      (lazy.isRunningTests || Cu.isInAutomation) &&

      this.SERVER_URL == "data:,#remote-settings-dummy/v1"

third_party/application-services/components/viaduct/src/lib.rs

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ impl Request { 
    /// Note: newer code is encouraged to construct a `Client` instance and use that to send

    /// requests.

    pub fn send(self) -> Result<Response, ViaductError> {

        Client::default().send_sync(self)

        // tor-browser#44576: Force an error as a defense-in-depth.

        Err(ViaductError::NetworkError("Viaduct requests are disabled.".into()))

    }



    /// Alias for `Request::new(Method::Get, url)`, for convenience.