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

[tor-browser-build/master] Temporarily disable android nightly builds
by boklm＠torproject.org 23 Jul '20

23 Jul '20

commit f60b9ea2f7cde052e527e3ff4418ed91c13ffc8a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 23 11:24:44 2020 +0200 Temporarily disable android nightly builds --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 55154d3..c185137 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: ea0942f9da2bdbaf3f140f3baaed1bb56ee9af69 +testsuite_git_commit: 778d9e09fe60b6a61f85f6830d046684c2230ae4 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-bundle-testsuite/master] Temporarily disable android nightly builds
by boklm＠torproject.org 23 Jul '20

23 Jul '20

commit 778d9e09fe60b6a61f85f6830d046684c2230ae4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 23 11:15:41 2020 +0200 Temporarily disable android nightly builds --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 48 ------------------------------- 1 file changed, 48 deletions(-) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index d391bac..4a695cd 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -118,54 +118,6 @@ sub set_tests { type => 'make_incrementals', publish_dir => 'nightly-osx-x86_64', }, - { - name => 'nightly-android-armv7', - descr => 'build tor-browser nightly android-armv7', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-armv7', - ], - publish_dir => 'nightly-android-armv7', - }, - { - name => 'nightly-android-x86', - descr => 'build tor-browser nightly android-x86', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-x86', - ], - publish_dir => 'nightly-android-x86', - }, - { - name => 'nightly-android-x86_64', - descr => 'build tor-browser nightly android-x86_64', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-x86_64', - ], - publish_dir => 'nightly-android-x86_64', - }, - { - name => 'nightly-android-aarch64', - descr => 'build tor-browser nightly android-aarch64', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-aarch64', - ], - publish_dir => 'nightly-android-aarch64', - }, ]; }

1 0

