tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

[bridgedb/develop] 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/develop] 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/develop] 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/develop] Fix captcha tests
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 62e5f00925ad8d19a6395e930e0a1869ea5d84e4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 17:01:24 2020 -0800 Fix captcha tests Nothing too particularly interesting... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_captcha.py", line 63, in test_get if os.environ.has_key(envkey): builtins.AttributeError: '_Environ' object has no attribute 'has_key' Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_captcha.py", line 191, in test_get image, challenge = c.get() File "/home/atagar/Desktop/tor/bridgedb/bridgedb/captcha.py", line 391, in get self.image = imageFile.read() File "/usr/lib/python3.5/codecs.py", line 321, in decode (result, consumed) = self._buffer_decode(data, self.errors, final) builtins.UnicodeDecodeError: 'utf-8' codec can't decode byte 0xff in position 0: invalid start byte Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_captcha.py", line 163, in test_createChallenge_hmacValid challenge = c.createChallenge('ShouldHaveAValidHMAC') File "/home/atagar/Desktop/tor/bridgedb/bridgedb/captcha.py", line 369, in createChallenge encBlob = self.publicKey.encrypt(blob) File "/usr/local/lib/python3.5/dist-packages/Crypto/Cipher/PKCS1_OAEP.py", line 121, in encrypt db = lHash + ps + b'\x01' + _copy_bytes(None, None, message) builtins.TypeError: can't concat bytes to str Test results changed as follows... before: FAILED (skips=114, failures=21, errors=52, successes=797) after: FAILED (skips=115, failures=29, errors=34, successes=806) --- bridgedb/captcha.py | 4 ++-- bridgedb/distributors/moat/server.py | 4 ++-- bridgedb/test/test_captcha.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index a4753fa..fe0b876 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -366,7 +366,7 @@ class GimpCaptcha(Captcha): """ timestamp = str(int(time.time())).zfill(12) blob = timestamp + answer - encBlob = self.publicKey.encrypt(blob) + encBlob = self.publicKey.encrypt(blob.encode('utf-8')) hmac = crypto.getHMAC(self.hmacKey, encBlob) challenge = urlsafe_b64encode(hmac + encBlob) return challenge @@ -387,7 +387,7 @@ class GimpCaptcha(Captcha): try: imageFilename = random.choice(os.listdir(self.cacheDir)) imagePath = os.path.join(self.cacheDir, imageFilename) - with open(imagePath) as imageFile: + with open(imagePath, 'rb') as imageFile: self.image = imageFile.read() except IndexError: raise GimpCaptchaError("CAPTCHA cache dir appears empty: %r" diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index c2f59c1..4dde385 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -368,7 +368,7 @@ class CaptchaFetchResource(CaptchaResource): logging.error("Unhandled error while retrieving Gimp captcha!") logging.error(impossible) - return (capt.image, capt.challenge) + return (capt.image, capt.challenge.decode('utf-8') if isinstance(capt.challenge, bytes) else capt.challenge) def getPreferredTransports(self, supportedTransports): """Choose which transport a client should request, based on their list @@ -476,7 +476,7 @@ class CaptchaFetchResource(CaptchaResource): } try: - data["data"][0]["image"] = base64.b64encode(image) + data["data"][0]["image"] = base64.b64encode(image).decode('utf-8') except Exception as impossible: logging.error("Could not construct or encode captcha!") logging.error(impossible) diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index 92cc716..cc0c99c 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -60,7 +60,7 @@ class ReCaptchaTests(unittest.TestCase): # Force urllib.request to do anything less idiotic than the defaults: envkey = 'HTTPS_PROXY' oldkey = None - if os.environ.has_key(envkey): + if envkey in os.environ: oldkey = os.environ[envkey] os.environ[envkey] = '127.0.0.1:9150' # This stupid thing searches the environment for ``<protocol>_PROXY`` @@ -179,7 +179,7 @@ class GimpCaptchaTests(unittest.TestCase): self.assertEqual(hmac, correctHMAC) decrypted = self.sekrit.decrypt(orig) - timestamp = int(decrypted[:12].lstrip('0')) + timestamp = int(decrypted[:12].lstrip(b'0')) # The timestamp should be within 30 seconds of right now. self.assertApproximates(timestamp, int(time.time()), 30) self.assertEqual('ThisAnswerShouldDecryptToThis', decrypted[12:]) @@ -238,7 +238,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - challengeBadB64 = challenge.rstrip('==') + "\x42\x42\x42" + challengeBadB64 = challenge.decode('utf-8').rstrip('==') + "\x42\x42\x42" self.assertEquals( c.check(challenge, c.answer, c.secretKey, c.hmacKey), True)

