Verified Commit 50a38a7b authored by henry's avatar henry Committed by ma1
Browse files

fixup! TB 40597: Implement TorSettings module 

TB 43463: Load Moat regions from a local file rather than using Moat.

Also rename getCountryCodes to getFrequentRegions.
parent 7a96cc13

.eslintrc-ignores.js

+1 −0
Original line number Diff line number Diff line
@@ -307,4 +307,5 @@ module.exports = [ 
  "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",

];

.prettierignore

+1 −0
Original line number Diff line number Diff line
@@ -1535,3 +1535,4 @@ 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/content/jar.mn

+5 −0
Original line number Diff line number Diff line
@@ -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)

toolkit/content/moat_countries_dev_build.json

0 → 100644
+7 −0
Original line number Diff line number Diff line 
[

    {

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

]

toolkit/modules/Moat.sys.mjs

+0 −14
Original line number Diff line number Diff line
@@ -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