tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

[bridgedb/master] Duplicate ports could cause test failures
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 8523cae6928c27c90a4394a326e00cd9dc9630dd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 20 18:14:32 2020 -0800 Duplicate ports could cause test failures Not python 3 related, but when picking random ports if we have a duplicate our tests fail with... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_addr.py", line 676, in test_tooManyPorts self.assertEqual(len(portList), tooMany) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 432, in assertEqual super(_Assertions, self).assertEqual(first, second, msg) File "/usr/lib/python3.5/unittest/case.py", line 820, in assertEqual assertion_func(first, second, msg=msg) File "/usr/lib/python3.5/unittest/case.py", line 813, in _baseAssertEqual raise self.failureException(msg) twisted.trial.unittest.FailTest: 16 != 17 This is because portList deduplicates inputs in its add() method. --- bridgedb/test/test_parse_addr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py index 41cbb94..b32d359 100644 --- a/bridgedb/test/test_parse_addr.py +++ b/bridgedb/test/test_parse_addr.py @@ -673,7 +673,7 @@ class PortListTest(unittest.TestCase): log.msg("Testing addr.PortList(%s))" % ', '.join([type('')(port) for port in ports])) portList = addr.PortList(*ports) - self.assertEqual(len(portList), tooMany) + self.assertEqual(len(portList), len(set(ports))) def test_invalidPortNumber(self): """Test creating a :class:`addr.PortList` with an invalid port.

1 0

[bridgedb/master] Fix minor type issues
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 621f35b9cb02f1106a963ddb1f0b0fd23b4826bd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 19 12:52:56 2020 -0800 Fix minor type issues Just some instances of low hanging fruit... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Bridges.py", line 110, in test_dumpAssignments first = self.ring.bridges.values()[0].fingerprint builtins.TypeError: 'dict_values' object does not support indexing Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_headers.py", line 37, in test_defaultTBBHeader self.assertIsInstance(langs, list) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 649, in assertIsInstance instance, classOrTuple, suffix)) twisted.trial.unittest.FailTest: <map object at 0x7f986ca07ba8> is not an instance of <class 'list'> Test results changed as follows... before: FAILED (skips=115, failures=29, errors=3, successes=837) after: FAILED (skips=115, failures=27, errors=2, successes=840) --- bridgedb/parse/headers.py | 3 +-- bridgedb/test/test_Bridges.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bridgedb/parse/headers.py b/bridgedb/parse/headers.py index fa8cbf2..29dd091 100644 --- a/bridgedb/parse/headers.py +++ b/bridgedb/parse/headers.py @@ -75,5 +75,4 @@ def parseAcceptLanguage(header): # Gettext wants underderscores, because that is how it creates the # directories under i18n/, not hyphens: - langs = map(lambda x: x.replace('-', '_'), [x for x in langs]) - return langs + return list(map(lambda x: x.replace('-', '_'), [x for x in langs])) diff --git a/bridgedb/test/test_Bridges.py b/bridgedb/test/test_Bridges.py index 1f4720f..8f629f5 100644 --- a/bridgedb/test/test_Bridges.py +++ b/bridgedb/test/test_Bridges.py @@ -107,7 +107,7 @@ class BridgeRingTests(unittest.TestCase): f.seek(0) data = f.read() - first = self.ring.bridges.values()[0].fingerprint + first = list(self.ring.bridges.values())[0].fingerprint # The first bridge's fingerprint should be within the data somewhere self.assertIn(first, data)

1 0