1 0

[bridgedb/develop] Forgot troubleshoting raise
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 59877413ec137f44e3de86c5d9185976c6062f14 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 19 14:20:27 2020 -0800 Forgot troubleshoting raise Oops, this one is purely my bad. I negated this catch-all while troubleshooting other test failures, but forgot to revert it afterward. This caused... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_bridges.py", line 1253, in test_Bridge_updateFromExtraInfoDescriptor_bad_signature_changed self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 1764, in updateFromExtraInfoDescriptor self._verifyExtraInfoSignature(descriptor) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/bridges.py", line 1709, in _verifyExtraInfoSignature unpadded = removePKCS1Padding(decryptedBytes) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/crypto.py", line 261, in removePKCS1Padding raise PKCS1PaddingError("Couldn't find PKCS#1 separator byte!") bridgedb.crypto.PKCS1PaddingError: Couldn't find PKCS#1 separator byte! Test results changed as follows... before: FAILED (skips=115, failures=27, errors=2, successes=840) after: FAILED (skips=115, failures=27, errors=1, successes=841) --- bridgedb/bridges.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index 049dbf1..1dc32af 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -1713,7 +1713,6 @@ class Bridge(BridgeBackwardsCompatibility): actualDigest = hashlib.sha1(document.encode('utf-8')).hexdigest() except Exception as error: - raise logging.debug("Error verifying extrainfo signature: %s" % error) raise InvalidExtraInfoSignature( "Extrainfo signature for %s couldn't be decoded: %s" %

1 0

