Commit 86f813b4 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

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

TB 43502: Move about:torconnect methods to TorConnectParent.
parent 3e9fbd89

browser/base/content/browser-init.js

+3 −8
Original line number Diff line number Diff line
@@ -1000,14 +1000,9 @@ var gBrowserInit = { 


      // if using TorConnect, convert these uris to redirects

      if (TorConnect.shouldShowTorConnect) {

        return Promise.resolve(uri).then(aUri => {

          if (aUri == null) {

            aUri = [];

          }



          aUri = TorConnect.getURIsToLoad(aUri);

          return aUri;

        });

        return Promise.resolve(uri).then(aUri =>

          TorConnectParent.getURIsToLoad(aUri ?? [])

        );

      }

      return uri;

    })());

browser/base/content/browser.js

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ ChromeUtils.defineESModuleGetters(this, { 
  TorConnect: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectStage: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs",

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

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

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

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

browser/base/content/browser.js.globals

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ 
  "TorConnect",

  "TorConnectStage",

  "TorConnectTopics",

  "TorConnectParent",

  "gTorConnectUrlbarButton",

  "gTorConnectTitlebarStatus",

  "OnionAuthPrompt",

browser/modules/URILoadingHelper.sys.mjs

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",

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

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

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

});



ChromeUtils.defineLazyGetter(lazy, "ReferrerInfo", () =>
@@ -445,7 +446,7 @@ export const URILoadingHelper = { 
        (url === "about:newtab" &&

          Services.prefs.getBoolPref("browser.newtabpage.enabled", false))

      ) {

        url = lazy.TorConnect.getRedirectURL(url);

        url = lazy.TorConnectParent.getRedirectURL(url);

      }

    }

toolkit/components/torconnect/TorConnectChild.sys.mjs

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ export class TorConnectChild extends RemotePageChild { 
      } else {

        console.error(`Scheme is not allowed "${redirect}"`);

      }

    } catch {

      console.error(`Invalid redirect URL "${redirect}"`);

    } catch (e) {

      console.error(`Invalid redirect URL "${redirect}"`, e);

    }



    // Replace the destination to prevent "about:torconnect" entering the