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

Commits: 54c55848 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 dropme! Bug 30237: Add v3 onion services client authentication prompt

Drop this change to make the following rebase easier.

- - - - - 4d0c6f53 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Firefox preference overrides.

Bug 42596: Add preferences for log levels.

Added a comment to start a section where we can put the various default log levels.

- - - - - edceacf8 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 40926: Implemented the New Identity feature

Bug 42596: Add preferences for log levels.

- - - - - f6c72cec by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js

Bug 42596: Add preferences for log levels.

Added a comment to start a section where we can put the various default log levels.

- - - - - 57a7116e by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 40933: Add tor-launcher functionality

Bug 42596: Add preferences for log levels.

- - - - - 778a6111 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Lox integration

Bug 42596: Add preferences for log levels.

- - - - - 45a30339 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 40597: Implement TorSettings module

Bug 42596: Add preferences for log levels.

- - - - - 1dc73588 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain.

Bug 42596: Add preferences for log levels.

- - - - - 29101148 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 41600: Add a tor circuit display panel.

Bug 42596: Add preferences for log levels.

- - - - - e0e6c02b by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 42247: Android helpers for the TorProvider

Bug 42596: Add preferences for log levels.

- - - - - ed55e544 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop

Bug 42596: Add preferences for log levels.

- - - - - 3d71f241 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt

Bug 42596: Add preferences for log levels.

- - - - - b4e46ed0 by Pier Angelo Vendrame at 2024-08-14T20:45:05+00:00 fixup! Bug 40458: Implement .tor.onion aliases

Bug 42596: Add preferences for log levels.

- - - - -

14 changed files:

- browser/app/profile/000-tor-browser.js - browser/app/profile/001-base-profile.js - browser/components/newidentity/content/newidentity.js - browser/components/onionservices/OnionAliasStore.sys.mjs - browser/components/onionservices/TorRequestWatch.sys.mjs - browser/components/torcircuit/content/torCircuitPanel.js - toolkit/components/lox/Lox.sys.mjs - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/modules/DragDropFilter.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs

Changes:

===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -101,6 +101,7 @@ pref("extensions.torlauncher.tor_path", ""); // which is TorBrowser-Data/ if it exists as a sibling of the application // directory. If TorBrowser-Data/ does not exist, these paths are relative // to the TorBrowser/ directory within the application directory. +pref pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", "");

@@ -108,3 +109,17 @@ pref("extensions.torlauncher.tordatadir_path", ""); pref("extensions.torlauncher.bridgedb_front", "www.phpmyadmin.net"); pref("extensions.torlauncher.bridgedb_reflector", "https://1723079976.rsc.cdn77.org"); pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat"); + +// Log levels +pref("browser.tor_provider.log_level", "Warn"); +pref("browser.tor_provider.cp_log_level", "Warn"); +pref("lox.log_level", "Warn"); +pref("torbrowser.bootstrap.log_level", "Info"); +pref("browser.torsettings.log_level", "Warn"); +pref("browser.tordomainisolator.loglevel", "Warn"); +pref("browser.torcircuitpanel.loglevel", "Log"); +pref("browser.tor_android.log_level", "Info"); +pref("browser.dragdropfilter.log_level", "Warn"); +pref("browser.onionAuthPrompt.loglevel", "Warn"); +pref("browser.onionalias.log_level", "Warn"); +pref("browser.torRequestWatch.log_level", "Warn");

===================================== browser/app/profile/001-base-profile.js ===================================== @@ -649,7 +649,8 @@ pref("privacy.query_stripping.strip_on_share.enabled", true); // Disable platform text recogniition functionality (tor-browser#42057) pref("dom.text-recognition.enabled", false);

-pref("browser.onionAuthPrompt.loglevel", "Warn"); +// Log levels +pref("browser.new_identity.log_level", "Info");

#ifdef XP_WIN pref("browser.taskbar.lists.enabled", false);

===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -8,7 +8,6 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { // Logger adapted from CustomizableUI.jsm const logger = (() => { const consoleOptions = { - maxLogLevel: "Info", maxLogLevelPref: "browser.new_identity.log_level", prefix: "NewIdentity", };

===================================== browser/components/onionservices/OnionAliasStore.sys.mjs ===================================== @@ -29,11 +29,9 @@ const SECURE_DROP = { };

const kPrefOnionAliasEnabled = "browser.urlbar.onionRewrites.enabled"; -const kPrefOnionAliasLogLevel = "browser.onionalias.log_level";

const log = console.createInstance({ - maxLogLevel: "Warn", - maxLogLevelPref: kPrefOnionAliasLogLevel, + maxLogLevelPref: "browser.onionalias.log_level", prefix: "OnionAlias", });

===================================== browser/components/onionservices/TorRequestWatch.sys.mjs ===================================== @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

const log = console.createInstance({ - maxLogLevel: "Warn", maxLogLevelPref: "browser.torRequestWatch.log_level", prefix: "TorRequestWatch", });

===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -56,7 +56,6 @@ var gTorCircuitPanel = {

this._log = console.createInstance({ prefix: "TorCircuitPanel", - maxLogLevel: "Log", maxLogLevelPref: "browser.torcircuitpanel.loglevel", });

===================================== toolkit/components/lox/Lox.sys.mjs ===================================== @@ -9,7 +9,6 @@ const lazy = {};

ChromeUtils.defineLazyGetter(lazy, "logger", () => { return console.createInstance({ - maxLogLevel: "Warn", maxLogLevelPref: "lox.log_level", prefix: "Lox", });

===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -5,7 +5,6 @@ import { TorParsers } from "resource://gre/modules/TorParsers.sys.mjs";

const logger = console.createInstance({ - maxLogLevel: "Warn", maxLogLevelPref: "browser.tor_provider.cp_log_level", prefix: "TorControlPort", });

===================================== toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs ===================================== @@ -25,7 +25,6 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {

const logger = console.createInstance({ prefix: "TorDomainIsolator", - maxLogLevel: "Warn", maxLogLevelPref: "browser.tordomainisolator.loglevel", });

===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -19,7 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, { });

const logger = console.createInstance({ - maxLogLevel: "Warn", maxLogLevelPref: "browser.tor_provider.log_level", prefix: "TorProvider", });

===================================== toolkit/modules/DragDropFilter.sys.mjs ===================================== @@ -14,8 +14,7 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () => { // fission.enforceBlocklistedPrefsInSubprocesses is true). // (Or maybe this crash used to happen when the logger was not lazy, and maybe // the preferences were not ready, yet?) - return new console.createInstance({ - maxLogLevel: "Warn", + return console.createInstance({ maxLogLevelPref: "browser.dragdropfilter.log_level", prefix: "DragDropFilter", });

===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -19,7 +19,6 @@ const Prefs = Object.freeze({ });

const logger = console.createInstance({ - maxLogLevel: "Info", maxLogLevelPref: Prefs.logLevel, prefix: "TorAndroidIntegration", });

===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -74,7 +74,6 @@ export class TorConnectError extends Error {

ChromeUtils.defineLazyGetter(lazy, "logger", () => console.createInstance({ - maxLogLevel: "Info", maxLogLevelPref: TorConnectPrefs.log_level, prefix: "TorConnect", })

===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -14,7 +14,6 @@ ChromeUtils.defineESModuleGetters(lazy, {

ChromeUtils.defineLazyGetter(lazy, "logger", () => { return console.createInstance({ - maxLogLevel: "Warn", maxLogLevelPref: "browser.torsettings.log_level", prefix: "TorSettings", });

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/190db2e...