GitLab

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".

@@ -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

@@ -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

@@ -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();
+       }

@@ -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;
+   }

@@ -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();

henry pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

10 changed files:

Changes:

@@ -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)

 +[
 +    {
 +        "_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"
 +]

@@ -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

@@ -255,7 +255,7 @@ export let RemotePageAccessManager = {
        ],
        RPMSendQuery: [
          "torconnect:get-init-args",
 -        "torconnect:get-country-codes",
 +        "torconnect:get-frequent-regions",
        ],
      },
      "about:welcome": {

@@ -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 ?? [];
    },
  };