[bridgedb/develop] Get unicode rather than byte descriptors
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 14678b00f0d90fada7e7d4616370673156e278a0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 18:23:42 2020 -0800 Get unicode rather than byte descriptors Test results changed as follows... before: FAILED (skips=115, failures=29, errors=34, successes=806) after: FAILED (skips=115, failures=29, errors=3, successes=837) --- bridgedb/Bridges.py | 2 +- bridgedb/bridges.py | 11 ++++++----- bridgedb/test/test_Bridges.py | 2 +- bridgedb/test/test_bridges.py | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 93d0190..c29a2bf 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -356,7 +356,7 @@ class BridgeRing(object): def dumpAssignments(self, f, description=""): logging.info("Dumping bridge assignments for %s..." % self.name) - for b in self.bridges.itervalues(): + for b in self.bridges.values(): desc = [ description ] for tp,val,_,subring in self.subrings: if subring.getBridgeByID(b.identity): diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index cdd1ae8..049dbf1 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -240,7 +240,7 @@ class BridgeAddressBase(object): :param str value: The binary-encoded SHA-1 hash digest of the public half of this Bridge's identity key. """ - self.fingerprint = toHex(value) + self.fingerprint = toHex(value).decode('utf-8') @identity.deleter def identity(self): @@ -743,7 +743,7 @@ class BridgeBackwardsCompatibility(BridgeBase): if not fingerprint: if not len(idDigest) == 20: raise TypeError("Bridge with invalid ID") - self.fingerprint = toHex(idDigest) + self.fingerprint = toHex(idDigest).decode('utf-8') elif fingerprint: if not isValidFingerprint(fingerprint): raise TypeError("Bridge with invalid fingerprint (%r)" @@ -1665,7 +1665,7 @@ class Bridge(BridgeBackwardsCompatibility): logging.info("Verifying extrainfo signature for %s..." % self) # Get the bytes of the descriptor signature without the headers: - document, signature = descriptor.get_bytes().split(TOR_BEGIN_SIGNATURE) + document, signature = str(descriptor).split(TOR_BEGIN_SIGNATURE) signature = signature.replace(TOR_END_SIGNATURE, '') signature = signature.replace('\n', '') signature = signature.strip() @@ -1709,10 +1709,11 @@ class Bridge(BridgeBackwardsCompatibility): # This is the hexadecimal SHA-1 hash digest of the descriptor document # as it was signed: - signedDigest = codecs.encode(unpadded, 'hex_codec') - actualDigest = hashlib.sha1(document).hexdigest() + signedDigest = codecs.encode(unpadded, 'hex_codec').decode('utf-8') + actualDigest = hashlib.sha1(document.encode('utf-8')).hexdigest() except Exception as error: + raise logging.debug("Error verifying extrainfo signature: %s" % error) raise InvalidExtraInfoSignature( "Extrainfo signature for %s couldn't be decoded: %s" % diff --git a/bridgedb/test/test_Bridges.py b/bridgedb/test/test_Bridges.py index 19ab09c..1f4720f 100644 --- a/bridgedb/test/test_Bridges.py +++ b/bridgedb/test/test_Bridges.py @@ -149,7 +149,7 @@ class FixedBridgeSplitterTests(unittest.TestCase): f.seek(0) data = f.read() - first = self.splitter.rings[0].bridges.values()[0].fingerprint + first = list(self.splitter.rings[0].bridges.values())[0].fingerprint # The first bridge's fingerprint should be within the data somewhere self.assertIn(first, data) diff --git a/bridgedb/test/test_bridges.py b/bridgedb/test/test_bridges.py index cf0ee23..fea2d33 100644 --- a/bridgedb/test/test_bridges.py +++ b/bridgedb/test/test_bridges.py @@ -970,7 +970,7 @@ class BridgeTests(unittest.TestCase): self.assertEqual( identifier, ''.join(['$$', - hashlib.sha1(bridge.fingerprint).hexdigest().upper(), + hashlib.sha1(bridge.fingerprint.encode('utf-8')).hexdigest().upper(), '~', bridge.nickname])) def test_Bridge_str_without_fingerprint(self):

1 0

[bridgedb/develop] Fix logging format
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 769712e03d37a294ba6a5b15ba0ddcbbfe3465d3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 19 15:15:33 2020 -0800 Fix logging format BridgeDB tried to configure its logging format via a private attribute. That attribute no longer works in python 3. Configuring the formatter via its constructor instead. This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_util.py", line 174, in test_util_JustifiedLogFormatter_format self.assertTrue('INFO' in formatted) 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=27, successes=842) after: FAILED (skips=115, failures=26, successes=843) --- bridgedb/util.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bridgedb/util.py b/bridgedb/util.py index db8e749..9572ad1 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -307,7 +307,6 @@ class JustifiedLogFormatter(logging.Formatter): :param bool logTrace: If ``True``, include information on the calling function in formatted log messages. """ - super(JustifiedLogFormatter, self).__init__(datefmt=datefmt) self.logThreads = logThreads self.logTrace = logTrace @@ -317,7 +316,7 @@ class JustifiedLogFormatter(logging.Formatter): _fmt.append("%(callingFunc)s") _fmt.append("%(message)s") - self._fmt = " ".join(_fmt) + super(JustifiedLogFormatter, self).__init__(fmt = " ".join(_fmt), datefmt=datefmt) def _formatCallingFuncName(self, record): """Format the combined module name and function name of the place where

1 0

[bridgedb/develop] 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/develop] 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/develop] 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020