[bridgedb/master] Urllib removed its splithost function
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 37464528094a5a70bc65860879f45e93b6b8d0ac Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 16:39:56 2020 -0800 Urllib removed its splithost function Urllib's documentation said to avoid splithost, and the method was removed in python 3.... https://docs.python.org/2/library/urllib.html This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_crypto.py", line 379, in test_verifyHostname_matching contextFactory = crypto.SSLVerifyingContextFactory(url) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/crypto.py", line 377, in __init__ self.hostname = self.getHostnameFromURL(url) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/crypto.py", line 413, in getHostnameFromURL hostname = urllib.splithost(urllib.splittype(url)[1])[0] builtins.AttributeError: module 'urllib' has no attribute 'splithost' Test results changed as follows... before: FAILED (skips=114, failures=21, errors=57, successes=792) after: FAILED (skips=114, failures=21, errors=55, successes=794) --- bridgedb/crypto.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bridgedb/crypto.py b/bridgedb/crypto.py index 5b1912f..1aee089 100644 --- a/bridgedb/crypto.py +++ b/bridgedb/crypto.py @@ -47,7 +47,7 @@ import io import logging import os import re -import urllib +import urllib.parse import OpenSSL @@ -410,7 +410,8 @@ class SSLVerifyingContextFactory(ssl.CertificateOptions): :rtype: str :returns: The full hostname (including any subdomains). """ - hostname = urllib.splithost(urllib.splittype(url)[1])[0] + + hostname = urllib.parse.urlparse(url).netloc logging.debug("Parsed hostname %r for cert CN matching." % hostname) return hostname

1 0

[bridgedb/master] Test assertion failure due to class name
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 4b4be048d4050bf88f7e6d7051e380c40ef91e1d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 20 16:12:51 2020 -0800 Test assertion failure due to class name BridgeDB attempted to use metaprogramming to define the class name for bridgedb/filters.py's byIPv4 and byIPv6. Rather than puzzling that out simply changing the assertion. Honestly it would be nice if BridgeDB did less of this - it makes the code a lot harder to follow. This sidesteps... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_distributor.py", line 237, in test_EmailDistributor_prepopulateRings self.failUnlessIn("IPv4", "".join([str(ringname) for ringname in ringnames])) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 492, in assertIn % (containee, container)) twisted.trial.unittest.FailTest: 'IPv4' not in 'frozenset({<function byIPv.<locals>._byIPv at 0x7f954be99d08>})frozenset({<function byIPv.<locals>._byIPv at 0x7f954be99d90>})' Test results changed as follows... before: FAILED (skips=115, failures=18, successes=851) after: FAILED (skips=115, failures=17, successes=852) --- bridgedb/test/test_email_distributor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bridgedb/test/test_email_distributor.py b/bridgedb/test/test_email_distributor.py index d95370f..716d190 100644 --- a/bridgedb/test/test_email_distributor.py +++ b/bridgedb/test/test_email_distributor.py @@ -234,8 +234,8 @@ class EmailDistributorTests(unittest.TestCase): # There should be an IPv4 subring and an IPv6 ring: ringnames = dist.hashring.filterRings.keys() - self.failUnlessIn("IPv4", "".join([str(ringname) for ringname in ringnames])) - self.failUnlessIn("IPv6", "".join([str(ringname) for ringname in ringnames])) + self.failUnlessIn("IPv", "".join([str(ringname) for ringname in ringnames])) + self.assertEqual(2, len(ringnames)) [dist.hashring.insert(bridge) for bridge in self.bridges] @@ -246,8 +246,8 @@ class EmailDistributorTests(unittest.TestCase): # Ugh, the hashring code is so gross looking. subrings = dist.hashring.filterRings - subring1 = subrings.values()[0][1] - subring2 = subrings.values()[1][1] + subring1 = list(subrings.values())[0][1] + subring2 = list(subrings.values())[1][1] # Each subring should have roughly the same number of bridges. # (Having ±10 bridges in either ring, out of 500 bridges total, should # be so bad.)

1 0

