GitLab

at 2024-08-22T14:02:09+02:00

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

Bug 43074: Pass the browser to TorDomainIsolator.newCircuitForBrowser.

fixup! Bug 41600: Add a tor circuit display panel.

Bug 43074: Pass the browser to TorDomainIsolator.newCircuitForBrowser.

fixup! Bug 40209: Implement Basic Crypto Safety

Bug 43074: Pass the browser to TorDomainIsolator.newCircuitForBrowser.

Bug 42247: Android helpers for the TorProvider

Bug 42655: Add a backend function for the "New circuit for this site"
functionality.

       const browser = browsingContext.embedderElement;

       if (browser) {

         lazy.TorDomainIsolator.newCircuitForBrowser(

-          browser.ownerGlobal.gBrowser

+          browser.ownerGlobal.gBrowser.selectedBrowser

         );

       }

     }

                      class="subviewbutton"

                      key="new-circuit-key"

                      data-l10n-id="appmenuitem-new-tor-circuit"

-                     oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/>

+                     oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);"/>

       <toolbarseparator/>

       <toolbarbutton id="appMenu-bookmarks-button"

                      class="subviewbutton subviewbutton-nav"

                           key="new-identity-key" data-l10n-id="menu-new-identity"/>

                 <menuitem id="menu_newCircuit"

                           key="new-circuit-key" data-l10n-id="menu-new-tor-circuit"

-                          oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/>

+                          oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);"/>

                 <menuseparator/>

                 <menuitem id="menu_openLocation"

                           hidden="true"

          internal="true"/>

 #endif

     <key id="new-identity-key" modifiers="accel shift" key="U" oncommand="NewIdentityButton.onCommand(event)"/>

-    <key id="new-circuit-key" modifiers="accel shift" key="L" oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser)"/>

+    <key id="new-circuit-key" modifiers="accel shift" key="L" oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser)"/>

   </keyset>

     <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                    data-l10n-id="toolbar-new-tor-circuit"

-                   oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/>

+                   oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);"/>

     <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                    observes="View:FullScreen"

     document

       .getElementById("tor-circuit-new-circuit")

       .addEventListener("command", () => {

-        TorDomainIsolator.newCircuitForBrowser(gBrowser);

+        TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);

       });

     // Update the display just before opening.

     return mEventDispatcher.queryBundle("GeckoView:GetTorCircuit");

   }

+  /**

+   * Change the circuit for this session.

+   */

+  @UiThread

+  public void newTorCircuit() {

+    mEventDispatcher.dispatch("GeckoView:NewTorCircuit");

+  }

+

   /**

    * Set this GeckoSession as active or inactive, which represents if the session is currently

    * visible or not. Setting a GeckoSession to inactive will significantly reduce its memory

       "GeckoView:ZoomToInput",

       "GeckoView:IsPdfJs",

       "GeckoView:GetTorCircuit",

+      "GeckoView:NewTorCircuit",

     ]);

   }

       case "GeckoView:GetTorCircuit":

         this._getTorCircuit(aCallback);

         break;

+      case "GeckoView:NewTorCircuit":

+        this._newTorCircuit(aCallback);

+        break;

     }

   }

     }

   }

+  _newTorCircuit(aCallback) {

+    lazy.TorDomainIsolator.newCircuitForBrowser(this.browser);

+    aCallback?.onSuccess();

+  }

+

   async _containsFormData(aCallback) {

     aCallback.onSuccess(await this.actor.containsFormData());

   }

    * Create a new nonce for the FP domain of the selected browser and reload the

    * tab with a new circuit.

    *

-   * @param {object} globalBrowser Should be the gBrowser from the context of

-   * the caller

+   * @param {object} browser The browser we want to change the circuit for.

    */

-  newCircuitForBrowser(globalBrowser) {

-    const browser = globalBrowser.selectedBrowser;

+  newCircuitForBrowser(browser) {

     const firstPartyDomain = getDomainForBrowser(browser);

     this.newCircuitForDomain(firstPartyDomain);

     const { username, password } = this.#getSocksProxyCredentials(

...	...	@@ -67,7 +67,7 @@ export class CryptoSafetyParent extends JSWindowActorParent {
67	67	const browser = browsingContext.embedderElement;
68	68	if (browser) {
69	69	lazy.TorDomainIsolator.newCircuitForBrowser(
70		- browser.ownerGlobal.gBrowser
	70	+ browser.ownerGlobal.gBrowser.selectedBrowser
71	71	);
72	72	}
73	73	}

...	...	@@ -40,6 +40,7 @@ export class GeckoViewContent extends GeckoViewModule {
40	40	"GeckoView:ZoomToInput",
41	41	"GeckoView:IsPdfJs",
42	42	"GeckoView:GetTorCircuit",
	43	+ "GeckoView:NewTorCircuit",
43	44	]);
44	45	}
45	46
...	...	@@ -313,6 +314,9 @@ export class GeckoViewContent extends GeckoViewModule {
313	314	case "GeckoView:GetTorCircuit":
314	315	this._getTorCircuit(aCallback);
315	316	break;
	317	+ case "GeckoView:NewTorCircuit":
	318	+ this._newTorCircuit(aCallback);
	319	+ break;
316	320	}
317	321	}
318	322
...	...	@@ -437,6 +441,11 @@ export class GeckoViewContent extends GeckoViewModule {
437	441	}
438	442	}
439	443
	444	+ _newTorCircuit(aCallback) {
	445	+ lazy.TorDomainIsolator.newCircuitForBrowser(this.browser);
	446	+ aCallback?.onSuccess();
	447	+ }
	448	+
440	449	async _containsFormData(aCallback) {
441	450	aCallback.onSuccess(await this.actor.containsFormData());
442	451	}

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

9 changed files:

Changes: