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

fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser 

Fixed another race condition and moved to ES modules while I was
touching this code.
parent ae07f248

browser/components/BrowserGlue.sys.mjs

+2 −2
Original line number Diff line number Diff line
@@ -772,10 +772,10 @@ let JSWINDOWACTORS = { 


  TorConnect: {

    parent: {

      moduleURI: "resource:///modules/TorConnectParent.jsm",

      esModuleURI: "resource:///actors/TorConnectParent.sys.mjs",

    },

    child: {

      moduleURI: "resource:///modules/TorConnectChild.jsm",

      esModuleURI: "resource:///actors/TorConnectChild.sys.mjs",

      events: {

        DOMWindowCreated: {},

      },

browser/components/torconnect/TorConnectChild.jsm

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
// Copyright (c) 2021, The Tor Project, Inc.



var EXPORTED_SYMBOLS = ["TorConnectChild"];



const { RemotePageChild } = ChromeUtils.import(

  "resource://gre/actors/RemotePageChild.jsm"

);



class TorConnectChild extends RemotePageChild {}

browser/components/torconnect/TorConnectChild.sys.mjs

0 → 100644
+5 −0
Original line number Diff line number Diff line 
// Copyright (c) 2021, The Tor Project, Inc.



import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";



export class TorConnectChild extends RemotePageChild {}

browser/components/torconnect/TorConnectParent.jsm→browser/components/torconnect/TorConnectParent.sys.mjs

+38 −10
Original line number Diff line number Diff line 
// Copyright (c) 2021, The Tor Project, Inc.



var EXPORTED_SYMBOLS = ["TorConnectParent"];



const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");

const { InternetStatus, TorConnect, TorConnectTopics, TorConnectState } =

  ChromeUtils.import("resource:///modules/TorConnect.jsm");

const { TorSettings, TorSettingsTopics, TorSettingsData } = ChromeUtils.import(

  "resource:///modules/TorSettings.jsm"

);

import {

  InternetStatus,

  TorConnect,

  TorConnectTopics,

  TorConnectState,

} from "resource:///modules/TorConnect.sys.mjs";

import {

  TorSettings,

  TorSettingsTopics,

  TorSettingsData,

} from "resource:///modules/TorSettings.sys.mjs";



const BroadcastTopic = "about-torconnect:broadcast";
@@ -17,7 +20,7 @@ This object is basically a marshalling interface between the TorConnect module 
and a particular about:torconnect page

*/



class TorConnectParent extends JSWindowActorParent {

export class TorConnectParent extends JSWindowActorParent {

  constructor(...args) {

    super(...args);
@@ -35,10 +38,20 @@ class TorConnectParent extends JSWindowActorParent { 
      DetectedLocation: TorConnect.detectedLocation,

      ShowViewLog: TorConnect.logHasWarningOrError,

      HasEverFailed: TorConnect.hasEverFailed,

      QuickStartEnabled: TorSettings.quickstart.enabled,

      UIState: TorConnect.uiState,

    };



    // Workaround for a race condition, but we should fix it asap.

    // about:torconnect is loaded before TorSettings is actually initialized.

    // The getter might throw and the page not loaded correctly as a result.

    // Silence any warning for now, but we should really fix it.

    // See also tor-browser#41921.

    try {

      this.state.QuickStartEnabled = TorSettings.quickstart.enabled;

    } catch (e) {

      this.state.QuickStartEnabled = false;

    }



    // JSWindowActiveParent derived objects cannot observe directly, so create a member

    // object to do our observing for us

    //
@@ -84,6 +97,16 @@ class TorConnectParent extends JSWindowActorParent { 
            self.state.ShowViewLog = true;

            break;

          }

          case TorSettingsTopics.Ready: {

            if (

              self.state.QuickStartEnabled !== TorSettings.quickstart.enabled

            ) {

              self.state.QuickStartEnabled = TorSettings.quickstart.enabled;

            } else {

              return;

            }

            break;

          }

          case TorSettingsTopics.SettingChanged: {

            if (aData === TorSettingsData.QuickStartEnabled) {

              self.state.QuickStartEnabled = obj.value;
@@ -107,6 +130,7 @@ class TorConnectParent extends JSWindowActorParent { 
      const topic = TorConnectTopics[key];

      Services.obs.addObserver(this.torConnectObserver, topic);

    }

    Services.obs.addObserver(this.torConnectObserver, TorSettingsTopics.Ready);

    Services.obs.addObserver(

      this.torConnectObserver,

      TorSettingsTopics.SettingChanged
@@ -130,6 +154,10 @@ class TorConnectParent extends JSWindowActorParent { 
      const topic = TorConnectTopics[key];

      Services.obs.removeObserver(this.torConnectObserver, topic);

    }

    Services.obs.removeObserver(

      this.torConnectObserver,

      TorSettingsTopics.Ready

    );

    Services.obs.removeObserver(

      this.torConnectObserver,

      TorSettingsTopics.SettingChanged

browser/components/torconnect/moz.build

+4 −4
Original line number Diff line number Diff line 
JAR_MANIFESTS += ['jar.mn']

JAR_MANIFESTS += ["jar.mn"]



EXTRA_JS_MODULES += [

    'TorConnectChild.jsm',

    'TorConnectParent.jsm',

FINAL_TARGET_FILES.actors += [

    "TorConnectChild.sys.mjs",

    "TorConnectParent.sys.mjs",

]