[bridgedb/master] Type fix for generation of qrcodes
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 82f4566fa127690184cd3aa443d1d5fd9001ff8d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 19 17:33:59 2020 -0800 Type fix for generation of qrcodes Fixing the following test failures... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_qrcodes.py", line 49, in test_generateQR self.assertTrue(qrcodes.generateQR(self.bridgelines)) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 395, in assertTrue super(_Assertions, self).assertTrue(condition, msg) File "/usr/lib/python3.5/unittest/case.py", line 677, in assertTrue raise self.failureException(msg) twisted.trial.unittest.FailTest: None is not true The actual problem was being masked by another catch-all... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_qrcodes.py", line 68, in test_generateQR_bridgeSchema self.assertTrue(qrcodes.generateQR(self.bridgelines, bridgeSchema=True)) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/qrcodes.py", line 65, in generateQR img.save(buf, imageFormat) File "/usr/local/lib/python3.5/dist-packages/PIL/Image.py", line 2084, in save save_handler(self, fp, filename) File "/usr/local/lib/python3.5/dist-packages/PIL/JpegImagePlugin.py", line 770, in _save ImageFile._save(im, fp, [("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize) File "/usr/local/lib/python3.5/dist-packages/PIL/ImageFile.py", line 513, in _save fp.write(d) builtins.TypeError: string argument expected, got 'bytes' Test results changed as follows... before: FAILED (skips=115, failures=23, successes=846) after: FAILED (skips=115, failures=21, successes=848) --- bridgedb/qrcodes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/qrcodes.py b/bridgedb/qrcodes.py index 80e82c8..6030a42 100644 --- a/bridgedb/qrcodes.py +++ b/bridgedb/qrcodes.py @@ -26,7 +26,7 @@ except ImportError: # pragma: no cover "python-qrcode package.")) -def generateQR(bridgelines, imageFormat=u'JPEG', bridgeSchema=False): +def generateQR(bridgelines, imageFormat='JPEG', bridgeSchema=False): """Generate a QRCode for the client's bridge lines. :param str bridgelines: The Bridge Lines which we are distributing to the @@ -60,7 +60,7 @@ def generateQR(bridgelines, imageFormat=u'JPEG', bridgeSchema=False): qr = qrcode.QRCode() qr.add_data(bridgelines) - buf = io.StringIO() + buf = io.BytesIO() img = qr.make_image().resize([350, 350]) img.save(buf, imageFormat) buf.seek(0)

1 0

[bridgedb/master] Fix moat test
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit c08de396a039f559adc60a7b2a1c81aa8da0bfa0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 16:29:21 2020 -0800 Fix moat test Trivial byte hiccup... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_distributors_moat_server.py", line 183, in test_formatDataForResponse_no_data rendered = self.resource.formatDataForResponse(None, request) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/moat/server.py", line 182, in formatDataForResponse request.responseHeaders.addRawHeader(b"Server", b"moat/%s" % MOAT_API_VERSION) builtins.TypeError: %b requires bytes, or an object that implements __bytes__, not 'str' Test results changed as follows... before: FAILED (skips=114, failures=16, errors=76, successes=778) after: FAILED (skips=114, failures=21, errors=57, successes=792) --- bridgedb/distributors/moat/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index 7391325..c2f59c1 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -179,7 +179,7 @@ class JsonAPIResource(resource.Resource): :returns: The encoded data. """ request.responseHeaders.addRawHeader(b"Content-Type", b"application/vnd.api+json") - request.responseHeaders.addRawHeader(b"Server", b"moat/%s" % MOAT_API_VERSION) + request.responseHeaders.addRawHeader(b"Server", b"moat/%s" % MOAT_API_VERSION.encode('utf-8')) if data: rendered = json.dumps(data)

1 0

[bridgedb/master] Fix 'pos' argument type
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 6df6f3670549efb06fd212838de561924dde4f15 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 19 14:53:42 2020 -0800 Fix 'pos' argument type This took me quite a while to puzzle out. Problem was the pos argument, not a unicode entry within sortedKeys... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Bridges.py", line 95, in test_getBridges_filterBySubnet bridges = self.ring.getBridges('a' * Bridges.DIGEST_LEN, N=3, filterBySubnet=True) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Bridges.py", line 327, in getBridges for k in forced + self._getBridgeKeysAt(pos, N + N): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Bridges.py", line 259, in _getBridgeKeysAt idx = bisect.bisect_left(self.sortedKeys, pos) builtins.TypeError: unorderable types: bytes() < str() Test results changed as follows... before: FAILED (skips=115, failures=27, errors=1, successes=841) after: FAILED (skips=115, failures=27, successes=842) --- bridgedb/test/test_Bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/test/test_Bridges.py b/bridgedb/test/test_Bridges.py index 8f629f5..77eff1c 100644 --- a/bridgedb/test/test_Bridges.py +++ b/bridgedb/test/test_Bridges.py @@ -92,7 +92,7 @@ class BridgeRingTests(unittest.TestCase): filtering by distinct subnets. """ self.addRandomBridges() - bridges = self.ring.getBridges('a' * Bridges.DIGEST_LEN, N=3, filterBySubnet=True) + bridges = self.ring.getBridges(b'a' * Bridges.DIGEST_LEN, N=3, filterBySubnet=True) self.assertEqual(len(bridges), 3) def test_dumpAssignments(self):

