ma1 pushed to branch tor-browser-140.15.0esr-15.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
339c1f8b
by hackademix at 2026-09-01T12:13:18+02:00
2 changed files:
- toolkit/components/torconnect/TorConnectChild.sys.mjs
- toolkit/components/torconnect/TorConnectParent.sys.mjs
Changes:
| ... | ... | @@ -60,12 +60,7 @@ export class TorConnectChild extends RemotePageChild { |
| 60 | 60 | console.error(`Invalid redirect URL "${redirect}"`);
|
| 61 | 61 | }
|
| 62 | 62 | |
| 63 | - // Replace the destination to prevent "about:torconnect" entering the
|
|
| 64 | - // history.
|
|
| 65 | - // NOTE: This is done here, in the window actor, rather than in content
|
|
| 66 | - // because we have the privilege to redirect to a "chrome:" uri here (for
|
|
| 67 | - // when the HomePage is set to be blank).
|
|
| 68 | - this.contentWindow.location.replace(replaceURI);
|
|
| 63 | + this.sendQuery("torconnect:redirect", replaceURI);
|
|
| 69 | 64 | }
|
| 70 | 65 | |
| 71 | 66 | actorCreated() {
|
| ... | ... | @@ -106,6 +106,16 @@ export class TorConnectParent extends JSWindowActorParent { |
| 106 | 106 | return Promise.resolve(
|
| 107 | 107 | TorConnectParent.fixupURIs(lazy.HomePage.get())[0]
|
| 108 | 108 | );
|
| 109 | + case "torconnect:redirect":
|
|
| 110 | + this.browsingContext.top.embedderElement.loadURI(
|
|
| 111 | + Services.io.newURI(message.data),
|
|
| 112 | + {
|
|
| 113 | + triggeringPrincipal:
|
|
| 114 | + Services.scriptSecurityManager.getSystemPrincipal(),
|
|
| 115 | + loadFlags: Ci.nsIWebNavigation.LOAD_FLAGS_REPLACE_HISTORY,
|
|
| 116 | + }
|
|
| 117 | + );
|
|
| 118 | + break;
|
|
| 109 | 119 | case "torconnect:set-quickstart":
|
| 110 | 120 | TorConnect.quickstart = message.data;
|
| 111 | 121 | break;
|