July 2020 - tor-commits - lists.torproject.org

[stem/master] Tor added default IPv6 ORPort
by atagar＠torproject.org 24 Jul '20

24 Jul '20

commit 435b980c62aa7bc68323de90911c9dbe4cb37b6d Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 23 15:37:07 2020 -0700 Tor added default IPv6 ORPort Tor recently changed its ORPort behavior so it provides both an IPv4 and IPv6 endpoint by default... https://github.com/torproject/stem/issues/70 Adjusting our tests. Our get_ports() method now provides a set rather than a list so we don't return duplicate values. --- stem/control.py | 8 ++++---- test/integ/control/controller.py | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stem/control.py b/stem/control.py index 7b90eed0..47b8a37c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -271,7 +271,7 @@ import stem.version from stem import UNDEFINED, CircStatus, Signal from stem.util import Synchronous, log from types import TracebackType -from typing import Any, AsyncIterator, Awaitable, Callable, Dict, List, Mapping, Optional, Sequence, Tuple, Type, Union +from typing import Any, AsyncIterator, Awaitable, Callable, Dict, List, Mapping, Optional, Sequence, Set, Tuple, Type, Union # When closing the controller we attempt to finish processing enqueued events, # but if it takes longer than this we terminate. @@ -1352,7 +1352,7 @@ class Controller(BaseController): return policy @with_default() - async def get_ports(self, listener_type: 'stem.control.Listener', default: Any = UNDEFINED) -> Sequence[int]: + async def get_ports(self, listener_type: 'stem.control.Listener', default: Any = UNDEFINED) -> Set[int]: """ get_ports(listener_type, default = UNDEFINED) @@ -1366,7 +1366,7 @@ class Controller(BaseController): :param listener_type: connection type being handled by the ports we return :param default: response if the query fails - :returns: **list** of **ints** for the local ports where tor handles + :returns: **set** of **ints** for the local ports where tor handles connections of the given type :raises: :class:`stem.ControllerError` if unable to determine the ports @@ -1385,7 +1385,7 @@ class Controller(BaseController): log.info("Request for %s ports got an address that's neither IPv4 or IPv6: %s" % (listener_type, address)) return False - return [port for (addr, port) in (await self.get_listeners(listener_type)) if is_localhost(addr)] + return set([port for (addr, port) in (await self.get_listeners(listener_type)) if is_localhost(addr)]) @with_default() async def get_listeners(self, listener_type: 'stem.control.Listener', default: Any = UNDEFINED) -> Sequence[Tuple[str, int]]: diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b539fc0e..40e036a7 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -951,17 +951,17 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() async with await runner.get_tor_controller() as controller: - self.assertEqual([test.runner.ORPORT], await controller.get_ports(Listener.OR)) - self.assertEqual([], await controller.get_ports(Listener.DIR)) - self.assertEqual([test.runner.SOCKS_PORT], await controller.get_ports(Listener.SOCKS)) - self.assertEqual([], await controller.get_ports(Listener.TRANS)) - self.assertEqual([], await controller.get_ports(Listener.NATD)) - self.assertEqual([], await controller.get_ports(Listener.DNS)) + self.assertEqual(set([test.runner.ORPORT]), await controller.get_ports(Listener.OR)) + self.assertEqual(set(), await controller.get_ports(Listener.DIR)) + self.assertEqual(set([test.runner.SOCKS_PORT]), await controller.get_ports(Listener.SOCKS)) + self.assertEqual(set(), await controller.get_ports(Listener.TRANS)) + self.assertEqual(set(), await controller.get_ports(Listener.NATD)) + self.assertEqual(set(), await controller.get_ports(Listener.DNS)) if test.runner.Torrc.PORT in runner.get_options(): - self.assertEqual([test.runner.CONTROL_PORT], await controller.get_ports(Listener.CONTROL)) + self.assertEqual(set([test.runner.CONTROL_PORT]), await controller.get_ports(Listener.CONTROL)) else: - self.assertEqual([], await controller.get_ports(Listener.CONTROL)) + self.assertEqual(set(), await controller.get_ports(Listener.CONTROL)) @test.require.controller @async_test @@ -973,7 +973,7 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() async with await runner.get_tor_controller() as controller: - self.assertEqual([('0.0.0.0', test.runner.ORPORT)], await controller.get_listeners(Listener.OR)) + self.assertEqual([('0.0.0.0', test.runner.ORPORT), ('::', test.runner.ORPORT)], await controller.get_listeners(Listener.OR)) self.assertEqual([], await controller.get_listeners(Listener.DIR)) self.assertEqual([('127.0.0.1', test.runner.SOCKS_PORT)], await controller.get_listeners(Listener.SOCKS)) self.assertEqual([], await controller.get_listeners(Listener.TRANS))

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit 103fd5a52d73f77543ab89bf0f3a6ec941c4ea62 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 14 11:15:07 2020 -0400 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. --- browser/components/aboutlogins/content/aboutLogins.css | 8 +++++++- .../aboutlogins/content/components/fxaccounts-button.css | 5 +++++ .../components/aboutlogins/content/components/menu-button.css | 10 ++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/browser/components/aboutlogins/content/aboutLogins.css b/browser/components/aboutlogins/content/aboutLogins.css index 7ed29bda8297..dca63da2e649 100644 --- a/browser/components/aboutlogins/content/aboutLogins.css +++ b/browser/components/aboutlogins/content/aboutLogins.css @@ -69,6 +69,11 @@ login-item { grid-area: login; } +/* Do not promote Mozilla Sync in Tor Browser. */ +login-intro { + display: none !important; +} + #branding-logo { flex-basis: var(--sidebar-width); flex-shrink: 0; @@ -83,7 +88,8 @@ login-item { } } -:root:not(.official-branding) #branding-logo { +/* Hide "Firefox LockWise" branding in Tor Browser. */ +#branding-logo { visibility: hidden; } diff --git a/browser/components/aboutlogins/content/components/fxaccounts-button.css b/browser/components/aboutlogins/content/components/fxaccounts-button.css index aefda548c84d..a02707980158 100644 --- a/browser/components/aboutlogins/content/components/fxaccounts-button.css +++ b/browser/components/aboutlogins/content/components/fxaccounts-button.css @@ -8,6 +8,11 @@ align-items: center; } +/* Do not promote Mozilla Sync in Tor Browser. */ +.logged-out-view { + display: none !important; +} + .fxaccounts-extra-text { /* Only show at most 3 lines of text to limit the text from overflowing the header. */ diff --git a/browser/components/aboutlogins/content/components/menu-button.css b/browser/components/aboutlogins/content/components/menu-button.css index 3c93d409b2c7..2d7380b2ea37 100644 --- a/browser/components/aboutlogins/content/components/menu-button.css +++ b/browser/components/aboutlogins/content/components/menu-button.css @@ -85,3 +85,13 @@ .menuitem-mobile-android { background-image: url("chrome://browser/skin/logo-android.svg"); } + +/* + * Do not promote LockWise mobile apps in Tor Browser: hide the menu items + * and the separator line that precedes them. + */ +.menuitem-mobile-android, +.menuitem-mobile-ios, +button[data-event-name="AboutLoginsGetHelp"] + hr { + display: none !important; +}

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit 70e01f1c216e6e8e250599de4fe181b20501e006 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 23 13:57:26 2020 -0400 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Disable the "Create New Login" button when security.nocertdb is true. --- browser/components/aboutlogins/AboutLoginsParent.jsm | 2 ++ browser/components/aboutlogins/content/aboutLogins.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index 2ecf82b1fba7..31b4f71a63d6 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -62,6 +62,7 @@ const PASSWORD_SYNC_NOTIFICATION_ID = "enable-password-sync"; const HIDE_MOBILE_FOOTER_PREF = "signon.management.page.hideMobileFooter"; const SHOW_PASSWORD_SYNC_NOTIFICATION_PREF = "signon.management.page.showPasswordSyncNotification"; +const NOCERTDB_PREF = "security.nocertdb"; // about:logins will always use the privileged content process, // even if it is disabled for other consumers such as about:newtab. @@ -419,6 +420,7 @@ class AboutLoginsParent extends JSWindowActorParent { importVisible: Services.policies.isAllowed("profileImport") && AppConstants.platform != "linux", + canCreateLogins: !Services.prefs.getBoolPref(NOCERTDB_PREF, false), }); await AboutLogins._sendAllLoginRelatedObjects( diff --git a/browser/components/aboutlogins/content/aboutLogins.js b/browser/components/aboutlogins/content/aboutLogins.js index da7d9016a2eb..361b2b0d02bf 100644 --- a/browser/components/aboutlogins/content/aboutLogins.js +++ b/browser/components/aboutlogins/content/aboutLogins.js @@ -19,6 +19,9 @@ const gElements = { get loginFooter() { return this.loginItem.shadowRoot.querySelector("login-footer"); }, + get createNewLoginButton() { + return this.loginList.shadowRoot.querySelector(".create-login-button"); + }, }; let numberOfLogins = 0; @@ -100,6 +103,9 @@ window.addEventListener("AboutLoginsChromeToContent", event => { gElements.loginList.setSortDirection(event.detail.value.selectedSort); document.documentElement.classList.add("initialized"); gElements.loginList.classList.add("initialized"); + if (!event.detail.value.canCreateLogins) { + gElements.createNewLoginButton.disabled = true; + } break; } case "ShowLoginItemError": {

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/4' into tor-browser-78.0.1esr-10.0-1
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit 24dceb653768988eaa04c0082572faeb73fae4b9 Merge: 1b532965f56f 70e01f1c216e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 22:18:01 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/4' into tor-browser-78.0.1esr-10.0-1 browser/components/aboutlogins/AboutLoginsParent.jsm | 2 ++ browser/components/aboutlogins/content/aboutLogins.css | 8 +++++++- browser/components/aboutlogins/content/aboutLogins.js | 6 ++++++ .../aboutlogins/content/components/fxaccounts-button.css | 5 +++++ .../components/aboutlogins/content/components/menu-button.css | 10 ++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit a2463b202cf29917b97b02eaaf38c4c6df9e887b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 22 14:28:58 2020 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- browser/base/content/aboutDialog-appUpdater-legacy.js | 2 +- browser/components/BrowserContentHandler.jsm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/base/content/aboutDialog-appUpdater-legacy.js b/browser/base/content/aboutDialog-appUpdater-legacy.js index 0629e8eaf41a..9f96e2263295 100644 --- a/browser/base/content/aboutDialog-appUpdater-legacy.js +++ b/browser/base/content/aboutDialog-appUpdater-legacy.js @@ -192,7 +192,7 @@ appUpdater.prototype = { if (aChildID == "downloadAndInstall") { let updateVersion = gAppUpdater.update.displayVersion; // Include the build ID if this is an "a#" (nightly or aurora) build - if (/a\d+$/.test(updateVersion)) { + if (!AppConstants.TOR_BROWSER_UPDATE && /a\d+$/.test(updateVersion)) { let buildID = gAppUpdater.update.buildID; let year = buildID.slice(0, 4); let month = buildID.slice(4, 6); diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm index 6888369473e4..1cc1015414fc 100644 --- a/browser/components/BrowserContentHandler.jsm +++ b/browser/components/BrowserContentHandler.jsm @@ -734,9 +734,10 @@ nsBrowserContentHandler.prototype = { "startup.homepage_override_url" ); let update = UpdateManager.activeUpdate; + let old_version = old_tbversion ? old_tbversion: old_mstone; if ( update && - Services.vc.compare(update.appVersion, old_mstone) > 0 + Services.vc.compare(update.appVersion, old_version) > 0 ) { overridePage = getPostUpdateOverridePage(update, overridePage); // Send the update ping to signal that the update was successful.

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/12' into tor-browser-78.0.1esr-10.0-1
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit 1b532965f56fc56ab2a0479ad3baa6bbada1f6c0 Merge: 85acef9c943c a2463b202cf2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 22:10:48 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/12' into tor-browser-78.0.1esr-10.0-1 browser/base/content/aboutDialog-appUpdater-legacy.js | 2 +- browser/components/BrowserContentHandler.jsm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/14' into tor-browser-78.0.1esr-10.0-1
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit 85acef9c943c21f361ada8b11c95f9830d4fadc6 Merge: 13052ed2adcf c6b4574daf4b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 22:09:37 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/14' into tor-browser-78.0.1esr-10.0-1 browser/confvars.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 24 Jul '20