1 0

[bridgedb/master] Fix crypto tests
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 6e0fe68321cb88f83c7e9d37f4458e10551a33b9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 16:55:11 2020 -0800 Fix crypto tests This corrects the following... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_crypto.py", line 226, in test_crypto_initializeGnuPG_nonexistent_default_key gpg, signfunc = crypto.initializeGnuPG(self.config) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/crypto.py", line 318, in initializeGnuPG for sub in list(primaryPK)[0]['subkeys']: builtins.IndexError: list index out of range Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_crypto.py", line 218, in test_crypto_initializeGnuPG_signingFunc self.assertTrue(sig.startswith('-----BEGIN PGP SIGNED MESSAGE-----')) builtins.TypeError: startswith first arg must be bytes or a tuple of bytes, not str Test results changed as follows... before: FAILED (skips=114, failures=21, errors=55, successes=794) after: FAILED (skips=114, failures=21, errors=52, successes=797) --- bridgedb/crypto.py | 7 ++++--- bridgedb/test/test_crypto.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bridgedb/crypto.py b/bridgedb/crypto.py index 1aee089..db3d083 100644 --- a/bridgedb/crypto.py +++ b/bridgedb/crypto.py @@ -310,12 +310,13 @@ def initializeGnuPG(config): logging.warn("No secret keys found in %s!" % gpg.secring) return ret - primarySK = filter(lambda key: key['fingerprint'] == primary, secrets) - primaryPK = filter(lambda key: key['fingerprint'] == primary, publics) + primarySK = list(filter(lambda key: key['fingerprint'] == primary, secrets)) + primaryPK = list(filter(lambda key: key['fingerprint'] == primary, publics)) if primarySK and primaryPK: logging.info("Found GnuPG primary key with fingerprint: %s" % primary) - for sub in list(primaryPK)[0]['subkeys']: + + for sub in primaryPK[0]['subkeys']: logging.info(" Subkey: %s Usage: %s" % (sub[0], sub[1].upper())) else: logging.warn("GnuPG key %s could not be found in %s!" % (primary, gpg.secring)) diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 9255c30..9911686 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -215,7 +215,7 @@ class InitializeGnuPGTests(unittest.TestCase): sig = signfunc("This is a test of the public broadcasting system.") print(sig) self.assertIsNotNone(sig) - self.assertTrue(sig.startswith('-----BEGIN PGP SIGNED MESSAGE-----')) + self.assertTrue(sig.startswith(b'-----BEGIN PGP SIGNED MESSAGE-----')) def test_crypto_initializeGnuPG_nonexistent_default_key(self): """When the key specified by EMAIL_GPG_PRIMARY_KEY_FINGERPRINT doesn't

1 0

