Verified Commit 20641450 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. 

Bug 41844: Do not use the control port directly.

Use TorDomainIsolator also as a backend for the circuit display.
parent 749aeaca

browser/base/content/browser.js

+1 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ ChromeUtils.defineESModuleGetters(this, { 
  TabsSetupFlowManager:

    "resource:///modules/firefox-view-tabs-setup-manager.sys.mjs",

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

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

  TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs",

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

  UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
@@ -100,7 +101,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { 
  TorConnect: "resource:///modules/TorConnect.jsm",

  TorConnectState: "resource:///modules/TorConnect.jsm",

  TorConnectTopics: "resource:///modules/TorConnect.jsm",

  TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.jsm",

  Translation: "resource:///modules/translation/TranslationParent.jsm",

  webrtcUI: "resource:///modules/webrtcUI.jsm",

  ZoomUI: "resource:///modules/ZoomUI.jsm",

toolkit/components/tor-launcher/TorStartupService.sys.mjs

+1 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ const lazy = {}; 
// We will use the modules only when the profile is loaded, so prefer lazy

// loading

ChromeUtils.defineESModuleGetters(lazy, {

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

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

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

  TorProtocolService: "resource://gre/modules/TorProtocolService.sys.mjs",
@@ -19,12 +20,6 @@ ChromeUtils.defineModuleGetter( 
  "resource:///modules/TorSettings.jsm"

);



ChromeUtils.defineModuleGetter(

  lazy,

  "TorDomainIsolator",

  "resource://gre/modules/TorDomainIsolator.jsm"

);



/* Browser observer topis */

const BrowserTopics = Object.freeze({

  ProfileAfterChange: "profile-after-change",

toolkit/components/tor-launcher/moz.build

+1 −1
Original line number Diff line number Diff line 
EXTRA_JS_MODULES += [

    "TorBootstrapRequest.sys.mjs",

    "TorDomainIsolator.jsm",

    "TorDomainIsolator.sys.mjs",

    "TorLauncherUtil.sys.mjs",

    "TorMonitorService.sys.mjs",

    "TorParsers.sys.mjs",