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

Bug 40933: Add tor-launcher functionality 

Bug 41926: Reimplement the control port
parent 8b79c605

browser/installer/package-manifest.in

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ 
@RESPATH@/browser/chrome/browser.manifest

@RESPATH@/chrome/pdfjs.manifest

@RESPATH@/chrome/pdfjs/*

@RESPATH@/components/tor-launcher.manifest

@RESPATH@/chrome/torbutton.manifest

@RESPATH@/chrome/torbutton/*

@RESPATH@/chrome/toolkit@JAREXT@

toolkit/components/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ DIRS += [ 
    "thumbnails",

    "timermanager",

    "tooltiptext",

    "tor-launcher",

    "typeaheadfind",

    "utils",

    "url-classifier",

toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs

0 → 100644
+130 −0
Original line number Diff line number Diff line 
import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";



import { TorProviderBuilder } from "resource://gre/modules/TorProviderBuilder.sys.mjs";

import { TorLauncherUtil } from "resource://gre/modules/TorLauncherUtil.sys.mjs";



/* tor-launcher observer topics */

export const TorTopics = Object.freeze({

  BootstrapStatus: "TorBootstrapStatus",

  BootstrapError: "TorBootstrapError",

  LogHasWarnOrErr: "TorLogHasWarnOrErr",

});



// modeled after XMLHttpRequest

// nicely encapsulates the observer register/unregister logic

export class TorBootstrapRequest {

  // number of ms to wait before we abandon the bootstrap attempt

  // a value of 0 implies we never wait

  timeout = 0;



  // callbacks for bootstrap process status updates

  onbootstrapstatus = (progress, status) => {};

  onbootstrapcomplete = () => {};

  onbootstraperror = (message, details) => {};



  // internal resolve() method for bootstrap

  #bootstrapPromiseResolve = null;

  #bootstrapPromise = null;

  #timeoutID = null;

  #provider = null;



  constructor() {

    this.#provider = TorProviderBuilder.build();

  }



  observe(subject, topic, data) {

    const obj = subject?.wrappedJSObject;

    switch (topic) {

      case TorTopics.BootstrapStatus: {

        const progress = obj.PROGRESS;

        const status = TorLauncherUtil.getLocalizedBootstrapStatus(obj, "TAG");

        if (this.onbootstrapstatus) {

          this.onbootstrapstatus(progress, status);

        }

        if (progress === 100) {

          if (this.onbootstrapcomplete) {

            this.onbootstrapcomplete();

          }

          this.#bootstrapPromiseResolve(true);

          clearTimeout(this.#timeoutID);

          this.#timeoutID = null;

        }



        break;

      }

      case TorTopics.BootstrapError: {

        console.info("TorBootstrapRequest: observerd TorBootstrapError", obj);

        this.#stop(obj?.message, obj?.details);

        break;

      }

    }

  }



  // resolves 'true' if bootstrap succeeds, false otherwise

  bootstrap() {

    if (this.#bootstrapPromise) {

      return this.#bootstrapPromise;

    }



    this.#bootstrapPromise = new Promise((resolve, reject) => {

      this.#bootstrapPromiseResolve = resolve;



      // register ourselves to listen for bootstrap events

      Services.obs.addObserver(this, TorTopics.BootstrapStatus);

      Services.obs.addObserver(this, TorTopics.BootstrapError);



      // optionally cancel bootstrap after a given timeout

      if (this.timeout > 0) {

        this.#timeoutID = setTimeout(async () => {

          this.#timeoutID = null;

          // TODO: Translate, if really used

          await this.#stop(

            "Tor Bootstrap process timed out",

            `Bootstrap attempt abandoned after waiting ${this.timeout} ms`

          );

        }, this.timeout);

      }



      // wait for bootstrapping to begin and maybe handle error

      this.#provider.connect().catch(err => {

        this.#stop(err.message, "");

      });

    }).finally(() => {

      // and remove ourselves once bootstrap is resolved

      Services.obs.removeObserver(this, TorTopics.BootstrapStatus);

      Services.obs.removeObserver(this, TorTopics.BootstrapError);

      this.#bootstrapPromise = null;

    });



    return this.#bootstrapPromise;

  }



  async cancel() {

    await this.#stop();

  }



  // Internal implementation. Do not use directly, but call cancel, instead.

  async #stop(message, details) {

    // first stop our bootstrap timeout before handling the error

    if (this.#timeoutID !== null) {

      clearTimeout(this.#timeoutID);

      this.#timeoutID = null;

    }



    try {

      await this.#provider.stopBootstrap();

    } catch (e) {

      console.error("Failed to stop the bootstrap.", e);

      if (!message) {

        message = e.message;

        details = "";

      }

    }



    if (this.onbootstraperror && message) {

      this.onbootstraperror(message, details);

    }



    this.#bootstrapPromiseResolve(false);

  }

}

toolkit/components/tor-launcher/TorControlPort.sys.mjs

0 → 100644
+1191 −0

File added.

Preview size limit exceeded, changes collapsed.

toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs

0 → 100644
+691 −0

File added.

Preview size limit exceeded, changes collapsed.