[bridgedb/master] Fix dkim header check
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit aa6cbac12ffc93ffe664f9ede816e66214583c4a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 20 15:25:03 2020 -0800 Fix dkim header check Oops, this one's my bad. When migrating from the rfc822 module I broke this check. The new email message's get() method returns a string rather than a list so we shouldn't index into it (we were setting dkimHeader to only the first character). This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_dkim.py", line 57, in test_checkDKIM_good self.assertTrue(result) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 395, in assertTrue super(_Assertions, self).assertTrue(condition, msg) File "/usr/lib/python3.5/unittest/case.py", line 677, in assertTrue raise self.failureException(msg) twisted.trial.unittest.FailTest: False is not true Test results changed as follows... before: FAILED (skips=115, failures=19, successes=850) after: FAILED (skips=115, failures=18, successes=851) --- bridgedb/distributors/email/dkim.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bridgedb/distributors/email/dkim.py b/bridgedb/distributors/email/dkim.py index 48118c8..5cee31d 100644 --- a/bridgedb/distributors/email/dkim.py +++ b/bridgedb/distributors/email/dkim.py @@ -64,9 +64,7 @@ def checkDKIM(message, rules): # getheader() returns the last of a given kind of header; we want # to get the first, so we use getheaders() instead. dkimHeaders = message.get("X-DKIM-Authentication-Results") - dkimHeader = "<no header>" - if dkimHeaders: - dkimHeader = dkimHeaders[0] + dkimHeader = dkimHeaders if dkimHeaders else "<no header>" if not dkimHeader.startswith("pass"): logging.info("Rejecting bad DKIM header on incoming email: %r " % dkimHeader)

1 0

[bridgedb/master] Fix email header encoding
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 5c1c88c6a7ccad888da7ef49e6b2d0ab909bebf9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 19 17:59:10 2020 -0800 Fix email header encoding Type issues that manifested in the following... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_server.py", line 208, in test_SMTPIncomingDelivery_receivedHeader self.assertSubstring("Received: from example.com", hdr) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 571, in assertSubstring return self.failUnlessIn(substring, astring, msg) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 492, in assertIn % (containee, container)) twisted.trial.unittest.FailTest: 'Received: from example.com' not in "Received: from b'example.com' ([b'127.0.0.1'] helo=b'example.com')\n\tby b'morrigan' with BridgeDB (0.9.1+61.g862b4bd.dirty)\n\tfor client(a)example.com; b'Sun, 19 Jan 2020 17:35:00 -0800' " Test results changed as follows... before: FAILED (skips=115, failures=21, successes=848) after: FAILED (skips=115, failures=20, successes=849) --- bridgedb/distributors/email/server.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index f9590be..38ed988 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -290,11 +290,11 @@ class SMTPIncomingDelivery(smtp.SMTP): :type recipients: list :param recipients: A list of :api:`twisted.mail.smtp.User` instances. """ - helo_ = ' helo={0}'.format(helo[0]) if helo[0] else '' - from_ = 'from %s ([%s]%s)' % (helo[0], helo[1], helo_) - by_ = 'by %s with BridgeDB (%s)' % (smtp.DNSNAME, __version__) - for_ = 'for %s; %s ' % (' '.join(map(str, recipients)), rfc822date()) - return str('Received: %s\n\t%s\n\t%s' % (from_, by_, for_)) + helo_ = b' helo=%s' % (helo[0] if helo[0] else '') + from_ = b'from %s ([%s]%s)' % (helo[0], helo[1], helo_) + by_ = b'by %s with BridgeDB (%s)' % (smtp.DNSNAME, __version__.encode('utf-8')) + for_ = b'for %s; %s ' % (b' '.join([str(r).encode('utf-8') for r in recipients]), rfc822date()) + return 'Received: %s\n\t%s\n\t%s' % (from_.decode('utf-8'), by_.decode('utf-8'), for_.decode('utf-8')) def validateFrom(self, helo, origin): """Validate the ``MAIL FROM:`` address on the incoming SMTP connection.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020