- tbb-commits - lists.torproject.org

[torbutton/master] Bug 26100: Update about:tor code after changes in the resource and js
by gk＠torproject.org 25 May '18

25 May '18

commit e37b97e4af14fdbccfcb485f6b4ecf136aeb2e18 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 17 16:13:47 2018 -0300 Bug 26100: Update about:tor code after changes in the resource and js code - Move all the resource files to the same directory and change the chrome.manifest file to allow them to be accessible by the chrome.[1] - jsversion.h was removed, we don't need to specify the JS version anymore.[2] - Since Torbutton has now logic to load the default preferences and we don't know when a string is a complex data, for the sake of simplicity, we are now retiring non-localized.properties and hard coding the about:tor in the preferences file. - Use tabbrowser-initialBrowser instead of content [1] https://bugzilla.mozilla.org/show_bug.cgi?id=863246 [2] https://bugzilla.mozilla.org/show_bug.cgi?id=1440043 --- src/chrome.manifest | 1 + src/chrome/content/aboutTor/aboutTor.xhtml | 4 ++-- src/chrome/content/locale/non-localized.properties | 6 ------ src/chrome/content/torbutton.js | 2 +- src/chrome/skin/aboutTor.css | 14 +++++++------- .../{content/aboutTor => skin}/onionArrow-extension.png | Bin .../{content/aboutTor => skin}/onionArrow-leftBend.png | Bin .../{content/aboutTor => skin}/onionArrow-rightBend.png | Bin .../{content/aboutTor => skin}/onionArrow-short.png | Bin src/chrome/{content/aboutTor => skin}/search.png | Bin src/chrome/{content/aboutTor => skin}/tor-off.png | Bin src/chrome/{content/aboutTor => skin}/tor-on.png | Bin src/defaults/preferences/preferences.js | 2 +- 13 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 230a1e6..7b57d39 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -6,6 +6,7 @@ overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome: overlay about:addons chrome://torbutton/content/torbutton-extensions.xul overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul resource torbutton ./ +resource torbutton-assets resource://torbutton/chrome/skin/ contentaccessible=yes # browser branding override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 0d8f680..5cb2a60 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -20,8 +20,8 @@ <head> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" - href="resource://torbutton/chrome/skin/aboutTor.css"/> -<script type="text/javascript;version=1.7"> + href="resource://torbutton-assets/aboutTor.css"/> +<script type="text/javascript"> <![CDATA[ window.addEventListener("pageshow", function() { let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); diff --git a/src/chrome/content/locale/non-localized.properties b/src/chrome/content/locale/non-localized.properties deleted file mode 100644 index dca7863..0000000 --- a/src/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/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 40d63fd..7f750bc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -664,7 +664,7 @@ function torbutton_get_toolbarbutton_xpos() { let tbItem = torbutton_get_toolbutton(); if (tbItem) { let tbItemRect = tbItem.getBoundingClientRect(); - let contentElem = document.getElementById("content"); + let contentElem = document.getElementById("tabbrowser-initialBrowser"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 873f6d0..62c9256 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -59,7 +59,7 @@ body:not([initialized]) { } body[toron] #torstatus-image { - background-image: url('chrome://torbutton/content/aboutTor/tor-on.png'); + background-image: url('chrome://torbutton/skin/tor-on.png'); } #torstatus-image { @@ -68,7 +68,7 @@ body[toron] #torstatus-image { left: 85px; height: 128px; width: 128px; - background-image: url('chrome://torbutton/content/aboutTor/tor-off.png'); + background-image: url('chrome://torbutton/skin/tor-off.png'); background-repeat: no-repeat; background-position: center; z-index: -1; @@ -84,23 +84,23 @@ body[toron] #torstatus-image { top: 4px; width: 30px; height: 36px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-short.png'); + background-image: url('chrome://torbutton/skin/onionArrow-short.png'); } #toolbarIconArrowVertExtension, #toolbarIconArrowHorzExtension { width: 11px; height: 11px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-extension.png'); + background-image: url('chrome://torbutton/skin/onionArrow-extension.png'); } #toolbarIconArrowBend { width: 22px; height: 22px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-leftBend.png'); + background-image: url('chrome://torbutton/skin/onionArrow-leftBend.png'); } #toolbarIconArrowBend[pos="right"] { - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-rightBend.png'); + background-image: url('chrome://torbutton/skin/onionArrow-rightBend.png'); } a { @@ -288,7 +288,7 @@ body .top div.hideIfTorIsUpToDate h1 { height: 34px; width: 33px; border: 0; - background: url('chrome://torbutton/content/aboutTor/search.png') no-repeat top left; + background: url('chrome://torbutton/skin/search.png') no-repeat top left; cursor: pointer; } diff --git a/src/chrome/content/aboutTor/onionArrow-extension.png b/src/chrome/skin/onionArrow-extension.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-extension.png rename to src/chrome/skin/onionArrow-extension.png diff --git a/src/chrome/content/aboutTor/onionArrow-leftBend.png b/src/chrome/skin/onionArrow-leftBend.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-leftBend.png rename to src/chrome/skin/onionArrow-leftBend.png diff --git a/src/chrome/content/aboutTor/onionArrow-rightBend.png b/src/chrome/skin/onionArrow-rightBend.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-rightBend.png rename to src/chrome/skin/onionArrow-rightBend.png diff --git a/src/chrome/content/aboutTor/onionArrow-short.png b/src/chrome/skin/onionArrow-short.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-short.png rename to src/chrome/skin/onionArrow-short.png diff --git a/src/chrome/content/aboutTor/search.png b/src/chrome/skin/search.png similarity index 100% rename from src/chrome/content/aboutTor/search.png rename to src/chrome/skin/search.png diff --git a/src/chrome/content/aboutTor/tor-off.png b/src/chrome/skin/tor-off.png similarity index 100% rename from src/chrome/content/aboutTor/tor-off.png rename to src/chrome/skin/tor-off.png diff --git a/src/chrome/content/aboutTor/tor-on.png b/src/chrome/skin/tor-on.png similarity index 100% rename from src/chrome/content/aboutTor/tor-on.png rename to src/chrome/skin/tor-on.png diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f61cb89..f51c7db 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -53,7 +53,7 @@ pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); // Browser home page: -pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); +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);

