- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Nov '19

20 Nov '19

commit e847b87fda117ebf06459755b5dbd037eb1d349a Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Nov 15 13:48:46 2019 -0800 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor Fixes bug 32508. --- browser/components/torpreferences/content/torPane.xul | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.xul b/browser/components/torpreferences/content/torPane.xul index 5d8451554eb9..d158b7e4676a 100644 --- a/browser/components/torpreferences/content/torPane.xul +++ b/browser/components/torpreferences/content/torPane.xul @@ -5,12 +5,13 @@ <html:template id="template-paneTor"> <hbox id="torPreferencesCategory" class="subcategory" - hidden="true" - data-category="paneTor"> + data-category="paneTor" + hidden="true"> <html:h1 id="torPreferences-header"/> </hbox> -<groupbox data-category="paneTor" > +<groupbox data-category="paneTor" + hidden="true"> <description flex="1"> <html:span id="torPreferences-description" class="tail-with-learn-more"/> <label id="torPreferences-learnMore" class="learnMore text-link" is="text-link"/> @@ -18,7 +19,9 @@ </groupbox>  -<groupbox id="torPreferences-bridges-group" data-category="paneTor" > +<groupbox id="torPreferences-bridges-group" + data-category="paneTor" + hidden="true"> <html:h2 id="torPreferences-bridges-header"/> <description flex="1"> <html:span id="torPreferences-bridges-description" class="tail-with-learn-more"/> @@ -63,7 +66,9 @@ </groupbox>  -<groupbox id="torPreferences-advanced-group" data-category="paneTor"> +<groupbox id="torPreferences-advanced-group" + data-category="paneTor" + hidden="true"> <html:h2 id="torPreferences-advanced-header"/> <description flex="1"> <html:span id="torPreferences-advanced-description" class="tail-with-learn-more"/>

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Pick up latest Torbutton code
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 94d8be288b1177ec4fe71a719ca6b6cccfbff5f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 19 15:08:50 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 73a43f2f4d84..fa05e61cac49 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 73a43f2f4d846b2870757d7aa18a1b33643ba2b5 +Subproject commit fa05e61cac497a7fbe3050ee8a9f4f6ec39be3a4

1 0

[torbutton/master] Bug 30237: Add strings for v3 onion services client authentication
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit fa05e61cac497a7fbe3050ee8a9f4f6ec39be3a4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Nov 12 15:39:19 2019 -0500 Bug 30237: Add strings for v3 onion services client authentication --- chrome/locale/en-US/torbutton.dtd | 3 +++ chrome/locale/en-US/torbutton.properties | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/chrome/locale/en-US/torbutton.dtd b/chrome/locale/en-US/torbutton.dtd index d14bd1da..ed3cb1a6 100644 --- a/chrome/locale/en-US/torbutton.dtd +++ b/chrome/locale/en-US/torbutton.dtd @@ -47,3 +47,6 @@ <!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> <!ENTITY torbutton.circuit_display.title "Tor Circuit"> <!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> + + +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index ea7a7d63..1020e57a 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -58,3 +58,13 @@ updateDownloadingPanelUILabel=Downloading %S update # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) + +# Onion services strings. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.clientAuthMissing=Tor onion service missing client authorization +onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.done=Done +onionServices.authPrompt.doneAccessKey=d +onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key

1 0

