- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit e1e1f70187dc106628e8e8c58ecbe23976b31131 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 16 23:01:12 2019 +0200 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. --- netwerk/url-classifier/UrlClassifierFeatureBase.cpp | 2 +- netwerk/url-classifier/components.conf | 6 ------ toolkit/components/search/SearchService.jsm | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp index 1d344f92c201..1537fd6c6e8e 100644 --- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp +++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp @@ -75,7 +75,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { nsCOMPtr<nsIUrlClassifierSkipListService> skipListService = do_GetService("@mozilla.org/url-classifier/skip-list-service;1"); - if (NS_WARN_IF(!skipListService)) { + if (!skipListService) { return; } diff --git a/netwerk/url-classifier/components.conf b/netwerk/url-classifier/components.conf index 6dbd57d4232f..acc3fbd3ae5d 100644 --- a/netwerk/url-classifier/components.conf +++ b/netwerk/url-classifier/components.conf @@ -5,10 +5,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. Classes = [ - { - 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}', - 'contract_ids': ['@mozilla.org/url-classifier/skip-list-service;1'], - 'jsm': 'resource://gre/modules/UrlClassifierSkipListService.jsm', - 'constructor': 'UrlClassifierSkipListService', - }, ] diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index 6d6314c6cd4f..3fd4a6d1709b 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -694,8 +694,6 @@ SearchService.prototype = { await this._ensureKnownRegionPromise; } - this._setupRemoteSettings().catch(Cu.reportError); - await this._loadEngines(cache); // Make sure the current list of engines is persisted, without the need to wait.

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 32111: Fixed issue parsing user-provided brige strings
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 83a889d1fcdc8cb01497faaa225987e22d91d94b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 17 11:20:35 2019 +0000 fixup! Bug 32111: Fixed issue parsing user-provided brige strings --- browser/components/torpreferences/content/parseFunctions.jsm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/components/torpreferences/content/parseFunctions.jsm b/browser/components/torpreferences/content/parseFunctions.jsm index 5873c6339983..954759de63a5 100644 --- a/browser/components/torpreferences/content/parseFunctions.jsm +++ b/browser/components/torpreferences/content/parseFunctions.jsm @@ -53,7 +53,7 @@ let parseUsernamePassword = function(aUsernameColonPassword) { return [username, password]; }; -// expect string in the format: ADDRESS:PORT,ADDRESS:PORT,... +// expects a string in the format: ADDRESS:PORT,ADDRESS:PORT,... // returns array of ports (as ints) let parseAddrPortList = function(aAddrPortList) { let addrPorts = aAddrPortList.split(","); @@ -62,7 +62,7 @@ let parseAddrPortList = function(aAddrPortList) { return retval; }; -// expects a '/n' or '/r/n' delimited string of bridge string, which we split and trim +// expects a '/n' or '/r/n' delimited bridge string, which we split and trim // each bridge string can also optionally have 'bridge' at the beginning ie: // bridge $(type) $(address):$(port) $(certificate) // we strip out the 'bridge' prefix here @@ -73,9 +73,9 @@ let parseBridgeStrings = function(aBridgeStrings) { // then replace contiguous new lines ('\n') with a single one aBridgeStrings = aBridgeStrings.replace(/[\n]+/g, "\n"); - // split on the newline and foreach bridge string: trim, remove starting 'bridge' string - // finally discard entries that are empty string; empty string could occur if we receive - // a new line containing only whitespace + // split on the newline and for each bridge string: trim, remove starting 'bridge' string + // finally discard entries that are empty strings; empty strings could occur if we receive + // a new line containing only whitespace let splitStrings = aBridgeStrings.split("\n"); return splitStrings.map(val => val.trim().replace(/^bridge\s+/i, "")) .filter(bridgeString => bridgeString != "");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 32111: Fixed issue parsing user-provided brige strings
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 7aca86c1666873378ab6b9845acdee93b16468a9 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 16 14:37:27 2019 -0700 Bug 32111: Fixed issue parsing user-provided brige strings Fixed parseBridgeStrings function in parseFunctions.jsm to now discard 'bridge' string prefix in user-provided bridge strings. Also now properly handling carriage returns ('\r') in bridge strings. --- .../torpreferences/content/parseFunctions.jsm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/browser/components/torpreferences/content/parseFunctions.jsm b/browser/components/torpreferences/content/parseFunctions.jsm index a6e6c554ca63..5873c6339983 100644 --- a/browser/components/torpreferences/content/parseFunctions.jsm +++ b/browser/components/torpreferences/content/parseFunctions.jsm @@ -53,7 +53,7 @@ let parseUsernamePassword = function(aUsernameColonPassword) { return [username, password]; }; -// expects tring in the format: ADDRESS:PORT,ADDRESS:PORT,... +// expect string in the format: ADDRESS:PORT,ADDRESS:PORT,... // returns array of ports (as ints) let parseAddrPortList = function(aAddrPortList) { let addrPorts = aAddrPortList.split(","); @@ -62,10 +62,23 @@ let parseAddrPortList = function(aAddrPortList) { return retval; }; -// expects a '/n' delimited string of bridge string, which we split and trim +// expects a '/n' or '/r/n' delimited string of bridge string, which we split and trim +// each bridge string can also optionally have 'bridge' at the beginning ie: +// bridge $(type) $(address):$(port) $(certificate) +// we strip out the 'bridge' prefix here let parseBridgeStrings = function(aBridgeStrings) { + + // replace carriage returns ('\r') with new lines ('\n') + aBridgeStrings = aBridgeStrings.replace(/\r/g, "\n"); + // then replace contiguous new lines ('\n') with a single one + aBridgeStrings = aBridgeStrings.replace(/[\n]+/g, "\n"); + + // split on the newline and foreach bridge string: trim, remove starting 'bridge' string + // finally discard entries that are empty string; empty string could occur if we receive + // a new line containing only whitespace let splitStrings = aBridgeStrings.split("\n"); - return splitStrings.map(val => val.trim()); + return splitStrings.map(val => val.trim().replace(/^bridge\s+/i, "")) + .filter(bridgeString => bridgeString != ""); }; // expecting a ',' delimited list of ints with possible white space between

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 31749: Fix security level panel spawning events
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit f17113f06b92a16e01973b1f05b795ed321ffc7f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 17 10:21:51 2019 +0000 fixup! Bug 31749: Fix security level panel spawning events --- browser/components/securitylevel/content/securityLevel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 698af8f7297f..7b3e7e4f92f9 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -160,10 +160,10 @@ const SecurityLevelButton = { } }, - // for when the toolbar button needs to be activated and display the Security Level panel + // for when the toolbar button needs to be activated and displays the Security Level panel // // In the toolbarbutton xul you'll notice we register this callback for both onkeypress and - // onmousedown. We do this so match the behavior of other panel spawning buttons such as Downloads, + // onmousedown. We do this to match the behavior of other panel spawning buttons such as Downloads, // Library, and the Hamburger menus. Using oncommand alone would result in only getting fired // after onclick, which is mousedown followed by mouseup. onCommand : function(aEvent) {

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31749: Fix security level panel spawning events
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 071eea2a3b95c686b4a044481a975131a3261a34 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 16 15:35:33 2019 -0700 Bug 31749: Fix security level panel spawning events Fixed logic for when the Security Level panel is spawned based on input to mirror behavior of Downloads, Library and Hamburger menus. The panel now spawns on left-mouse button down, and on keyboard activation when user presses 'space' or 'enter'. --- .../components/securitylevel/content/securityLevel.js | 19 ++++++++++++++++--- .../securitylevel/content/securityLevelButton.inc.xul | 3 ++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 11dac5667e61..698af8f7297f 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -160,12 +160,25 @@ const SecurityLevelButton = { } }, - // when toolbar button is pressed - onCommand : function(event) { + // for when the toolbar button needs to be activated and display the Security Level panel + // + // In the toolbarbutton xul you'll notice we register this callback for both onkeypress and + // onmousedown. We do this so match the behavior of other panel spawning buttons such as Downloads, + // Library, and the Hamburger menus. Using oncommand alone would result in only getting fired + // after onclick, which is mousedown followed by mouseup. + onCommand : function(aEvent) { + // snippet stolen from /browser/components/downloads/indicator.js DownloadsIndicatorView.onCommand(evt) + if ( + (aEvent.type == "mousedown" && aEvent.button != 0) || + (aEvent.type == "keypress" && aEvent.key != " " && aEvent.key != "Enter") + ) { + return; + } + // we need to set this attribute for the button to be shaded correctly to look like it is pressed // while the security level panel is open this.button.setAttribute("open", "true"); - SecurityLevelPanel.show(event); + SecurityLevelPanel.show(); }, }; /* Security Level Button */ diff --git a/browser/components/securitylevel/content/securityLevelButton.inc.xul b/browser/components/securitylevel/content/securityLevelButton.inc.xul index 579a55f46d4a..d55aacb5c5d4 100644 --- a/browser/components/securitylevel/content/securityLevelButton.inc.xul +++ b/browser/components/securitylevel/content/securityLevelButton.inc.xul @@ -1,5 +1,6 @@ <toolbarbutton id="security-level-button" class="toolbarbutton-1 chromeclass-toolbar-additional badged-button" removable="true" - onmousedown="SecurityLevelButton.onCommand();" + onmousedown="SecurityLevelButton.onCommand(event);" + onkeypress="SecurityLevelButton.onCommand(event);" closemenu="none" cui-areatype="toolbar"/>

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 569fa462103fdd3547da0a44cffae51b2011b2b6 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 14 15:01:08 2019 -0700 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- browser/components/torpreferences/content/torPane.xul | 2 +- browser/modules/TorProtocolService.jsm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.xul b/browser/components/torpreferences/content/torPane.xul index 298c148bcbf2..b384ce9f9489 100644 --- a/browser/components/torpreferences/content/torPane.xul +++ b/browser/components/torpreferences/content/torPane.xul @@ -67,7 +67,7 @@ <html:h2 id="torPreferences-advanced-header"/> <description flex="1"> <html:span id="torPreferences-advanced-description" class="tail-with-learn-more"/> - <label id="torPreferences-advanced-learnMore" class="learnMore text-link" is="text-link"/> + <label id="torPreferences-advanced-learnMore" class="learnMore text-link" is="text-link" style="display:none"/> </description> <grid flex="1"> <columns> diff --git a/browser/modules/TorProtocolService.jsm b/browser/modules/TorProtocolService.jsm index 682e7be9de1a..48ae2e14ec64 100644 --- a/browser/modules/TorProtocolService.jsm +++ b/browser/modules/TorProtocolService.jsm @@ -109,7 +109,6 @@ var TorProtocolService = { // convert settingsObject map to js object for torlauncher-protocol-service let settingsObject = {}; for (const [setting, value] of newSettings) { - // console.log(`${setting} : ${value}`); settingsObject[setting] = value; }

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31920: Fix Security Level panel when its toolbar button moves to overflow
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit ec6ab177fd17a27ee6c7305c5433870d8d097097 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 16 15:06:54 2019 -0700 Bug 31920: Fix Security Level panel when its toolbar button moves to overflow Simply removed the 'clever' caching of the underlying toolbar button element. Now, each time the button is needed it is queried from the underlying document. A correct, but more complicated, fix would be to determine when the toolbar button had been moved to the overflow menu and then update our cached reference. However, this would be super brittle and would break once another way to move the toolbar button is added in the future. In the end, caching something so infrequently queried is not worth the complexity. --- .../securitylevel/content/securityLevel.js | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 7f307c5df43a..11dac5667e61 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -62,8 +62,6 @@ const SecurityLevelPrefs = { const SecurityLevelButton = { _securityPrefsBranch : null, - _button : null, - _anchor : null, _populateXUL : function(securityLevelButton) { if (securityLevelButton != null) { @@ -95,23 +93,14 @@ const SecurityLevelButton = { }, get button() { - if (this._button) { - return this._button; - } - let button = document.getElementById("security-level-button"); if (!button) { return null; } - - return this._button = button; + return button; }, get anchor() { - if (this._anchor) { - return this._anchor; - } - let anchor = document.getAnonymousElementByAttribute(this.button, "class", "toolbarbutton-icon"); if (!anchor) { @@ -119,13 +108,14 @@ const SecurityLevelButton = { } anchor.setAttribute("consumeanchor", SecurityLevelButton.button.id); - return this._anchor = anchor; + return anchor; }, init : function() { // set the initial class based off of the current pref - this._populateXUL(this.button); - this._configUIFromPrefs(this.button); + let button = this.button; + this._populateXUL(button); + this._configUIFromPrefs(button); this._securityPrefsBranch = Services.prefs.getBranch("extensions.torbutton."); this._securityPrefsBranch.addObserver("", this, false); @@ -167,9 +157,6 @@ const SecurityLevelButton = { if (aNode.id == "security-level-button" && !aWasRemoval) { this._populateXUL(aNode); this._configUIFromPrefs(aNode); - // clear out our cached elements as they seem to be recreated when the UI is customized - delete this._button; - delete this._anchor; } },

1 0

[tor-browser-build/master] Bug 32076: Upgrade to goptlib v1.1.0.
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit d0139c1f9a838732577a38b88dc6d341bed65308 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 14 14:10:12 2019 -0600 Bug 32076: Upgrade to goptlib v1.1.0. This version fixes a PROXY-ERROR panic reported in https://bugs.torproject.org/32056. --- projects/goptlib/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goptlib/config b/projects/goptlib/config index 2fd51f8..8c2a95d 100644 --- a/projects/goptlib/config +++ b/projects/goptlib/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.5 +version: v1.1.0 git_url: https://git.torproject.org/pluggable-transports/goptlib.git git_hash: '[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31748: Fixed 'Learn More' links in Security Level preferences and
by gk＠torproject.org 17 Oct '19

17 Oct '19

commit 1a8a46866f0dfd69c7a477ce8e3a46c9640e3a53 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 16 15:52:51 2019 -0700 Bug 31748: Fixed 'Learn More' links in Security Level preferences and panel With ESR68 we needed to add a new is="text-link" attribute to label elements used as hyperlinks --- browser/components/securitylevel/content/securityLevelPanel.inc.xul | 3 ++- .../components/securitylevel/content/securityLevelPreferences.inc.xul | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xul b/browser/components/securitylevel/content/securityLevelPanel.inc.xul index 6a00e811a6ac..c28456d359f3 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xul +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xul @@ -23,7 +23,8 @@ <label id="securityLevel-learnMore" class="learnMore text-link" - onclick="SecurityLevelPanel.hide();"/> + onclick="SecurityLevelPanel.hide();" + is="text-link"/> <button id="securityLevel-restoreDefaults" oncommand="SecurityLevelPanel.restoreDefaults();"/> diff --git a/browser/components/securitylevel/content/securityLevelPreferences.inc.xul b/browser/components/securitylevel/content/securityLevelPreferences.inc.xul index 0cf05a5f3c9b..0e68800e2766 100644 --- a/browser/components/securitylevel/content/securityLevelPreferences.inc.xul +++ b/browser/components/securitylevel/content/securityLevelPreferences.inc.xul @@ -3,7 +3,7 @@ <vbox data-subcategory="securitylevel" flex="1"> <description flex="1"> <html:span id="securityLevel-overview" class="tail-with-learn-more"/> - <label id="securityLevel-learnMore" class="learnMore text-link"/> + <label id="securityLevel-learnMore" class="learnMore text-link" is="text-link"/> </description> <radiogroup id="securityLevel-radiogroup" oncommand="SecurityLevelPreferences.selectSecurityLevel();">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 32092: Fix Tor Browser Support link in preferences
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit fa8eb720629b18e1ca34cae0f50ab670c96b29ea Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Oct 15 22:54:10 2019 +0200 Bug 32092: Fix Tor Browser Support link in preferences --- browser/components/preferences/in-content/preferences.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js index b5b5f87af459..04e4f53b312a 100644 --- a/browser/components/preferences/in-content/preferences.js +++ b/browser/components/preferences/in-content/preferences.js @@ -115,10 +115,7 @@ function init_all() { gotoPref().then(() => { let helpButton = document.getElementById("helpButton"); - let helpUrl = - Services.urlFormatter.formatURLPref("app.support.baseURL") + - "preferences"; - helpButton.setAttribute("href", helpUrl); + helpButton.setAttribute("href", "https://support.torproject.org/tbb"); document.getElementById("addonsButton").addEventListener("click", () => { let mainWindow = window.docShell.rootTreeItem.domWindow;

1 0