24 Jul '20

commit c6b4574daf4b3b1ccdbb74c4d1970489ebe4a895 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 10:59:03 2020 +0000 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Fixes bug 32612. --- browser/confvars.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/browser/confvars.sh b/browser/confvars.sh index b22913ebca02..f994783f9c65 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -24,11 +24,8 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # of values. # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " if test "$MOZ_UPDATE_CHANNEL" = "alpha"; then - # alpha is currently using the -release channel id. However we accept - # both -alpha and -release channel ID for the alpha so that we can - # switch it to -alpha at some point. See bug 32498. - ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha,torbrowser-torproject-release - MAR_CHANNEL_ID=torbrowser-torproject-release + ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha + MAR_CHANNEL_ID=torbrowser-torproject-alpha elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-nightly MAR_CHANNEL_ID=torbrowser-torproject-nightly

1 0

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

24 Jul '20

commit 13052ed2adcf0236392afae3eacc502701d7de8d Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 23 19:02:42 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- browser/components/torpreferences/content/torPane.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 18d27ec4a50b..49054b5dac6a 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -196,14 +196,16 @@ const gTorPane = (function() { TorStrings.settings.useBridge ); this._useBridgeCheckbox.addEventListener("command", e => { - gTorPane.onToggleBridge(e.target.checked).onUpdateBridgeSettings(); + const checked = this._useBridgeCheckbox.checked; + gTorPane.onToggleBridge(checked).onUpdateBridgeSettings(); }); this._bridgeSelectionRadiogroup = prefpane.querySelector( selectors.bridges.bridgeSelectionRadiogroup ); this._bridgeSelectionRadiogroup.value = TorBridgeSource.BUILTIN; this._bridgeSelectionRadiogroup.addEventListener("command", e => { - gTorPane.onSelectBridgeOption(e.target.value).onUpdateBridgeSettings(); + const value = this._bridgeSelectionRadiogroup.value; + gTorPane.onSelectBridgeOption(value).onUpdateBridgeSettings(); }); // Builtin bridges @@ -294,7 +296,8 @@ const gTorPane = (function() { TorStrings.settings.useLocalProxy ); this._useProxyCheckbox.addEventListener("command", e => { - gTorPane.onToggleProxy(e.target.checked).onUpdateProxySettings(); + const checked = this._useProxyCheckbox.checked; + gTorPane.onToggleProxy(checked).onUpdateProxySettings(); }); this._proxyTypeLabel = prefpane.querySelector( selectors.advanced.proxyTypeLabel @@ -316,7 +319,8 @@ const gTorPane = (function() { selectors.advanced.proxyTypeList ); this._proxyTypeMenulist.addEventListener("command", e => { - gTorPane.onSelectProxyType(e.target.value).onUpdateProxySettings(); + const value = this._proxyTypeMenulist.value; + gTorPane.onSelectProxyType(value).onUpdateProxySettings(); }); for (let currentProxy of mockProxies) { let menuEntry = document.createXULElement("menuitem"); @@ -398,7 +402,8 @@ const gTorPane = (function() { TorStrings.settings.useFirewall ); this._useFirewallCheckbox.addEventListener("command", e => { - gTorPane.onToggleFirewall(e.target.checked).onUpdateFirewallSettings(); + const checked = this._useFirewallCheckbox.checked; + gTorPane.onToggleFirewall(checked).onUpdateFirewallSettings(); }); this._allowedPortsLabel = prefpane.querySelector( selectors.advanced.firewallAllowedPortsLabel

1 0

[onionperf/develop] Retrieve error_code from the stream_info dict
by karsten＠torproject.org 23 Jul '20

23 Jul '20

commit 89c8a8f826ee0dc460feb81f67e6bebfbbb9981f Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Jul 23 15:04:57 2020 +0100 Retrieve error_code from the stream_info dict --- onionperf/visualization.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onionperf/visualization.py b/onionperf/visualization.py index 5e7f92b..daa5c3d 100644 --- a/onionperf/visualization.py +++ b/onionperf/visualization.py @@ -88,8 +88,8 @@ class TGenVisualization(Visualization): s = stream_data["elapsed_seconds"] if stream_data["stream_info"]["recvsize"] == "5242880" and "0.2" in s["payload_progress_recv"]: stream["mbps"] = 4.194304 / (s["payload_progress_recv"]["0.2"] - s["payload_progress_recv"]["0.1"]) - if "error" in stream_data["transport_info"] and stream_data["transport_info"]["error"] != "NONE": - error_code = stream_data["transport_info"]["error"] + if "error" in stream_data["stream_info"] and stream_data["stream_info"]["error"] != "NONE": + error_code = stream_data["stream_info"]["error"] if "local" in stream_data["transport_info"] and len(stream_data["transport_info"]["local"].split(":")) > 2: source_port = stream_data["transport_info"]["local"].split(":")[2] if "unix_ts_end" in stream_data:

1 0