[torbutton/master] Bug 30237: Control port module improvements for v3 client authentication
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 46efc92348dbed06fc31ddfb0a5ac2e4e8554de2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Nov 12 15:38:10 2019 -0500 Bug 30237: Control port module improvements for v3 client authentication Split the configuration portion of the controller() function into a new configureControlPortModule() function. This allows the Torbutton code to continue to own the configuration (with help from Tor Launcher) while making it possible for the v3 client authentication prompt to use Torbutton's control port module. Also, include error information returned by Tor within error objects generated by the control port module and add support for Tor's new ONION_CLIENT_AUTH_ADD control port command. --- chrome/content/tor-circuit-display.js | 21 ++++---- chrome/content/torbutton.js | 8 +-- modules/tor-control-port.js | 95 ++++++++++++++++++++++++++++------- 3 files changed, 92 insertions(+), 32 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 21bcc57b..1e58b2b4 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -6,9 +6,8 @@ // with docco.js to produce pretty documentation. // // This script is to be embedded in torbutton.xul. It defines a single global -// function, createTorCircuitDisplay(ipcFile, host, port, password), which -// activates the automatic Tor circuit display for the current tab and any -// future tabs. +// function, createTorCircuitDisplay(), which activates the automatic Tor +// circuit display for the current tab and any future tabs. // // See https://trac.torproject.org/8641 @@ -16,11 +15,12 @@ /* global document, gBrowser, Components */ // ### Main function -// __createTorCircuitDisplay(ipcFile, host, port, password, enablePrefName)__. +// __createTorCircuitDisplay(enablePrefName)__. // The single function that prepares tor circuit display. Connects to a tor -// control port with the given ipcFile or host plus port, and password, and -// binds to a named bool pref whose value determines whether the circuit display -// is enabled or disabled. +// control port using information provided to the control port module via +// a previous call to configureControlPortModule(), and binds to a named +// bool pref whose value determines whether the circuit display is enabled +// or disabled. let createTorCircuitDisplay = (function () { "use strict"; @@ -415,11 +415,11 @@ let ensureCorrectPopupDimensions = function () { // ## Main function -// __setupDisplay(ipcFile, host, port, password, enablePrefName)__. +// __setupDisplay(enablePrefName)__. // Once called, the Tor circuit display will be started whenever // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. -let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +let setupDisplay = function (enablePrefName) { setupGuardNote(); let myController = null, stopCollectingIsolationData = null, @@ -442,8 +442,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { }, start = function () { if (!myController) { - myController = controller(ipcFile, host, port || 9151, password, - function (err) { + myController = controller(function (err) { // An error has occurred. logger.eclog(5, err); logger.eclog(5, "Disabling tor display circuit because of an error."); diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index aacae042..b9642a89 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -21,6 +21,7 @@ let { getDomainForBrowser, } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = ChromeUtils.import("resource://torbutton/modules/security-prefs.js", {}); +let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -334,6 +335,9 @@ function torbutton_init() { } } + configureControlPortModule(m_tb_control_ipc_file, m_tb_control_host, + m_tb_control_port, m_tb_control_pass); + // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); @@ -353,9 +357,7 @@ function torbutton_init() { torbutton_notify_if_update_needed(); try { - createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, - m_tb_control_port, m_tb_control_pass, - "extensions.torbutton.display_circuit"); + createTorCircuitDisplay("extensions.torbutton.display_circuit"); } catch(e) { torbutton_log(4, "Error creating the tor circuit display " + e); } diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index 9f6dbeb6..1b0a79ad 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -7,10 +7,15 @@ // // To import the module, use // -// let { controller } = Components.utils.import("path/to/tor-control-port.js", {}); +// let { configureControlPortModule, controller } = +// Components.utils.import("path/to/tor-control-port.js", {}); +// +// See the second-to-last function defined in this file: +// configureControlPortModule(ipcFile, host, port, password) +// for usage of the configureControlPortModule function. // // See the last function defined in this file: -// controller(ipcFile, host, port, password, onError) +// controller(onError) // for usage of the controller function. /* jshint esnext: true */ @@ -229,7 +234,16 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { let [command, replyCallback, errorCallback] = commandQueue.shift(); if (message.match(/^2/) && replyCallback) replyCallback(message); if (message.match(/^[45]/) && errorCallback) { - errorCallback(new Error(command + " -> " + message)); + let myErr = new Error(command + " -> " + message); + // Add Tor-specific information to the Error object. + let idx = message.indexOf(' '); + if (idx > 0) { + myErr.torStatusCode = message.substring(0, idx); + myErr.torMessage = message.substring(idx); + } else { + myErr.torStatusCode = message; + } + errorCallback(myErr); } }); // Create and return a version of sendCommand that returns a Promise. @@ -562,6 +576,24 @@ info.getConf = function (aControlSocket, key) { .then(info.getMultipleResponseValues); }; +// ## onionAuth +// A namespace for functions related to tor's ONION_CLIENT_AUTH_* commands. +let onionAuth = {}; + +// __onionAuth.add(controlSocket, hsAddress, b64PrivateKey, nickname, isPermanent)__. +// Sends a ONION_CLIENT_AUTH_ADD command to add a private key to the +// Tor configuration. +onionAuth.add = function (aControlSocket, hsAddress, b64PrivateKey, + nickname, isPermanent) { + const keyType = "x25519"; + let cmd = `onion_client_auth_add ${hsAddress} ${keyType}:${b64PrivateKey}`; + if (nickname) + cmd += ` ClientName=${nickname}`; + if (isPermanent) + cmd += " Flags=Permanent"; + return aControlSocket.sendCommand(cmd); +}; + // ## event // Handlers for events @@ -617,6 +649,9 @@ tor.controller = function (ipcFile, host, port, password, onError) { isOpen = true; return { getInfo : key => info.getInfo(socket, key), getConf : key => info.getConf(socket, key), + onionAuthAdd : (hsAddress, b64PrivateKey, nickname, isPermanent) => + onionAuth.add(socket, hsAddress, b64PrivateKey, + nickname, isPermanent), watchEvent : (type, filter, onData) => event.watchEvent(socket, type, filter, onData), isOpen : () => isOpen, @@ -626,29 +661,53 @@ tor.controller = function (ipcFile, host, port, password, onError) { // ## Export -// __controller(ipcFile, host, port, password, onError)__. -// Instantiates and returns a controller object connected to a tor ControlPort -// on ipcFile or at host:port, authenticating with the given password, if -// the controller doesn't yet exist. Otherwise returns the existing controller -// to the given ipcFile or host:port. +let controlPortInfo = {}; + +// __configureControlPortModule(ipcFile, host, port, password)__. +// Sets Tor control port connection parameters to be used in future calls to +// the controller() function. Example: +// configureControlPortModule(undefined, "127.0.0.1", 9151, "MyPassw0rd"); +var configureControlPortModule = function (ipcFile, host, port, password) { + controlPortInfo.ipcFile = ipcFile; + controlPortInfo.host = host; + controlPortInfo.port = port || 9151; + controlPortInfo.password = password; +}; + +// __controller(onError)__. +// Instantiates and returns a controller object that is connected and +// authenticated to a Tor ControlPort using the connection parameters +// provided in the most recent call to configureControlPortModule(), if +// the controller doesn't yet exist. Otherwise returns the existing +// controller to the given ipcFile or host:port. // onError is called with an error object as its single argument whenever // an error occurs. Example: // // // Get the controller -// let c = controller(undefined, "127.0.0.1", 9151, "MyPassw0rd", +// let c = controller( // function (error) { console.log(error.message || error); }); // // Send command and receive `250` reply or error message in a promise: // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -var controller = function (ipcFile, host, port, password, onError) { - let dest = (ipcFile) ? "unix:" + ipcFile.path : host + ":" + port, - maybeController = tor.controllerCache[dest]; - return (tor.controllerCache[dest] = - (maybeController && maybeController.isOpen()) ? - maybeController : - tor.controller(ipcFile, host, port, password, onError)); +var controller = function (onError) { + if (!controlPortInfo.ipcFile && !controlPortInfo.host) + throw new Error("Please call configureControlPortModule first"); + + const dest = (controlPortInfo.ipcFile) + ? `unix:${controlPortInfo.ipcFile.path}` + : `${controlPortInfo.host}:${controlPortInfo.port}`; + const maybeController = tor.controllerCache[dest]; + if (maybeController && maybeController.isOpen()) + return maybeController; + + tor.controllerCache[dest] = tor.controller(controlPortInfo.ipcFile, + controlPortInfo.host, + controlPortInfo.port, + controlPortInfo.password, + onError); + return tor.controllerCache[dest]; }; -// Export the controller function for external use. -var EXPORTED_SYMBOLS = ["controller"]; +// Export functions for external use. +var EXPORTED_SYMBOLS = ["configureControlPortModule", "controller"];

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 548177579c14a34a72f374ec783005f04cfde100 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Oct 21 18:20:42 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 9f2537df5557..d02b4e13a2d9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -347,6 +347,64 @@ pref("browser.download.forward_oma_android_download_manager", false); #expand pref("torbrowser.version", __TOR_BROWSER_VERSION_QUOTED__); +// Old torbutton prefs + +// debug prefs +pref("extensions.torbutton.loglevel",4); +pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglog + +// Display prefs +pref("extensions.torbutton.display_circuit", true); +pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); +pref("extensions.torbutton.updateNeeded", false); + +// Tor check and proxy prefs +pref("extensions.torbutton.test_enabled",true); +pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); +pref("extensions.torbutton.local_tor_check",true); +pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); +pref("extensions.torbutton.versioncheck_enabled",true); +pref("extensions.torbutton.use_nontor_proxy",false); + +// State prefs: +pref("extensions.torbutton.startup",false); +pref("extensions.torbutton.inserted_button",false); +pref("extensions.torbutton.inserted_security_level",false); + +// This is only used when letterboxing is disabled. +// See #7255 for details. We display the warning three times to make sure the +// user did not click on it by accident. +pref("extensions.torbutton.maximize_warnings_remaining", 3); + +// Security prefs: +pref("extensions.torbutton.clear_http_auth",true); +pref("extensions.torbutton.close_newnym",true); +pref("extensions.torbutton.resize_new_windows",false); +pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last +pref("extensions.torbutton.tor_memory_jar",false); +pref("extensions.torbutton.nontor_memory_jar",false); +pref("extensions.torbutton.launch_warning",true); + +// Opt out of Firefox addon pings: +// https://developer.mozilla.org/en/Addons/Working_with_AMO +pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); + +// Security Slider +pref("extensions.torbutton.security_slider", 4); +pref("extensions.torbutton.security_custom", false); + +pref("extensions.torbutton.confirm_plugins", true); +pref("extensions.torbutton.confirm_newnym", true); + +pref("extensions.torbutton.noscript_inited", false); +pref("extensions.torbutton.noscript_persist", false); + +// Browser home page: +pref("browser.startup.homepage", "about:tor"); + +// This pref specifies an ad-hoc "version" for various pref update hacks we need to do +pref("extensions.torbutton.pref_fixup_version", 0); + // If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection. #ifdef MOZ_BUNDLED_FONTS

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit c2fafa4a2f8fa3ec005bafaab748861ecee49946 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 13 12:47:29 2019 +0100 fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files. --- mobile/android/app/000-tor-browser-android.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index 0017cb2d058a..db9e23063738 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -49,3 +49,6 @@ pref("intl.locale.requested", ""); // Disable WebAuthn. It requires Google Play Services, so it isn't // available, but avoid any potential problems. pref("security.webauth.webauthn_enable_android_fido2", false); + +// Disable the External App Blocker on Android +pref("extensions.torbutton.launch_warning", false);

