GitLab

at 2025-02-26T12:53:50+00:00

fixup! TB 40597: Implement TorSettings module

TB 43529: Await BootstrapAttempt.cancel in AutoBootstrapAttempt.

We also add a comment for the reason why we need to await.

       lazy.logger.warn("Cancelled bootstrap after it has already resolved");

       return;

     }

-    // Wait until after bootstrap.cancel returns before we resolve with

-    // cancelled. In particular, there is a small chance that the bootstrap

-    // completes, in which case we want to be able to resolve with a success

-    // instead.

+    // Wait until after #bootstrap.cancel returns before we resolve with

+    // cancelled. In particular:

+    // + there is a small chance that the bootstrap completes, in which case we

+    //   want to be able to resolve with a success instead.

+    // + we want to make sure that we only resolve this BootstrapAttempt

+    //   when the current TorBootstrapRequest instance is fully resolved so

+    //   there are never two competing instances.

     await this.#bootstrap?.cancel();

     this.#resolveRun({ result: "cancelled" });

   }

       return;

     }

-    // Wait until after bootstrap.cancel returns before we resolve with

-    // cancelled. In particular, there is a small chance that the bootstrap

-    // completes, in which case we want to be able to resolve with a success

-    // instead.

+    // Wait until after #bootstrapAttempt.cancel returns before we resolve with

+    // cancelled. In particular:

+    // + there is a small chance that the bootstrap completes, in which case we

+    //   want to be able to resolve with a success instead.

+    // + we want to make sure that we only resolve this AutoBootstrapAttempt

+    //   when the current TorBootstrapRequest instance is fully resolved so

+    //   there are never two competing instances.

     if (this.#bootstrapAttempt) {

-      this.#bootstrapAttempt.cancel();

-      await this.#bootstrapAttempt;

+      await this.#bootstrapAttempt.cancel();

     }

     // In case no bootstrap is running, we resolve with "cancelled".

     this.#resolveRun({ result: "cancelled" });

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes: