Commit 23b9aa5b authored by henry's avatar henry
Browse files

fixup! Bug 40597: Implement TorSettings module 

Bug 42489: Listen for notifications from Lox module.

Also, do not save the bridge_strings to the preferences if they come
from the Lox module.

In DomainFrontedRequests distinguish between reachability errors,
response errors and other errors in DomainFrontedRequest to improve Lox
error messaging.
parent 40ca47e1

toolkit/modules/DomainFrontedRequests.sys.mjs

+28 −4
Changes for toolkit/modules/DomainFrontedRequests.sys.mjs: 28 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -347,6 +347,31 @@ class MeekTransportAndroid { 
  }

}



/**

 * Corresponds to a Network error with the request.

 */

export class DomainFrontRequestNetworkError extends Error {

  constructor(request, statusCode) {

    super(`Error fetching ${request.name}: ${statusCode}`);

    this.name = "DomainFrontRequestNetworkError";

    this.statusCode = statusCode;

  }

}



/**

 * Corresponds to a non-ok response from the server.

 */

export class DomainFrontRequestResponseError extends Error {

  constructor(request) {

    super(

      `Error response from ${request.name} server: ${request.responseStatus}`

    );

    this.name = "DomainFrontRequestResponseError";

    this.status = request.responseStatus;

    this.statusText = request.responseStatusText;

  }

}



/**

 * Callback object to promisify the XPCOM request.

 */
@@ -379,12 +404,11 @@ class ResponseListener { 
  onStopRequest(request, status) {

    try {

      if (!Components.isSuccessCode(status)) {

        const errorMessage =

          lazy.TorLauncherUtil.getLocalizedStringForError(status);

        this.#reject(new Error(errorMessage));

        // Assume this is a network error.

        this.#reject(new DomainFrontRequestNetworkError(request, status));

      }

      if (request.responseStatus !== 200) {

        this.#reject(new Error(request.responseStatusText));

        this.#reject(new DomainFrontRequestResponseError(request));

      }

    } catch (err) {

      this.#reject(err);

toolkit/modules/TorSettings.sys.mjs

+58 −15
Changes for toolkit/modules/TorSettings.sys.mjs: 58 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ const lazy = {}; 
ChromeUtils.defineESModuleGetters(lazy, {

  TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs",

  Lox: "resource://gre/modules/Lox.sys.mjs",

  LoxTopics: "resource://gre/modules/Lox.sys.mjs",

  TorParsers: "resource://gre/modules/TorParsers.sys.mjs",

  TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",

});
@@ -330,7 +331,17 @@ class TorSettingsImpl { 
          if (!val) {

            return;

          }

          this.bridges.bridge_strings = lazy.Lox.getBridges(val);

          let bridgeStrings;

          try {

            bridgeStrings = lazy.Lox.getBridges(val);

          } catch (error) {

            addError(`No bridges for lox_id ${val}: ${error?.message}`);

            // Set as invalid, which will make the builtin_type "" and set the

            // bridge_strings to be empty at the next #cleanupSettings.

            this.bridges.source = TorBridgeSource.Invalid;

            return;

          }

          this.bridges.bridge_strings = bridgeStrings;

        },

      },

    });
@@ -692,7 +703,7 @@ class TorSettingsImpl { 
    try {

      await lazy.Lox.init();

    } catch (e) {

      lazy.logger.error("Could not initialize Lox.", e.type);

      lazy.logger.error("Could not initialize Lox.", e);

    }



    if (
@@ -711,6 +722,8 @@ class TorSettingsImpl { 
      }

    }



    Services.obs.addObserver(this, lazy.LoxTopics.UpdateBridges);



    lazy.logger.info("Ready");

  }
@@ -718,9 +731,28 @@ class TorSettingsImpl { 
   * Unload or uninit our settings.

   */

  async uninit() {

    Services.obs.removeObserver(this, lazy.LoxTopics.UpdateBridges);

    await lazy.Lox.uninit();

  }



  observe(subject, topic, data) {

    switch (topic) {

      case lazy.LoxTopics.UpdateBridges:

        if (this.bridges.lox_id) {

          // Fetch the newest bridges.

          this.bridges.bridge_strings = lazy.Lox.getBridges(

            this.bridges.lox_id

          );

          // No need to save to prefs since bridge_strings is not stored for Lox

          // source. But we do pass on the changes to TorProvider.

          // FIXME: This can compete with TorConnect to reach TorProvider.

          // tor-browser#42316

          this.applySettings();

        }

        break;

    }

  }



  /**

   * Check whether the object has been successfully initialized, and throw if

   * it has not.
@@ -763,24 +795,32 @@ class TorSettingsImpl { 
      TorSettingsPrefs.bridges.source,

      TorBridgeSource.Invalid

    );

    this.bridges.lox_id = Services.prefs.getStringPref(

      TorSettingsPrefs.bridges.lox_id,

      ""

    switch (this.bridges.source) {

      case TorBridgeSource.BridgeDB:

      case TorBridgeSource.UserProvided:

        this.bridges.bridge_strings = Services.prefs

          .getBranch(TorSettingsPrefs.bridges.bridge_strings)

          .getChildList("")

          .map(pref =>

            Services.prefs.getStringPref(

              `${TorSettingsPrefs.bridges.bridge_strings}${pref}`

            )

          );

    if (this.bridges.source == TorBridgeSource.BuiltIn) {

        break;

      case TorBridgeSource.BuiltIn:

        // bridge_strings is set via builtin_type.

        this.bridges.builtin_type = Services.prefs.getStringPref(

          TorSettingsPrefs.bridges.builtin_type,

          ""

        );

    } else {

      const bridgeBranchPrefs = Services.prefs

        .getBranch(TorSettingsPrefs.bridges.bridge_strings)

        .getChildList("");

      this.bridges.bridge_strings = Array.from(bridgeBranchPrefs, pref =>

        Services.prefs.getStringPref(

          `${TorSettingsPrefs.bridges.bridge_strings}${pref}`

        )

        break;

      case TorBridgeSource.Lox:

        // bridge_strings is set via lox id.

        this.bridges.lox_id = Services.prefs.getStringPref(

          TorSettingsPrefs.bridges.lox_id,

          ""

        );

        break;

    }

    /* Proxy */

    this.proxy.enabled = Services.prefs.getBoolPref(
@@ -866,7 +906,10 @@ class TorSettingsImpl { 
      );

    });

    // write new ones

    if (this.bridges.source !== TorBridgeSource.BuiltIn) {

    if (

      this.bridges.source !== TorBridgeSource.Lox &&

      this.bridges.source !== TorBridgeSource.BuiltIn

    ) {

      this.bridges.bridge_strings.forEach((string, index) => {

        Services.prefs.setStringPref(

          `${TorSettingsPrefs.bridges.bridge_strings}.${index}`,