1 0

[torbutton/master] Bug 30851: Move default preferences to 000-tor-browser.js
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 59cabca7ade54fa4f5fec2a398456dbc3891009a Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 10 17:49:38 2019 +0200 Bug 30851: Move default preferences to 000-tor-browser.js --- chrome/content/locale/non-localized.properties | 6 --- components/domain-isolator.js | 3 -- components/dragDropFilter.js | 2 - components/startup-observer.js | 1 - components/torbutton-logger.js | 2 - defaults/preferences/preferences.js | 55 -------------------------- jar.mn | 1 - modules/default-prefs.js | 36 ----------------- moz.build | 3 -- 9 files changed, 109 deletions(-) diff --git a/chrome/content/locale/non-localized.properties b/chrome/content/locale/non-localized.properties deleted file mode 100644 index dca78639..00000000 --- a/chrome/content/locale/non-localized.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file must be located in a subdirectory named "locale" so that -# about:config will display the correct value for browser.startup.homepage. -# See fetchPref() inside toolkit/components/viewconfig/content/config.js - -# Default home page -browser.startup.homepage=about:tor diff --git a/components/domain-isolator.js b/components/domain-isolator.js index f6a6d598..3ed6e58f 100644 --- a/components/domain-isolator.js +++ b/components/domain-isolator.js @@ -15,9 +15,6 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; -let { ensureDefaultPrefs } = ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}); -ensureDefaultPrefs(); - // Import crypto object (FF 37+). Cu.importGlobalProperties(["crypto"]); diff --git a/components/dragDropFilter.js b/components/dragDropFilter.js index 9d6f74c8..f48d1b38 100644 --- a/components/dragDropFilter.js +++ b/components/dragDropFilter.js @@ -6,8 +6,6 @@ *************************************************************************/ -ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); - const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); diff --git a/components/startup-observer.js b/components/startup-observer.js index 008134f8..d2d1d610 100644 --- a/components/startup-observer.js +++ b/components/startup-observer.js @@ -21,7 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { L10nRegistry: "resource://gre/modules/L10nRegistry.jsm", }); -ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); let NoScriptControl = ChromeUtils.import("resource://torbutton/modules/noscript-control.js", {}); // Module specific constants diff --git a/components/torbutton-logger.js b/components/torbutton-logger.js index 52fdfc23..1c946fa7 100644 --- a/components/torbutton-logger.js +++ b/components/torbutton-logger.js @@ -13,8 +13,6 @@ const kMODULE_NAME = "Torbutton Logger"; const kMODULE_CONTRACTID = "@torproject.org/torbutton-logger;1"; const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); -ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); - const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); diff --git a/defaults/preferences/preferences.js b/defaults/preferences/preferences.js deleted file mode 100644 index 100302b7..00000000 --- a/defaults/preferences/preferences.js +++ /dev/null @@ -1,55 +0,0 @@ -// debug prefs -pref("extensions.torbutton.loglevel",4); -pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglog - -// Display prefs -pref("extensions.torbutton.display_circuit", true); -pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); -pref("extensions.torbutton.updateNeeded", false); - -// Tor check and proxy prefs -pref("extensions.torbutton.test_enabled",true); -pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); -pref("extensions.torbutton.local_tor_check",true); -pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); -pref("extensions.torbutton.versioncheck_enabled",true); -pref("extensions.torbutton.use_nontor_proxy",false); - -// State prefs: -pref("extensions.torbutton.startup",false); -pref("extensions.torbutton.inserted_button",false); -pref("extensions.torbutton.inserted_security_level",false); - -// TODO: This is just part of a stopgap until #14429 gets properly implemented. -// See #7255 for details. We display the warning three times to make sure the -// user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 3); - -// Security prefs: -pref("extensions.torbutton.clear_http_auth",true); -pref("extensions.torbutton.close_newnym",true); -pref("extensions.torbutton.resize_new_windows",false); -pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last -pref("extensions.torbutton.tor_memory_jar",false); -pref("extensions.torbutton.nontor_memory_jar",false); -pref("extensions.torbutton.launch_warning",true); - -// Opt out of Firefox addon pings: -// https://developer.mozilla.org/en/Addons/Working_with_AMO -pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); - -// Security Slider -pref("extensions.torbutton.security_slider", 4); -pref("extensions.torbutton.security_custom", false); - -pref("extensions.torbutton.confirm_plugins", true); -pref("extensions.torbutton.confirm_newnym", true); - -pref("extensions.torbutton.noscript_inited", false); -pref("extensions.torbutton.noscript_persist", false); - -// Browser home page: -pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); - -// This pref specifies an ad-hoc "version" for various pref update hacks we need to do -pref("extensions.torbutton.pref_fixup_version", 0); diff --git a/jar.mn b/jar.mn index 8b6cbcf7..2c6d186b 100644 --- a/jar.mn +++ b/jar.mn @@ -6,7 +6,6 @@ torbutton.jar: content/ (chrome/content/*) components/ (components/*) - defaults/ (defaults/*) modules/ (modules/*) skin/ (chrome/skin/*) diff --git a/modules/default-prefs.js b/modules/default-prefs.js deleted file mode 100644 index 5ea549f4..00000000 --- a/modules/default-prefs.js +++ /dev/null @@ -1,36 +0,0 @@ -let loaded = false; - -function ensureDefaultPrefs () { - if (loaded) { - return; - } - const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - const kDefaultPreferences = "resource://torbutton/defaults/preferences/preferences.js"; - const defaultPrefBranch = Services.prefs.getDefaultBranch(null); - - const context = { - pref: function (aPrefName, aValue) { - const aValueType = typeof aValue; - if (aValueType === "boolean") { - defaultPrefBranch.setBoolPref(aPrefName, aValue); - } else if (aValueType === "number") { - defaultPrefBranch.setIntPref(aPrefName, aValue); - } else if (aValueType === "string") { - defaultPrefBranch.setCharPref(aPrefName, aValue); - } else { - Services.console.logStringMessage( - `Preference ${aPrefName} with value ${aValue} has an invalid value type`); - } - - // Disable the External App Blocker on Android - if ((aPrefName === "extensions.torbutton.launch_warning") && - (Services.appinfo.OS === "Android")) { - defaultPrefBranch.setBoolPref(aPrefName, false); - } - } - }; - Services.scriptloader.loadSubScript(kDefaultPreferences, context); - loaded = true; -} - -let EXPORTED_SYMBOLS = ["ensureDefaultPrefs"]; diff --git a/moz.build b/moz.build index 843cee0d..376c9976 100644 --- a/moz.build +++ b/moz.build @@ -4,6 +4,3 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. JAR_MANIFESTS += ['jar.mn'] -JS_PREFERENCE_FILES += [ - 'defaults/preferences/preferences.js', -]

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 39861885e9837439fab9e3bf7aece4a21271e64b Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Nov 18 12:13:00 2019 -0800 fixup! Bug 25658: Replace security slider with security level UI Fixes bug 32539. --- browser/components/securitylevel/content/securityLevel.js | 2 +- .../components/securitylevel/content/securityLevelPreferences.inc.xul | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 7b3e7e4f92f9..2081eabb4176 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -334,7 +334,7 @@ const SecurityLevelPreferences = let groupbox = document.getElementById("securityLevel-groupbox"); let labelHeader = groupbox.querySelector("#securityLevel-header"); - labelHeader.setAttribute("value", TorStrings.securityLevel.securityLevel); + labelHeader.textContent = TorStrings.securityLevel.securityLevel; let spanOverview = groupbox.querySelector("#securityLevel-overview"); spanOverview.textContent = TorStrings.securityLevel.overview; diff --git a/browser/components/securitylevel/content/securityLevelPreferences.inc.xul b/browser/components/securitylevel/content/securityLevelPreferences.inc.xul index 0e68800e2766..a81b8d299789 100644 --- a/browser/components/securitylevel/content/securityLevelPreferences.inc.xul +++ b/browser/components/securitylevel/content/securityLevelPreferences.inc.xul @@ -1,5 +1,5 @@ <groupbox id="securityLevel-groupbox" data-category="panePrivacy" hidden="true"> - <caption><label id="securityLevel-header"/></caption> + <label><html:h2 id="securityLevel-header"/></label> <vbox data-subcategory="securitylevel" flex="1"> <description flex="1"> <html:span id="securityLevel-overview" class="tail-with-learn-more"/>

1 0

[torbutton/master] Bug 28745: Assume always running in Tor Browser
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 6b1a5ded2cab7e51aeb504483fa0d8fbf0cae957 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 10 17:08:25 2019 +0200 Bug 28745: Assume always running in Tor Browser --- chrome/content/torbutton.js | 75 ++++++++----------------------------- defaults/preferences/preferences.js | 1 - 2 files changed, 15 insertions(+), 61 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 1537c54d..aacae042 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -40,8 +40,6 @@ var m_tb_confirming_plugins = false; var m_tb_window_height = window.outerHeight; var m_tb_window_width = window.outerWidth; -var m_tb_tbb = false; - var m_tb_control_ipc_file = null; // Set if using IPC (UNIX domain socket). var m_tb_control_port = null; // Set if using TCP. var m_tb_control_host = null; // Set if using TCP. @@ -247,7 +245,6 @@ function torbutton_init() { var cur_version; try { cur_version = m_tb_prefs.getCharPref("torbrowser.version"); - m_tb_tbb = true; torbutton_log(3, "This is a Tor Browser"); } catch(e) { torbutton_log(3, "This is not a Tor Browser: "+e); @@ -488,25 +485,6 @@ function torbutton_confirm_plugins() { } } -function torbutton_inform_about_tbb() { - var prompts = Services.prompt; - - var message = torbutton_get_property_string("torbutton.popup.prompt_torbrowser"); - var title = torbutton_get_property_string("torbutton.title.prompt_torbrowser"); - var checkbox = {value: false}; - - var sb = Services.strings; - var browserstrings = sb.createBundle("chrome://browser/locale/browser.properties"); - - var askagain = browserstrings.GetStringFromName("privateBrowsingNeverAsk"); - - var response = prompts.alertCheck(null, title, message, askagain, checkbox); - - // Update preferences to reflect their response and to prevent the prompt from - // being displayed again. - m_tb_prefs.setBoolPref("extensions.torbutton.prompt_torbrowser", !checkbox.value); -} - // Bug 1506 P2: It might be nice to let people move the button around, I guess? function torbutton_get_toolbutton() { var o_toolbutton = false; @@ -580,7 +558,7 @@ function torbutton_check_for_update() { // Bug 1506 P4: Checking for Tor Browser updates is pretty important, // probably even as a fallback if we ever do get a working updater. function torbutton_do_async_versioncheck() { - if (!m_tb_tbb || !m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { + if (!m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { return; } @@ -1405,21 +1383,19 @@ function torbutton_tor_check_ok() // // toggles plugins: true for disabled, false for enabled function torbutton_toggle_plugins(disable_plugins) { - if (m_tb_tbb) { - var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); - var P=PH.getPluginTags({}); - for(var i=0; i<P.length; i++) { - if ("enabledState" in P[i]) { // FF24 - // FIXME: DOCDOC the reasoning for the isDisabled check, or remove it. - var isDisabled = (P[i].enabledState == Ci.nsIPluginTag.STATE_DISABLED); - if (!isDisabled && disable_plugins) - P[i].enabledState = Ci.nsIPluginTag.STATE_DISABLED; - else if (isDisabled && !disable_plugins) - P[i].enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY; - } else if (P[i].disabled != disable_plugins) { // FF17 - P[i].disabled=disable_plugins; - } - } + var PH=Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); + var P=PH.getPluginTags({}); + for(var i=0; i<P.length; i++) { + if ("enabledState" in P[i]) { // FF24 + // FIXME: DOCDOC the reasoning for the isDisabled check, or remove it. + var isDisabled = (P[i].enabledState == Ci.nsIPluginTag.STATE_DISABLED); + if (!isDisabled && disable_plugins) + P[i].enabledState = Ci.nsIPluginTag.STATE_DISABLED; + else if (isDisabled && !disable_plugins) + P[i].enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY; + } else if (P[i].disabled != disable_plugins) { // FF17 + P[i].disabled=disable_plugins; + } } } @@ -1434,7 +1410,7 @@ function torbutton_update_disk_prefs() { // No way to clear this beast during New Identity. Leave it off. //m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode); - if (m_tb_tbb) m_tb_prefs.setBoolPref("permissions.memory_only", mode); + m_tb_prefs.setBoolPref("permissions.memory_only", mode); // Third party abuse. Leave it off for now. //m_tb_prefs.setBoolPref("browser.cache.offline.enable", !mode); @@ -1535,10 +1511,6 @@ function torbutton_check_protections() document.getElementById("menu_newIdentity").disabled = true; document.getElementById("appMenuNewIdentity").disabled = true; } - - if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { - torbutton_inform_about_tbb(); - } } // -------------- HISTORY & COOKIES --------------------- @@ -1699,23 +1671,6 @@ function torbutton_do_startup() // Bug 30565: sync browser.privatebrowsing.autostart with security.nocertdb torbutton_update_disk_prefs(); - // #5758: Last ditch effort to keep Vanilla Torbutton users from totally - // being pwnt. This is a pretty darn ugly hack, too. But because of #5863, - // we really don't care about preserving the user's values for this. - if (!m_tb_tbb) { - // Bug 1506 P5: You have to set these two for non-TBB Firefoxen - m_tb_prefs.setBoolPref("network.websocket.enabled", false); - m_tb_prefs.setBoolPref("dom.indexedDB.enabled", false); - } - - // Still need this in case people shove this thing back into FF - if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { - var warning = torbutton_get_property_string("torbutton.popup.short_torbrowser"); - var title = torbutton_get_property_string("torbutton.title.prompt_torbrowser"); - var prompts = Services.prompt; - prompts.alert(null, title, warning); - } - // For general pref fixups to handle pref damage in older versions torbutton_fixup_old_prefs(); diff --git a/defaults/preferences/preferences.js b/defaults/preferences/preferences.js index 2d1bd99f..100302b7 100644 --- a/defaults/preferences/preferences.js +++ b/defaults/preferences/preferences.js @@ -42,7 +42,6 @@ pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); -pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true);