[tor-browser-build/master] Bug 33851: Omit parental controls when building Firefox and GeckoView
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 0c8e0d3e8de4ad52d10a9d0a7bb789e676f432ab Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 19 14:29:30 2020 -0400 Bug 33851: Omit parental controls when building Firefox and GeckoView --- projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-android-x86_64 | 1 + projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + projects/geckoview/mozconfig-android-aarch64 | 1 + projects/geckoview/mozconfig-android-armv7 | 1 + projects/geckoview/mozconfig-android-x86 | 1 + projects/geckoview/mozconfig-android-x86_64 | 1 + 13 files changed, 13 insertions(+) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index 9e4173f..fd86f23 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index d13f870..9ee3bfe 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index 019094c..f7e1ffa 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 index 999f51f..3c78993 100644 --- a/projects/firefox/mozconfig-android-x86_64 +++ b/projects/firefox/mozconfig-android-x86_64 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 3ea241f..76c3ba3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -29,6 +29,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index e4d2b99..251cdc0 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -29,6 +29,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 9b0773d..09c53fc 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -41,6 +41,7 @@ ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a2364e9..eb4e212 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -35,6 +35,7 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Disable telemetry diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 188b3c5..655ca12 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -35,6 +35,7 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Disable telemetry diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index dc72f3f..d7b29e0 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 36140a5..21d2fa0 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index fe703ea..1d6fb3c 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index cddfc09..f6111d3 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 127d9c51c425868c97d4463b6f63f48296b718e2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 15 15:25:49 2020 -0400 squash! TB3: Tor Browser's official .mozconfigs. Bug 33851: Omit Parental Controls. --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d0307eaa79c0..d71c858844e3 100755 --- a/.mozconfig +++ b/.mozconfig @@ -25,6 +25,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/.mozconfig-android b/.mozconfig-android index 008444714dd4..1b5e3f3178b7 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -27,6 +27,7 @@ ac_add_options --disable-rust-debug ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/.mozconfig-asan b/.mozconfig-asan index 71f8e65d0732..ca05fb12eedb 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -36,6 +36,7 @@ ac_add_options --enable-tests ac_add_options --enable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/.mozconfig-mac b/.mozconfig-mac index f6a2645e207c..9be7751f8241 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -46,6 +46,7 @@ ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme diff --git a/.mozconfig-mingw b/.mozconfig-mingw index a920527ccf7b..6a9d3749b2ec 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -22,6 +22,7 @@ ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests ac_add_options --enable-proxy-bypass-protection

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 26345: Hide tracking protection UI
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 017cd94a74a4063961f3bb3d44cf6351401b8d54 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 19 10:27:37 2020 -0400 fixup! Bug 26345: Hide tracking protection UI --- browser/components/about/AboutRedirector.cpp | 4 ---- browser/components/about/components.conf | 1 - browser/components/moz.build | 1 - 3 files changed, 6 deletions(-) diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 933d519bd959..544e21782729 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -114,10 +114,6 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, - {"protections", "chrome://browser/content/protections.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, {"pioneer", "chrome://browser/content/pioneer.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, #ifdef TOR_BROWSER_UPDATE diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index f31159d30e15..d78de142e2e4 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -20,7 +20,6 @@ pages = [ 'policies', 'preferences', 'privatebrowsing', - 'protections', 'profiling', 'reader', 'restartrequired', diff --git a/browser/components/moz.build b/browser/components/moz.build index ffee5bafaf70..b660be047b14 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -49,7 +49,6 @@ DIRS += [ 'preferences', 'privatebrowsing', 'prompts', - 'protections', 'protocolhandler', 'resistfingerprinting', 'search',

1 0

[stem/master] All client usage failed with ValueErrors
by atagar＠torproject.org 23 Jul '20

23 Jul '20

commit 5d29a263130c47ec399dcdb5ef9994792a854cff Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 22 18:11:41 2020 -0700 All client usage failed with ValueErrors When our Relay class sends a message it first drains its socket of unread data... async def _msg(self, cell): await self._orport.recv(timeout = 0) await self._orport.send(cell.pack(self.link_protocol)) response = await self._orport.recv(timeout = 1) yield stem.client.cell.Cell.pop(response, self.link_protocol)[0] This in turn called asyncio.wait_for() with a timeout value of zero which returns immediately, leaving our socket undrained. Our following recv() is then polluted with unexpected data. For instance, this is caused anything that uses create_circuit() (such as descriptor downloads) to fail with confusing exceptions such as... ====================================================================== ERROR: test_downloading_via_orport ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/require.py", line 60, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/require.py", line 75, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/require.py", line 75, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 27, in test_downloading_via_orport fall_back_to_authority = False, File "/home/atagar/Desktop/stem/stem/util/__init__.py", line 363, in _run_async_method return future.result() File "/home/atagar/Python-3.7.0/Lib/concurrent/futures/_base.py", line 432, in result return self.__get_result() File "/home/atagar/Python-3.7.0/Lib/concurrent/futures/_base.py", line 384, in __get_result raise self._exception File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 469, in run return [desc async for desc in self._run(suppress)] File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 469, in <listcomp> return [desc async for desc in self._run(suppress)] File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 482, in _run raise self.error File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 549, in _download_descriptors response = await asyncio.wait_for(self._download_from(endpoint), time_remaining) File "/home/atagar/Python-3.7.0/Lib/asyncio/tasks.py", line 384, in wait_for return await fut File "/home/atagar/Desktop/stem/stem/descriptor/remote.py", line 588, in _download_from async with await relay.create_circuit() as circ: File "/home/atagar/Desktop/stem/stem/client/__init__.py", line 270, in create_circuit async for cell in self._msg(create_fast_cell): File "/home/atagar/Desktop/stem/stem/client/__init__.py", line 226, in _msg yield stem.client.cell.Cell.pop(response, self.link_protocol)[0] File "/home/atagar/Desktop/stem/stem/client/cell.py", line 182, in pop cls = Cell.by_value(command) File "/home/atagar/Desktop/stem/stem/client/cell.py", line 139, in by_value raise ValueError("'%s' isn't a valid cell value" % value) ValueError: '65' isn't a valid cell value This also reverts our Relay's '_orport_lock' back to a threaded RLock because asyncio locks are not reentrant, causing methods such as directory() (which call _send()) to deadlock upon themselves. We might drop this lock entirely in the future (thread safety should be moot now that the stem.client module is fully asynchronous). --- stem/client/__init__.py | 18 +++++++++--------- stem/socket.py | 7 +++---- test/unit/descriptor/remote.py | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/stem/client/__init__.py b/stem/client/__init__.py index 8c8da923..877d60e2 100644 --- a/stem/client/__init__.py +++ b/stem/client/__init__.py @@ -25,8 +25,8 @@ a wrapper for :class:`~stem.socket.RelaySocket`, much the same way as +- close - closes this circuit """ -import asyncio import hashlib +import threading import stem import stem.client.cell @@ -71,7 +71,7 @@ class Relay(object): self.link_protocol = LinkProtocol(link_protocol) self._orport = orport self._orport_buffer = b'' # unread bytes - self._orport_lock = asyncio.Lock() + self._orport_lock = threading.RLock() self._circuits = {} # type: Dict[int, stem.client.Circuit] @staticmethod @@ -162,7 +162,7 @@ class Relay(object): :returns: next :class:`~stem.client.cell.Cell` """ - async with self._orport_lock: + with self._orport_lock: # cells begin with [circ_id][cell_type][...] circ_id_size = self.link_protocol.circ_id_size.size @@ -253,7 +253,7 @@ class Relay(object): :func:`~stem.socket.BaseSocket.close` method. """ - async with self._orport_lock: + with self._orport_lock: return await self._orport.close() async def create_circuit(self) -> 'stem.client.Circuit': @@ -261,7 +261,7 @@ class Relay(object): Establishes a new circuit. """ - async with self._orport_lock: + with self._orport_lock: circ_id = max(self._circuits) + 1 if self._circuits else self.link_protocol.first_circ_id create_fast_cell = stem.client.cell.CreateFastCell(circ_id) @@ -286,7 +286,7 @@ class Relay(object): return circ async def __aiter__(self) -> AsyncIterator['stem.client.Circuit']: - async with self._orport_lock: + with self._orport_lock: for circ in self._circuits.values(): yield circ @@ -338,7 +338,7 @@ class Circuit(object): :returns: **str** with the requested descriptor data """ - async with self.relay._orport_lock: + with self.relay._orport_lock: await self._send(RelayCommand.BEGIN_DIR, stream_id = stream_id) await self._send(RelayCommand.DATA, request, stream_id = stream_id) @@ -372,7 +372,7 @@ class Circuit(object): :param stream_id: specific stream this concerns """ - async with self.relay._orport_lock: + with self.relay._orport_lock: # Encrypt and send the cell. Our digest/key only updates if the cell is # successfully sent. @@ -384,7 +384,7 @@ class Circuit(object): self.forward_key = forward_key async def close(self) -> None: - async with self.relay._orport_lock: + with self.relay._orport_lock: await self.relay._orport.send(stem.client.cell.DestroyCell(self.id).pack(self.relay.link_protocol)) del self.relay._circuits[self.id] diff --git a/stem/socket.py b/stem/socket.py index a19a8f25..af52fffa 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -362,13 +362,12 @@ class RelaySocket(BaseSocket): """ async def wrapped_recv(reader: asyncio.StreamReader) -> Optional[bytes]: - read_coroutine = reader.read(1024) if timeout is None: - return await read_coroutine + return await reader.read(1024) else: try: - return await asyncio.wait_for(read_coroutine, timeout) - except (asyncio.TimeoutError, ssl.SSLError, ssl.SSLWantReadError): + return await asyncio.wait_for(reader.read(1024), max(timeout, 0.0001)) + except asyncio.TimeoutError: return None return await self._recv(wrapped_recv) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 6b9ca3ad..7447fd16 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -98,7 +98,7 @@ class TestDescriptorDownloader(unittest.TestCase): self.assertEqual('moria1', desc.nickname) self.assertEqual('128.31.0.34', desc.address) self.assertEqual('9695DFC35FFEB861329B9F1AB04C46397020CE31', desc.fingerprint) - self.assertEqual(TEST_DESCRIPTOR, desc.get_bytes()) + self.assertEqual(TEST_DESCRIPTOR.rstrip(), desc.get_bytes()) reply.stop()

1 0

[tor/master] Adjust the rules for warning about too many connections.
by dgoulet＠torproject.org 22 Jul '20

22 Jul '20

commit faa752f3c9bd3faa2d23e6273f657771a3cad078 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 22 14:45:03 2020 -0400 Adjust the rules for warning about too many connections. Previously we tolerated up to 1.5 connections for every relay we were connected to, and didn't warn if we had fewer than 5 connections total. Now we tolerate up to 1.5 connections per relay, and up to 4 connections per authority, and we don't warn at all when we have fewer than 25 connections total. Fixes bug 33880, which seems to have been provoked by our #17592 change in 0.3.5. --- changes/ticket33880 | 6 ++++++ src/core/or/channel.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/changes/ticket33880 b/changes/ticket33880 new file mode 100644 index 0000000000..c1889bb134 --- /dev/null +++ b/changes/ticket33880 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay, usability): + - Adjust the rules for when to warn about having too many connections + to other relays. Previously we'd tolerate up to 1.5 connections + per relay on average. Now we tolerate more connections for directory + authorities, and raise the number of total connections we need + to see before we warn. Fixes bug 33880; bugfix on 0.3.1.1-alpha. diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 3886906875..71cb6bccbb 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -72,6 +72,7 @@ #include "core/or/relay.h" #include "core/or/scheduler.h" #include "feature/client/entrynodes.h" +#include "feature/nodelist/dirlist.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" @@ -749,6 +750,7 @@ channel_check_for_duplicates(void) { channel_idmap_entry_t **iter; channel_t *chan; + int total_dirauth_connections = 0, total_dirauths = 0; int total_relay_connections = 0, total_relays = 0, total_canonical = 0; int total_half_canonical = 0; int total_gt_one_connection = 0, total_gt_two_connections = 0; @@ -756,13 +758,18 @@ channel_check_for_duplicates(void) HT_FOREACH(iter, channel_idmap, &channel_identity_map) { int connections_to_relay = 0; + const char *id_digest = (char *) (*iter)->digest; /* Only consider relay connections */ - if (!connection_or_digest_is_known_relay((char*)(*iter)->digest)) + if (!connection_or_digest_is_known_relay(id_digest)) continue; total_relays++; + const bool is_dirauth = router_digest_is_trusted_dir(id_digest); + if (is_dirauth) + total_dirauths++; + for (chan = TOR_LIST_FIRST(&(*iter)->channel_list); chan; chan = channel_next_with_rsa_identity(chan)) { @@ -771,6 +778,8 @@ channel_check_for_duplicates(void) connections_to_relay++; total_relay_connections++; + if (is_dirauth) + total_dirauth_connections++; if (chan->is_canonical(chan, 0)) total_canonical++; @@ -785,11 +794,28 @@ channel_check_for_duplicates(void) if (connections_to_relay > 4) total_gt_four_connections++; } -#define MIN_RELAY_CONNECTIONS_TO_WARN 5 + /* Don't bother warning about excessive connections unless we have + * at least this many connections, total. + */ +#define MIN_RELAY_CONNECTIONS_TO_WARN 25 + /* If the average number of connections for a regular relay is more than + * this, that's too high. + */ +#define MAX_AVG_RELAY_CONNECTIONS 1.5 + /* If the average number of connections for a dirauth is more than + * this, that's too high. + */ +#define MAX_AVG_DIRAUTH_CONNECTIONS 4 + + /* How many connections total would be okay, given the number of + * relays and dirauths that we have connections to? */ + const int max_tolerable_connections = (int)( + (total_relays-total_dirauths) * MAX_AVG_RELAY_CONNECTIONS + + total_dirauths * MAX_AVG_DIRAUTH_CONNECTIONS); /* If we average 1.5 or more connections per relay, something is wrong */ if (total_relays > MIN_RELAY_CONNECTIONS_TO_WARN && - total_relay_connections >= 1.5*total_relays) { + total_relay_connections > max_tolerable_connections) { log_notice(LD_OR, "Your relay has a very large number of connections to other relays. " "Is your outbound address the same as your relay address? "

1 0

[tor/master] Merge branch 'maint-0.4.4'
by dgoulet＠torproject.org 22 Jul '20

22 Jul '20

commit 884ccd6996dcd713600e50ec11de0e9a6655607f Merge: 492625badf 1ee164afc2 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 22 16:14:19 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket33880 | 6 ++++++ src/core/or/channel.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'tor-gitlab/mr/77' into maint-0.4.4
by dgoulet＠torproject.org 22 Jul '20

22 Jul '20

commit 1ee164afc2fcc449b562ab8899c458bcc877a4ba Merge: 5cd85feaa7 faa752f3c9 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 22 16:14:11 2020 -0400 Merge branch 'tor-gitlab/mr/77' into maint-0.4.4 changes/ticket33880 | 6 ++++++ src/core/or/channel.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by dgoulet＠torproject.org 22 Jul '20

22 Jul '20

commit d1a8c10fc1ee962b8b54447dcb9b892d4683332b Merge: 29279889ac 1ee164afc2 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 22 16:14:19 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket33880 | 6 ++++++ src/core/or/channel.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-)

1 0