Bug 40933: Add tor-launcher functionality (0996eadb) · Commits · jwilde / Tor Browser

browser/components/BrowserGlue.sys.mjs

+3 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
		"resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
		TRRRacer: "resource:///modules/TRRPerformance.sys.mjs",
		TelemetryUtils: "resource://gre/modules/TelemetryUtils.sys.mjs",
		TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs",
		UIState: "resource://services-sync/UIState.sys.mjs",
		UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
		WebChannel: "resource://gre/modules/WebChannel.sys.mjs",
		@@ -1783,6 +1784,8 @@ BrowserGlue.prototype = {

		lazy.DoHController.init();

		lazy.TorProviderBuilder.firstWindowLoaded();

		ClipboardPrivacy.startup();

		this._firstWindowTelemetry(aWindow);

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

+136 −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;

		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.
		// Notice that we do not resolve the promise here in case of success, but
		// we do it from the BootstrapStatus observer.
		TorProviderBuilder.build()
		.then(provider => provider.connect())
		.catch(err => {
		this.#stop(err.message, err.torMessage);
		});
		}).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;
		}

		let provider;
		try {
		provider = await TorProviderBuilder.build();
		} catch {
		// This was probably the error that lead to stop in the first place.
		// No need to continue propagating it.
		}
		try {
		await 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

+1229 −0

File added.

Preview size limit exceeded, changes collapsed.