1 0

[tor-browser-build/master] Bug 25099: Set nightly version to tbb-nightly.$year.$month.$day
by gk＠torproject.org 19 Nov '19

19 Nov '19

commit 0f019cf3aa17c6b77bb8126a9c4bdf47886238cb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 7 18:16:06 2019 +0200 Bug 25099: Set nightly version to tbb-nightly.$year.$month.$day Include the current day in the nightly version number, so that each build gets a different version number. We get this version number using a perl function, and a "state" variable, so that the day when the build was started is used. This avoids issues when a build is started on a day but finishs on a different day. In the nightly directory, the builds are now stored using the version instead of just the date. We also allow overriding this version number by using the TORBROWSER_NIGHTLY_VERSION environment variable. This could be useful for example if you need to generate incremental mars for the version from the previous day. --- README | 2 +- projects/firefox/get-moz-build-date | 5 ++--- projects/release/config | 3 +-- rbm.conf | 9 ++++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README b/README index 6dc5112..d77a460 100644 --- a/README +++ b/README @@ -62,7 +62,7 @@ channel you want to build: You can find the build result in the directory release/unsigned/$version or alpha/unsigned/$version for release or alpha builds. The result of -nightly can be found in the nightly/$date directory. +nightly can be found in the nightly/$version directory. If you want to build for a specific platform only, append the platform name to the makefile target: diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index 4e55c92..e6989ff 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -6,9 +6,8 @@ use strict; die "wrong number of arguments" unless @ARGV == 2; my ($year, $version) = @ARGV; my $date; -if ($version eq 'tbb-nightly') { - my (undef, undef, undef, $day, $mon, $y) = localtime; - $date = sprintf("%d%02d%02d010101", $y + 1900, $mon + 1, $day); +if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { + $date = sprintf("%d%02d%02d010101", $1, $2, $3); } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/projects/release/config b/projects/release/config index c705a6f..17db3d0 100644 --- a/projects/release/config +++ b/projects/release/config @@ -4,7 +4,6 @@ output_dir: release var: signed_status: unsigned - today: '[% USE date; date.format(format = "%Y-%m-%d") %]' publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' containers_target: with_containers @@ -74,7 +73,7 @@ targets: output_dir: 'nightly' var: build_target: nightly - publish_dir: '[% c("var/today") %]' + publish_dir: '[% c("version") %]' alpha: output_dir: alpha diff --git a/rbm.conf b/rbm.conf index 4a90ccc..f0ae4f9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -147,7 +147,7 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: tbb-nightly + torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' torbrowser-testbuild: - testbuild @@ -508,5 +508,12 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return $out =~ m/^.*spec: 1\.[0-9]+\.[0-9]+(?:-dev)?$/m; }, + nightly_torbrowser_version => sub { + state $version = ''; + return $version if $version; + my (undef, undef, undef, $day, $mon, $year) = gmtime; + $version = sprintf("tbb-nightly.%u.%02u.%02u", $year + 1900, $mon + 1, $day); + return $version; + }, }, )

1 0