- tbb-commits - lists.torproject.org

[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: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 25 May '18

25 May '18

commit 399d2ba81505e4a74535b61f60563f4a9c2a8f6d Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 13:43:48 2018 -0300 Bug 26100: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. See https://bugzilla.mozilla.org/show_bug.cgi?id=1414390 --- src/chrome/content/aboutTor/aboutTor-content.js | 6 ++++-- src/chrome/content/menu-overlay.xul | 2 +- src/chrome/content/preferences.js | 5 ++++- src/chrome/content/torbutton.js | 10 +++++----- src/modules/utils.js | 10 ++++++++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ec515bb..1a8d5cf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -67,8 +67,10 @@ var AboutTorListener = { onPageLoad: function() { // Arrange to update localized text and links. - bindPrefAndInit("general.useragent.locale", aNewVal => { - this.onLocaleChange(aNewVal); + bindPrefAndInit("intl.locale.requested", aNewVal => { + if (aNewVal !== null) { + this.onLocaleChange(aNewVal); + } }); // Add message and event listeners. diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 53654c5..f6c6fbd 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -22,6 +22,6 @@ position="1" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;" - oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.prefs.getCharPref('general.useragent.locale'))" /> + oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.getRequestedLocale())" /> </menupopup> </overlay> diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 721ff46..36c8818 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -5,6 +5,9 @@ let { utils: Cu } = Components; let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; +let { getLocale } = + Cu.import("resource://torbutton/modules/utils.js", {}); + // Description elements have the follow names. const descNames = [, "desc_safest", "desc_safer", "desc_standard"]; @@ -67,7 +70,7 @@ function torbutton_set_learn_more_links() { let show_manual = window.opener.torbutton_show_torbrowser_manual(); let locale = "" if (show_manual) { - locale = getCharPref('general.useragent.locale'); + locale = getLocale(); } let links = linkNames.map(name => document.getElementById(name)); links.forEach(link => {; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2f1f689..d744d15 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -10,7 +10,7 @@ let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); @@ -818,14 +818,14 @@ function torbutton_update_toolbutton() // Bug 1506 P3: Support code for language+uagent spoofing function torbutton_get_general_useragent_locale() { try { - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); + const locale = getLocale(); if (/chrome:\/\//.test(locale)) { - return m_tb_prefs.getComplexValue("general.useragent.locale", + return m_tb_prefs.getComplexValue("intl.locale.requested", Components.interfaces.nsIPrefLocalizedString).data; } return locale; } catch(err) { - torbutton_log(4, "Error while getting general.useragent.locale:" + err); + torbutton_log(4, "Error while getting locale" + err); return 'en-US'; } } @@ -2380,7 +2380,7 @@ function torbutton_show_torbrowser_manual() { // torbutton_show_torbrowser_manual() returns true. function torbutton_init_user_manual_links() { let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("general.useragent.locale", val => { + bindPrefAndInit("intl.locale.requested", val => { menuitem.hidden = !torbutton_show_torbrowser_manual(); torbutton_abouttor_message_handler.updateAllOpenPages(); }); diff --git a/src/modules/utils.js b/src/modules/utils.js index fa4405e..0a2649d 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -79,6 +79,12 @@ var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; }; +// __getLocale +// Reads the browser locale, the default locale is en-US. +var getLocale = function() { + return Services.locale.getRequestedLocale() || "en-US"; +} + // ## Windows // __dialogsByName__. @@ -200,5 +206,5 @@ var unescapeTorString = function(str) { }; // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getPrefValue", - "observe", "showDialog", "unescapeTorString"]; +let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", + "getPrefValue", "observe", "showDialog", "unescapeTorString"];

1 0

[torbutton/master] Bug 26100: Update xmlhttprequest calls after changes in xpcom interface
by gk＠torproject.org 25 May '18

25 May '18

commit 91f1c5deae6fb8415e0c22a99d4c0c3eac7db7b5 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:42:33 2018 -0300 Bug 26100: Update xmlhttprequest calls after changes in xpcom interface The xmlhttprequest xpcom interface was deprecated in favor of the XMLHttpRequest. --- src/chrome/content/torbutton.js | 12 +++++++----- src/components/torCheckService.js | 5 ++--- src/components/torbutton-logger.js | 4 +--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4b15c5f..cf39dc2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,13 +7,14 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +Cu.importGlobalProperties(["XMLHttpRequest"]); + const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; @@ -733,9 +734,7 @@ function torbutton_do_async_versioncheck() { torbutton_log(3, "Checking version with socks port: " +m_tb_prefs.getIntPref("network.proxy.socks_port")); try { - var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Components.interfaces.nsIXMLHttpRequest); - //var req = new XMLHttpRequest(); Blocked by content policy + var req = new XMLHttpRequest(); var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); req.open('GET', url, true); req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; @@ -1130,6 +1129,9 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing Offline Cache"); try { + const LoadContextInfo = Cc["@mozilla.org/load-context-info-factory;1"] + .getService(Ci.nsILoadContextInfoFactory); + for (let contextInfo of [LoadContextInfo.default, LoadContextInfo.private]) { let appCacheStorage = Services.cache2.appCacheStorage(contextInfo, null); // The following call (asyncEvictStorage) is actually synchronous, either @@ -2023,7 +2025,7 @@ let stopLanguagePromptObserver; function torbutton_new_window(event) { torbutton_log(3, "New window"); - var browser = getBrowser(); + var browser = window.gBrowser; if(!browser) { torbutton_log(5, "No browser for new window."); diff --git a/src/components/torCheckService.js b/src/components/torCheckService.js index 04708d4..19e13f4 100644 --- a/src/components/torCheckService.js +++ b/src/components/torCheckService.js @@ -77,9 +77,8 @@ TBTorCheckService.prototype = createCheckRequest: function(aAsync) { - let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Ci.nsIXMLHttpRequest); - //let req = new XMLHttpRequest(); Blocked by content policy + Cu.importGlobalProperties(["XMLHttpRequest"]); + let req = new XMLHttpRequest(); let prefs = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefBranch); let url = prefs.getCharPref("extensions.torbutton.test_url"); diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index 620113f..18a5f1e 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -22,9 +22,7 @@ function TorbuttonLogger() { .getService(Components.interfaces.nsIPrefBranch); // Register observer - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); + this._branch = this.prefs.QueryInterface(Components.interfaces.nsIPrefBranch); this._branch.addObserver("extensions.torbutton", this, false); this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel");

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

[tor-launcher/master] Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT
by gk＠torproject.org 23 May '18

23 May '18

commit 9fa37a1fbf6ed9f004f70cccac762a0e4ed454b3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:44:18 2018 +0000 Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT See https://bugzilla.mozilla.org/show_bug.cgi?id=1149830#c18 --- src/components/tl-process.js | 3 +-- src/components/tl-protocol.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..74d5f41 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2017, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -272,7 +272,6 @@ TorProcessService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation. diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index ab33bd3..79b327e 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -256,7 +256,6 @@ TorProtocolService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation.

1 0

[tor-launcher/master] Add fennec target application
by gk＠torproject.org 23 May '18

23 May '18

commit 785568d05b12f819a29b90c2dcd4e55b821a2047 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:43:05 2018 +0000 Add fennec target application --- src/install.rdf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..a71a21a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -39,6 +39,14 @@ <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication> +  + <em:targetApplication> + <Description> + <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id> + <em:minVersion>45.0</em:minVersion> + <em:maxVersion>*</em:maxVersion> + </Description> + </em:targetApplication> </Description> </RDF>

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] 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