Verified Commit d99ded11 authored by brizental's avatar brizental Committed by Pier Angelo Vendrame
Browse files

fixup! Bug 40597: Implement TorSettings module

parent ab9dfad8

.eslintignore

+1 −0
Original line number Diff line number Diff line
@@ -303,3 +303,4 @@ dom/base/test/jsmodules/import_circular_1.mjs 
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

.prettierignore

+1 −0
Original line number Diff line number Diff line
@@ -1532,3 +1532,4 @@ xpcom/idl-parser/xpidl/fixtures/xpctest.d.json 
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/modules/DomainFrontedRequests.sys.mjs

+9 −4
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


const lazy = {};



const log = console.createInstance({

  maxLogLevel: "Warn",

  prefix: "DomainFrontendRequests",

});



ChromeUtils.defineESModuleGetters(lazy, {

  EventDispatcher: "resource://gre/modules/Messaging.sys.mjs",

  Subprocess: "resource://gre/modules/Subprocess.sys.mjs",
@@ -145,7 +150,7 @@ class MeekTransport { 
        while (this.#meekClientProcess) {

          const errString = await this.#meekClientProcess.stderr.readString();

          if (errString) {

            console.log(`MeekTransport: stderr => ${errString}`);

            log.error(`MeekTransport: stderr => ${errString}`);

          }

        }

      };
@@ -254,7 +259,7 @@ class MeekTransport { 
      }



      // register callback to cleanup on process exit

      this.#meekClientProcess.wait().then(exitObj => {

      this.#meekClientProcess.wait().then(() => {

        this.#meekClientProcess = null;

        this.uninit();

      });
@@ -398,7 +403,7 @@ class ResponseListener { 
  }



  // noop

  onStartRequest(request) {}

  onStartRequest() {}



  // resolve or reject our Promise

  onStopRequest(request, status) {
@@ -506,7 +511,7 @@ export class DomainFrontRequestBuilder { 
    // remove all headers except for 'Host"

    const headers = [];

    ch.visitRequestHeaders({

      visitHeader: (key, val) => {

      visitHeader: key => {

        if (key !== "Host") {

          headers.push(key);

        }

toolkit/modules/Moat.sys.mjs

+9 −4
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


const lazy = {};



const log = console.createInstance({

  maxLogLevel: "Warn",

  prefix: "Moat",

});



ChromeUtils.defineESModuleGetters(lazy, {

  DomainFrontRequestBuilder:

    "resource://gre/modules/DomainFrontedRequests.sys.mjs",
@@ -36,7 +41,7 @@ class InternetTestResponseListener { 
    return this.#promise;

  }



  onStartRequest(request) {}

  onStartRequest() {}



  // resolve or reject our Promise

  onStopRequest(request, status) {
@@ -62,7 +67,7 @@ class InternetTestResponseListener { 
    }

  }



  onDataAvailable(request, stream, offset, length) {

  onDataAvailable() {

    // We do not care of the actual data, as long as we have a successful

    // connection

  }
@@ -256,7 +261,7 @@ export class MoatRPC { 
      try {

        retval.push(this.#fixupSettings(settings));

      } catch (ex) {

        console.log(ex);

        log.error(ex);

      }

    }

    return retval;
@@ -286,7 +291,7 @@ export class MoatRPC { 
      const code = response.errors[0].code;

      const detail = response.errors[0].detail;

      if (code == 406) {

        console.log(

        log.error(

          "MoatRPC::circumvention_settings(): Cannot automatically determine user's country-code"

        );

        // cannot determine user's country

toolkit/modules/TorConnect.sys.mjs

+9 −13
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ const lazy = {}; 


ChromeUtils.defineESModuleGetters(lazy, {

  BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",

  ConsoleAPI: "resource://gre/modules/Console.sys.mjs",

  MoatRPC: "resource://gre/modules/Moat.sys.mjs",

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

  TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
@@ -72,12 +71,9 @@ export class TorConnectError extends Error { 
  }

}



ChromeUtils.defineLazyGetter(

  lazy,

  "logger",

  () =>

    new lazy.ConsoleAPI({

      maxLogLevel: "info",

ChromeUtils.defineLazyGetter(lazy, "logger", () =>

  console.createInstance({

    maxLogLevel: "Info",

    maxLogLevelPref: TorConnectPrefs.log_level,

    prefix: "TorConnect",

  })
@@ -746,8 +742,8 @@ class InternetTest { 
        this.test();

      }, this.#timeoutRand());

    }

    this.onResult = online => {};

    this.onError = err => {};

    this.onResult = _online => {};

    this.onError = _error => {};

  }



  /**
@@ -961,7 +957,7 @@ export const TorConnect = { 
    }

  },



  async observe(subject, topic, data) {

  async observe(subject, topic) {

    lazy.logger.debug(`Observed ${topic}`);



    switch (topic) {