1 0

[torbutton/master] Bug 26100: Switch from Task.spawn to async/await
by gk＠torproject.org 25 May '18

25 May '18

commit c4a44294290fc96471646ae1ff39fb55d2dedf92 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon May 14 17:56:26 2018 -0300 Bug 26100: Switch from Task.spawn to async/await Mozilla switched from Task.spawn to async/await[1] and we should follow it since it makes the code simple. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1353542 --- src/chrome/content/tor-circuit-display.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 5bd02bc..7b12db0 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -28,7 +28,6 @@ let createTorCircuitDisplay = (function () { // Mozilla utilities const { Cu : utils , Ci : interfaces } = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/Task.jsm"); // Import the controller code. let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); @@ -59,8 +58,8 @@ let trimQuotes = s => s ? s.match(/^"(.*)"$/)[1] : undefined; // __getBridge(id)__. // Gets the bridge parameters for a given node ID. If the node // is not currently used as a bridge, returns null. -let getBridge = function* (controller, id) { - let bridges = yield controller.getConf("bridge"); +let getBridge = async function (controller, id) { + let bridges = await controller.getConf("bridge"); if (bridges) { for (let bridge of bridges) { if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { @@ -75,9 +74,9 @@ let getBridge = function* (controller, id) { // Returns the type, IP and country code of a node with given ID. // Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` // => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` -let nodeDataForID = function* (controller, id) { +let nodeDataForID = async function (controller, id) { let result = {}, - bridge = yield getBridge(controller, id); // type, ip, countryCode; + bridge = await getBridge(controller, id); // type, ip, countryCode; if (bridge) { result.type = "bridge"; result.bridgeType = bridge.type; @@ -89,14 +88,14 @@ let nodeDataForID = function* (controller, id) { result.type = "default"; // Get the IP address for the given node ID. try { - let statusMap = yield controller.getInfo("ns/id/" + id); + let statusMap = await controller.getInfo("ns/id/" + id); result.ip = statusMap.IP; } catch (e) { } } if (result.ip) { // Get the country code for the node's IP address. try { - let countryCode = yield controller.getInfo("ip-to-country/" + result.ip); + let countryCode = await controller.getInfo("ip-to-country/" + result.ip); result.countryCode = countryCode === "??" ? null : countryCode; } catch (e) { } } @@ -105,18 +104,18 @@ let nodeDataForID = function* (controller, id) { // __nodeDataForCircuit(controller, circuitEvent)__. // Gets the information for a circuit. -let nodeDataForCircuit = function* (controller, circuitEvent) { +let nodeDataForCircuit = async function (controller, circuitEvent) { let rawIDs = circuitEvent.circuit.map(circ => circ[0]), // Remove the leading '$' if present. ids = rawIDs.map(id => id[0] === "$" ? id.substring(1) : id); // Get the node data for all IDs in circuit. - return [for (id of ids) yield nodeDataForID(controller, id)]; + return Promise.all(ids.map(id => nodeDataForID(controller, id))); }; // __getCircuitStatusByID(aController, circuitID)__ // Returns the circuit status for the circuit with the given ID. -let getCircuitStatusByID = function* (aController, circuitID) { - let circuitStatuses = yield aController.getInfo("circuit-status"); +let getCircuitStatusByID = async function (aController, circuitID) { + let circuitStatuses = await aController.getInfo("circuit-status"); if (circuitStatuses) { for (let circuitStatus of circuitStatuses) { if (circuitStatus.id === circuitID) { @@ -139,22 +138,22 @@ let collectIsolationData = function (aController, updateUI) { return aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - streamEvent => Task.spawn(function* () { + async (streamEvent) => { if (!knownCircuitIDs[streamEvent.CircuitID]) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; - let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), + let circuitStatus = await getCircuitStatusByID(aController, streamEvent.CircuitID), credentials = circuitStatus ? (trimQuotes(circuitStatus.SOCKS_USERNAME) + "|" + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : null; if (credentials) { - let nodeData = yield nodeDataForCircuit(aController, circuitStatus); + let nodeData = await nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; updateUI(); } } - }).then(null, Cu.reportError)); + }); }; // __browserForChannel(channel)__.

1 0

[torbutton/master] Bug 26100: Load extension preferences during initialization
by gk＠torproject.org 25 May '18

25 May '18

commit e5ecb22e0f4bfec84935f8266cc1520642301660 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon May 14 17:56:18 2018 -0300 Bug 26100: Load extension preferences during initialization Mozilla removed the code that loads the default extension preferences[1]. Thus we need to load them in the startup time. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1413413 --- src/chrome/content/torbutton.js | 8 ++++---- src/components/cookie-jar-selector.js | 4 ++++ src/components/domain-isolator.js | 11 ++++++++--- src/components/dragDropFilter.js | 2 ++ src/components/startup-observer.js | 9 ++++++--- src/components/torbutton-logger.js | 19 ++++++++++--------- src/modules/default-prefs.js | 30 ++++++++++++++++++++++++++++++ 7 files changed, 64 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index cf39dc2..40d63fd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1217,7 +1217,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); torbutton_log(3, "New Identity: Clearing permissions"); @@ -1634,7 +1634,7 @@ function torbutton_update_disk_prefs() { } catch (e) {} // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } function torbutton_update_fingerprinting_prefs() { @@ -1667,7 +1667,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } function torbutton_update_isolation_prefs() { @@ -1682,7 +1682,7 @@ function torbutton_update_isolation_prefs() { m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } // This function closes all XUL browser windows except this one. For this diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index 4f137d7..8456da3 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -19,6 +19,10 @@ const kMODULE_CONTRACTID = "@torproject.org/cookie-jar-selector;1"; const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be"); const Cr = Components.results; +const Cu = Components.utils; + +Cu.import("resource://torbutton/modules/default-prefs.js", {}) + .ensureDefaultPrefs(); // XXX: Must match the definition in torcookie.js :/ function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession, diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a52cccc..a698439 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -16,6 +16,12 @@ const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; +let { ensureDefaultPrefs } = Cu.import("resource://torbutton/modules/default-prefs.js", {}); +ensureDefaultPrefs(); + +// Import Services object +Cu.import("resource://gre/modules/Services.jsm"); + // Import crypto object (FF 37+). Cu.importGlobalProperties(["crypto"]); @@ -165,6 +171,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); function DomainIsolator() { this.wrappedJSObject = this; } + // Firefox component requirements DomainIsolator.prototype = { QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), @@ -175,9 +182,7 @@ DomainIsolator.prototype = { if (topic === "profile-after-change") { logger.eclog(3, "domain isolator: set up isolating circuits by domain"); - let prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - if (prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + if (Services.prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { tor.isolationEnabled = false; } tor.isolateCircuitsByDomain(); diff --git a/src/components/dragDropFilter.js b/src/components/dragDropFilter.js index 22dde86..916b835 100644 --- a/src/components/dragDropFilter.js +++ b/src/components/dragDropFilter.js @@ -9,6 +9,8 @@ const Cc = Components.classes; const Ci = Components.interfaces; const Cu = Components.utils; +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); // Module specific constants diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index dac7aff..144d600 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -22,6 +22,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm"); +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); // Module specific constants const kMODULE_NAME = "Startup"; @@ -96,7 +97,9 @@ StartupObserver.prototype = { let tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports).wrappedJSObject; socksPortInfo = tlps.TorGetSOCKSPortInfo(); - } catch(e) {} + } catch(e) { + this.logger.log(3, "tor launcher failed " + e); + } // If Tor Launcher is not available, check environment variables. if (!socksPortInfo) { @@ -143,7 +146,7 @@ StartupObserver.prototype = { } // Force prefs to be synced to disk - this._prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); this.logger.log(3, "Synced network settings to environment."); }, @@ -158,7 +161,7 @@ StartupObserver.prototype = { } // In all cases, force prefs to be synced to disk - this._prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); }, QueryInterface: function(iid) { diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index 18a5f1e..b25d039 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -16,17 +16,18 @@ const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); const Cr = Components.results; const Cc = Components.classes; const Ci = Components.interfaces; +const Cu = Components.utils; -function TorbuttonLogger() { - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); + +Cu.import("resource://gre/modules/Services.jsm"); +function TorbuttonLogger() { // Register observer - this._branch = this.prefs.QueryInterface(Components.interfaces.nsIPrefBranch); - this._branch.addObserver("extensions.torbutton", this, false); + Services.prefs.addObserver("extensions.torbutton", this, false); - this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel"); - this.logmethod = this.prefs.getIntPref("extensions.torbutton.logmethod"); + this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); + this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); try { var logMngr = Components.classes["@mozmonkey.com/debuglogger/manager;1"] @@ -152,10 +153,10 @@ TorbuttonLogger.prototype = if (topic != "nsPref:changed") return; switch (data) { case "extensions.torbutton.logmethod": - this.logmethod = this.prefs.getIntPref("extensions.torbutton.logmethod"); + this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); break; case "extensions.torbutton.loglevel": - this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel"); + this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); break; } } diff --git a/src/modules/default-prefs.js b/src/modules/default-prefs.js new file mode 100644 index 0000000..d4c948f --- /dev/null +++ b/src/modules/default-prefs.js @@ -0,0 +1,30 @@ +let loaded = false; + +function ensureDefaultPrefs () { + if (loaded) { + return; + } + Components.utils.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`); + } + } + }; + Services.scriptloader.loadSubScript(kDefaultPreferences, context); + loaded = true; +} + +let EXPORTED_SYMBOLS = ["ensureDefaultPrefs"];

1 0

[torbutton/master] Bug 26100: Update deprecated JS and CSS code
by gk＠torproject.org 25 May '18

25 May '18

commit 3047f3fcb9c606a659c6e7ffa7e4d97e33cd0ebe Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:38:59 2018 -0300 Bug 26100: Update deprecated JS and CSS code - catch statement can not have if statements. https://bugzilla.mozilla.org/show_bug.cgi?id=1228841 - Use 0o to represent octal numbers. https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 - remove -moz- prefix in css https://bugzilla.mozilla.org/show_bug.cgi?id=1270406 --- src/chrome/content/torbutton.js | 9 ++++++--- src/chrome/skin/aboutTor.css | 6 +++--- src/chrome/skin/tor-circuit-display.css | 4 ++-- src/components/cookie-jar-selector.js | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d744d15..4b15c5f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1140,9 +1140,12 @@ function torbutton_do_new_identity() { // #5715 also makes this synchronous. So we pass a null callback. try { appCacheStorage.asyncEvictStorage(null); - } catch (err if err.name == 'NS_ERROR_NOT_AVAILABLE') { - // We ignore "not available" errors because they occur if a cache - // has not been used, e.g., if no browsing has been done. + } catch (err) { + // We ignore "not available" errors because they occur if a cache + // has not been used, e.g., if no browsing has been done. + if (err.name !== 'NS_ERROR_NOT_AVAILABLE') { + throw err; + } } } } catch(e) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 7ba7e7c..873f6d0 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -25,11 +25,11 @@ body { } body { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); } body[toron] { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); } /* Hide the entire document by default to avoid showing the incorrect @@ -221,7 +221,7 @@ body .top div.hideIfTorIsUpToDate h1 { padding: 5px 0 0 22px; } -#middle ul:-moz-dir(rtl) { +#middle ul:dir(rtl) { padding: 5px 22px 0 0; } diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 640d595..c9e682a 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -21,7 +21,7 @@ and lines drawn between them to represent Tor network inter-relay connections. width: 100%; } -#circuit-display-content:-moz-locale-dir(rtl) { +#circuit-display-content:dir(rtl) { background-position: calc(100% - 1em) 1em; } @@ -65,7 +65,7 @@ ul#circuit-display-nodes li { white-space: nowrap; } -ul#circuit-display-nodes li:-moz-locale-dir(rtl) { +ul#circuit-display-nodes li:dir(rtl) { background-position: right center; } diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index f6d579e..4f137d7 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -143,7 +143,7 @@ function CookieJarSelector() { var file = getProfileFile("cookies-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["cookiesobj-" + name]); foStream.write(data, data.length); foStream.close(); @@ -154,7 +154,7 @@ function CookieJarSelector() { var file = getProfileFile("protected-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["protected-" + name]); foStream.write(data, data.length); foStream.close();

1 0

[tor-launcher/master] Synchronize some prefs.js and get{Bool, Char, Int}Pref() defaults
by gk＠torproject.org 23 May '18

23 May '18

commit 51c1dfb76f02f870b60b7b3cdf86cc36b85eec2f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 15 22:35:09 2018 +0000 Synchronize some prefs.js and get{Bool,Char,Int}Pref() defaults --- src/chrome/content/network-settings.js | 3 ++- src/components/tl-process.js | 3 ++- src/components/tl-protocol.js | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index dc3c9ab..f86402d 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2533,7 +2533,8 @@ function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) aMeekClientPath, aMeekClientArgs) .then(()=> { - let bridgeType = TorLauncherUtil.getCharPref(kPrefBridgeDBType); + let bridgeType = TorLauncherUtil.getCharPref(kPrefBridgeDBType, + "obfs4"); moatRequestor.fetchBridges([bridgeType]) .then(aCaptchaInfo => { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1c67817..615227f 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -455,7 +455,8 @@ TorProcessService.prototype = if (socksPortArg) { let socksPortFlags = TorLauncherUtil.getCharPref( - "extensions.torlauncher.socks_port_flags"); + "extensions.torlauncher.socks_port_flags", + "IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); if (socksPortFlags) socksPortArg += ' ' + socksPortFlags; args.push("+__SocksPort"); diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 6659621..a5fd1d9 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -53,7 +53,7 @@ function TorProtocolService() this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); let useIPC = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.control_port_use_ipc", true); + "extensions.torlauncher.control_port_use_ipc", false); if (!this.mControlHost && !this.mControlPort && useIPC) this.mControlIPCFile = TorLauncherUtil.getTorFile("control_ipc", false); else @@ -157,7 +157,7 @@ function TorProtocolService() if (useIPC === undefined) { useIPC = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.socks_port_use_ipc", true); + "extensions.torlauncher.socks_port_use_ipc", false); } // Fill in missing SOCKS info from prefs. @@ -183,6 +183,7 @@ function TorProtocolService() { let socksPort = TorLauncherUtil.getIntPref("network.proxy.socks_port", 0); + // This pref is set as 0 by default in Firefox, use 9150 if we get 0. this.mSOCKSPortInfo.port = (socksPort != 0) ? socksPort : 9150; } } @@ -1506,7 +1507,7 @@ TorProtocolService.prototype = else { var maxEntries = - TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 0); + TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 1000); if ((maxEntries > 0) && (this.mTorLog.length >= maxEntries)) this.mTorLog.splice(0, 1); }

1 0

[tor-launcher/master] Merge remote-tracking branch 'sysrqb/bug25750_6'
by gk＠torproject.org 23 May '18

23 May '18

commit b15da273aa1c6de5a1725e24a171ad043864bf69 Merge: 9aa5fd4 51c1dfb Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 23 18:07:50 2018 +0000 Merge remote-tracking branch 'sysrqb/bug25750_6' src/chrome/content/network-settings.js | 3 +- src/components/tl-process.js | 31 +++++++-- src/components/tl-protocol.js | 25 ++++---- src/install.rdf | 8 +++ src/modules/tl-logger.jsm | 6 +- src/modules/tl-util.jsm | 114 ++++++++++++++++++++++++++++++++- 6 files changed, 163 insertions(+), 24 deletions(-)

1 0

[tor-launcher/master] Load default prefs during initialization
by gk＠torproject.org 23 May '18

23 May '18

commit 949379555010a04633c64b08ed52896a86c2cce6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri May 4 14:26:32 2018 +0000 Load default prefs during initialization In bug 1413413 Mozilla ripped out support for loading default prefs from extensions. Unfortunately, backing out that changeset is non-trivial so it is easier if we set the default prefs manually. Here we define a function named pref() and it sets the preference based on the type of the pref's value. We only support a few types: boolean, number, and string. All other types are handled by the default case where a message is logged and the pref is skipped. The default prefs must be set before Tor Launcher begins making decisions based on them. An exception is thrown with Cr.NS_ERROR_NOT_INITIALIZED when this requirement is violated. --- src/components/tl-process.js | 23 ++++++++- src/modules/tl-util.jsm | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 8d3efb7..1c67817 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -19,6 +19,13 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", function TorProcessService() { + this.mDefaultPreferencesAreLoaded = TorLauncherUtil.loadDefaultPreferences(); + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("Setting (some) default preferences failed!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + this.wrappedJSObject = this; this.mProtocolSvc = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports).wrappedJSObject; @@ -98,6 +105,13 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, kUserQuitTopic, false); this.mObsSvc.addObserver(this, kBootstrapStatusTopic, false); + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("Default preferences not loaded at " + + "profile-after-change notification!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + if (TorLauncherUtil.shouldOnlyConfigureTor) { this._controlTor(true, false); @@ -304,6 +318,13 @@ TorProcessService.prototype = TorStartAndControlTor: function(aForceDisableNetwork) { + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("TorLauncher is starting Tor but " + + "the default preferences were not set!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + this._startTor(aForceDisableNetwork); let isRunningTor = (this.mTorProcessStatus == this.kStatusStarting) || (this.mTorProcessStatus == this.kStatusRunning); @@ -333,7 +354,7 @@ TorProcessService.prototype = mQuitSoon: false, // Quit was requested by the user; do so soon. mLastTorWarningPhase: null, mLastTorWarningReason: null, - + mDefaultPreferencesAreLoaded: false, // Private Methods ///////////////////////////////////////////////////////// _startTor: function(aForceDisableNetwork) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index d669112..292f88b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -226,6 +226,11 @@ let TorLauncherUtil = // Public }, // Preferences + loadDefaultPreferences: function() + { + return TLUtilInternal._loadPreferences(); + }, + getBoolPref: function(aPrefName, aDefaultVal) { var rv = (undefined != aDefaultVal) ? aDefaultVal : false; @@ -749,6 +754,9 @@ let TLUtilInternal = // Private mAppDir: null, // nsIFile (cached; access via this._appDir) mDataDir: null, // nsIFile (cached; access via this._dataDir) mIsFirstIPCPathRequest : true, + mNumDefaultPrefsDefined: 0, + mNumDefaultPrefsLoaded: 0, + mDefaultPreferencesLoaded: false, _init: function() { @@ -756,6 +764,106 @@ let TLUtilInternal = // Private .getService(Ci.nsIPrefBranch); }, + _getPrefDefaultBranch: function(aBranchName) + { + return Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefService) + .getDefaultBranch(aBranchName); + }, + + _setPref: function(aSetPrefFunc, aPrefName, aValue) + { + try + { + aSetPrefFunc(aPrefName, aValue); + } + catch(e) + { + TorLauncherLogger.log(5, "Setting default pref '" + aPrefName + + "' threw exception: " + e); + return false; + } + + return true; + }, + + pref: function (aPrefName, aValue) + { + // Increment this counter for each pref() call. + this.mNumDefaultPrefsDefined += 1; + + let lastPeriod = aPrefName.lastIndexOf("."); + // This pref doesn't contain a period (".") + // or the period is the first character. + if (lastPeriod == 0 || lastPeriod == -1) + { + TorLauncherLogger.log(5, "Ignoring invalid pref '" + aPrefName + "'"); + return; + } + // This pref has a period at the last character, we can't set + // a default value on a pref root. + if (aPrefName.length == (lastPeriod + 1)) + { + TorLauncherLogger.log(5, + "Ignoring invalid pref ending with a period: '" + aPrefName + "'"); + return; + } + + let prefRoot = aPrefName.substring(0, lastPeriod + 1); + let defaultBranch = this._getPrefDefaultBranch(prefRoot); + let prefName = aPrefName.substring(lastPeriod + 1); + let setPrefFunc; + switch (typeof aValue) + { + case "boolean": + setPrefFunc = defaultBranch.setBoolPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + case "number": + setPrefFunc = defaultBranch.setIntPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + case "string": + setPrefFunc = defaultBranch.setCharPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + default: + TorLauncherLogger.log(5, "Cowardly not setting pref '" + + aPrefName + "' of type '" + (typeof aValue) + "'"); + return; + } + + // Increment this counter for each pref() call where the default preference + // was successfully set. + this.mNumDefaultPrefsLoaded += 1; + }, + + _loadPreferences: function() + { + if (this.mDefaultPreferencesLoaded) + { + return this.mDefaultPreferencesLoaded; + } + + var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"] + .getService(Ci.mozIJSSubScriptLoader); + loader.loadSubScript( + "resource://torlauncher/defaults/preferences/prefs.js", this); + + this.mDefaultPreferencesLoaded = + (this.mNumDefaultPrefsDefined == this.mNumDefaultPrefsLoaded); + return this.mDefaultPreferencesLoaded; + }, + get _stringBundle() { if (!this.mStringBundle)

1 0

[tor-launcher/master] Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat
by gk＠torproject.org 23 May '18

23 May '18

commit eccf3749f046da385eae27176f4c9e692a5784ff Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri May 4 21:17:32 2018 +0000 Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat In bug 1313625 Mozilla ripped out support for nsIScriptableDateFormat because ECMAScript now has support for this. This change is based on bug 1383463. --- src/components/tl-protocol.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 79b327e..6659621 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -13,6 +13,7 @@ const Cr = Components.results; const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", @@ -636,10 +637,6 @@ TorProtocolService.prototype = let s = ""; if (this.mTorLog) { - let dateFmtSvc = Cc["@mozilla.org/intl/scriptabledateformat;1"] - .getService(Ci.nsIScriptableDateFormat); - let dateFormat = dateFmtSvc.dateFormatShort; - let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour; let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n"; let count = this.mTorLog.length; if (aCountObj) @@ -648,12 +645,16 @@ TorProtocolService.prototype = { let logObj = this.mTorLog[i]; let secs = logObj.date.getSeconds(); - let timeStr = dateFmtSvc.FormatDateTime("", dateFormat, timeFormat, - logObj.date.getFullYear(), logObj.date.getMonth() + 1, - logObj.date.getDate(), logObj.date.getHours(), - logObj.date.getMinutes(), secs); + + let options = { year: '2-digit', month: 'numeric', day: 'numeric', + hour: 'numeric', minute: 'numeric', second: 'numeric', + hour12: false }; + let timeStr = new Intl.DateTimeFormat('en-US', options) + .format(logObj.date, options); + if (' ' == timeStr.substr(-1)) timeStr = timeStr.substr(0, timeStr.length - 1); + let fracSecsStr = "" + logObj.date.getMilliseconds(); while (fracSecsStr.length < 3) fracSecsStr += "0";

1 0

[tor-launcher/master] Mozilla ripped out nsIPrefBranchInternal
by gk＠torproject.org 23 May '18

23 May '18

commit a2a42c64de4322f96a77451e64e839ada353eda7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:56:38 2018 +0000 Mozilla ripped out nsIPrefBranchInternal Apparently nsIPrefBranchInternal was a trivial subclass of nsIPrefBranch, so we simply switch which class we use. https://bugzilla.mozilla.org/show_bug.cgi?id=1374847 --- src/modules/tl-logger.jsm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index 19168d2..a2ea404 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Based on torbutton-logger.js (pull in copyright and license?) // @@ -108,8 +108,8 @@ let TLLoggerInternal = // Private { // Register observer var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranchInternal) - .QueryInterface(Ci.nsIPrefBranchInternal); + .getService(Ci.nsIPrefBranch) + .QueryInterface(Ci.nsIPrefBranch); prefs.addObserver("extensions.torlauncher", this, false); this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-launcher/master] Fix deprecated octal literals
by gk＠torproject.org 23 May '18

23 May '18

commit c5cf235c8f530ef5dc64eea3bb404ca0d48eb0a8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:50:01 2018 +0000 Fix deprecated octal literals See https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 --- src/components/tl-process.js | 2 +- src/modules/tl-util.jsm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 74d5f41..8d3efb7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -978,7 +978,7 @@ TorProcessService.prototype = let stream = Cc["@mozilla.org/network/safe-file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); stream.init(aFile, 0x02 | 0x08 | 0x20, /* WRONLY CREATE TRUNCATE */ - 0600, 0); + 0o600, 0); stream.write(data, data.length); stream.QueryInterface(Ci.nsISafeOutputStream).finish(); } diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index a79e2bd..d669112 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -658,9 +658,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - torFile.create(torFile.DIRECTORY_TYPE, 0700); + torFile.create(torFile.DIRECTORY_TYPE, 0o700); else - torFile.create(torFile.NORMAL_FILE_TYPE, 0600); + torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); } catch (e) { @@ -883,7 +883,7 @@ let TLUtilInternal = // Private let d = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); d.initWithPath(aBasePath); d.append("Tor"); - d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0700); + d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700); return d; } catch (e)

1 0