tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

[bridgedb/master] Assert that crypto keys are bytes
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 28b3fb3d396c31fe905bd5881f2dfff1fa9d12f6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 20 18:18:20 2020 -0800 Assert that crypto keys are bytes Simple update to these assertions... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_crypto.py", line 75, in test_getKey_tmpfile "key isn't a string! type=%r" % type(key)) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/_synctest.py", line 649, in assertIsInstance instance, classOrTuple, suffix)) twisted.trial.unittest.FailTest: b'#\x1e\xe1\xef\x93\x1c\xdf\x1c\x81\xdd\x02\xc3\xd1$\x07\xfb\xac\x00qSG\xb1\x84\xd6\xe32N,\xa9\xfe\xc8\xa0' is not an instance of <class 'str'>: key isn't a string! type=<class 'bytes'> Test results changed as follows... before: FAILED (skips=115, failures=9, successes=860) after: FAILED (skips=115, failures=3, successes=866) --- bridgedb/test/test_captcha.py | 10 +++++----- bridgedb/test/test_crypto.py | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index cc0c99c..d504761 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -77,8 +77,8 @@ class ReCaptchaTests(unittest.TestCase): reason += "connection.\nThis test failed with: %s" % error raise unittest.SkipTest(reason) else: - self.assertIsInstance(self.c.image, str) - self.assertIsInstance(self.c.challenge, str) + self.assertIsInstance(self.c.image, bytes) + self.assertIsInstance(self.c.challenge, bytes) finally: # Replace the original environment variable if there was one: if oldkey: @@ -146,7 +146,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) challenge = c.createChallenge('w00t') - self.assertIsInstance(challenge, str) + self.assertIsInstance(challenge, bytes) def test_createChallenge_base64(self): """createChallenge() return value should be urlsafe base64-encoded.""" @@ -189,8 +189,8 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - self.assertIsInstance(image, str) - self.assertIsInstance(challenge, str) + self.assertIsInstance(image, bytes) + self.assertIsInstance(challenge, bytes) def test_get_emptyCacheDir(self): """An empty cacheDir should raise GimpCaptchaError.""" diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 9911686..45c06ae 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -64,15 +64,15 @@ class GetKeyTests(unittest.TestCase): """Test retrieving the secret_key from an empty file.""" filename = os.path.join(os.getcwd(), 'sekrit') key = crypto.getKey(filename) - self.failUnlessIsInstance(key, str, - "key isn't a string! type=%r" % type(key)) + self.failUnlessIsInstance(key, bytes, + "key isn't bytes! type=%r" % type(key)) def test_getKey_tmpfile(self): """Test retrieving the secret_key from a new tmpfile.""" filename = self.mktemp() key = crypto.getKey(filename) - self.failUnlessIsInstance(key, str, - "key isn't a string! type=%r" % type(key)) + self.failUnlessIsInstance(key, bytes, + "key isn't bytes! type=%r" % type(key)) def test_getKey_keyexists(self): """Write the example key to a file and test reading it back.""" @@ -82,8 +82,8 @@ class GetKeyTests(unittest.TestCase): fh.flush() key = crypto.getKey(filename) - self.failUnlessIsInstance(key, str, - "key isn't a string! type=%r" % type(key)) + self.failUnlessIsInstance(key, bytes, + "key isn't bytes! type=%r" % type(key)) self.assertEqual(SEKRIT_KEY, key, """The example key and the one read from file differ! key (in hex): %s

1 0

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

19 Feb '20

commit 7696471145c2110b95b1eae5b5b66a3098551ce1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 16:21:07 2020 -0800 Fix dkim tests Oops, unsure how I missed this rfc822 usage when I fixed the other calls. This corrects... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_dkim.py", line 61, in test_checkDKIM_bad message = self._createMessage(self.badMessage) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_dkim.py", line 50, in _createMessage messageIO = io.StringIO(unicode(messageString)) builtins.NameError: name 'unicode' is not defined Test results changed as follows... before: FAILED (skips=114, failures=16, errors=82, successes=772) after: FAILED (skips=114, failures=16, errors=76, successes=778) --- bridgedb/distributors/email/dkim.py | 2 +- bridgedb/test/test_email_dkim.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb/distributors/email/dkim.py b/bridgedb/distributors/email/dkim.py index be33d59..48118c8 100644 --- a/bridgedb/distributors/email/dkim.py +++ b/bridgedb/distributors/email/dkim.py @@ -63,7 +63,7 @@ def checkDKIM(message, rules): if 'dkim' in rules: # getheader() returns the last of a given kind of header; we want # to get the first, so we use getheaders() instead. - dkimHeaders = message.getheaders("X-DKIM-Authentication-Results") + dkimHeaders = message.get("X-DKIM-Authentication-Results") dkimHeader = "<no header>" if dkimHeaders: dkimHeader = dkimHeaders[0] diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py index 2330a71..679575f 100644 --- a/bridgedb/test/test_email_dkim.py +++ b/bridgedb/test/test_email_dkim.py @@ -11,6 +11,7 @@ """Unittests for the :mod:`bridgedb.distributors.email.dkim` module.""" +import email import email.message import io @@ -47,8 +48,7 @@ get bridges def _createMessage(self, messageString): """Create an ``email.message.Message`` from a string.""" - messageIO = io.StringIO(unicode(messageString)) - return rfc822.Message(messageIO) + return email.message_from_string(messageString) def test_checkDKIM_good(self): message = self._createMessage(self.goodMessage)

1 0

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

19 Feb '20

commit 1767e28d61a97afeb3a55bbbe8f0bb3fd7e10e9b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 20 16:43:26 2020 -0800 Fix gimp captcha check BridgeDB's multiple layers of catch-alls made this take over an hour to solve. The surface level exception is... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_distributors_moat_server.py", line 947, in test_render_POST_unexpired_with_qrcode self.assertIsNotNone(decoded.get('data')) File "/usr/lib/python3.5/unittest/case.py", line 1229, in assertIsNotNone self.fail(self._formatMessage(msg, standardMsg)) twisted.trial.unittest.FailTest: unexpectedly None ... but multiple layers down the actual error is... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_distributors_moat_server.py", line 691, in test_withoutBlockIn self.resource.render(request) File "/usr/local/lib/python3.5/dist-packages/twisted/web/resource.py", line 265, in render return m(request) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/moat/server.py", line 716, in render_POST valid = self.checkSolution(challenge, solution, clientIP) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/moat/server.py", line 631, in checkSolution raise impossible File "/home/atagar/Desktop/tor/bridgedb/bridgedb/distributors/moat/server.py", line 628, in checkSolution self.secretKey, clientHMACKey) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/captcha.py", line 293, in check timestamp = answerBlob[:12].lstrip('0') builtins.TypeError: a bytes-like object is required, not 'str' Test results changed as follows... before: FAILED (skips=115, failures=17, successes=852) after: FAILED (skips=115, failures=9, successes=860) --- bridgedb/captcha.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index fe0b876..6d8e8f7 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -289,10 +289,10 @@ class GimpCaptcha(Captcha): if hmacIsValid: try: answerBlob = secretKey.decrypt(encBlob) - timestamp = answerBlob[:12].lstrip('0') + timestamp = answerBlob[:12].lstrip(b'0') then = cls.sched.nextIntervalStarts(int(timestamp)) now = int(time.time()) - answer = answerBlob[12:] + answer = answerBlob[12:].decode('utf-8') except Exception as error: logging.warn(str(error)) else:

1 0

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

19 Feb '20

commit cfd8bf2e03a7761264f8570da0219e74ee22d36e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 18 16:11:51 2020 -0800 Fix email server tests Test results changed as follows... before: FAILED (skips=114, failures=16, errors=108, successes=747) after: FAILED (skips=114, failures=16, errors=82, successes=772) --- bridgedb/distributors/email/server.py | 6 +++--- bridgedb/parse/addr.py | 1 + bridgedb/schedule.py | 7 ++++--- bridgedb/test/test_email_server.py | 33 +++++++++++++++++++-------------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index 8a2fbea..f9590be 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -373,10 +373,10 @@ class SMTPIncomingDelivery(smtp.SMTP): ourAddress = smtp.Address(self.context.smtpFromAddr) if not ((ourAddress.domain in recipient.domain) or - (recipient.domain == "bridgedb")): + (recipient.domain == b"bridgedb")): logging.debug(("Not our domain (%s) or subdomain, skipping" " SMTP 'RCPT TO' address: %s") - % (ourAddress.domain, str(recipient))) + % (ourAddress.domain.decode('utf-8'), str(recipient))) raise smtp.SMTPBadRcpt(str(recipient)) # The recipient's username should at least start with ours, # but it still might be a '+' address. @@ -385,7 +385,7 @@ class SMTPIncomingDelivery(smtp.SMTP): " SMTP 'RCPT TO' address: %s") % str(recipient)) raise smtp.SMTPBadRcpt(str(recipient)) # Ignore everything after the first '+', if there is one. - beforePlus = recipient.local.split('+', 1)[0] + beforePlus = recipient.local.split(b'+', 1)[0] if beforePlus != ourAddress.local: raise smtp.SMTPBadRcpt(str(recipient)) diff --git a/bridgedb/parse/addr.py b/bridgedb/parse/addr.py index 334733d..1d59c9a 100644 --- a/bridgedb/parse/addr.py +++ b/bridgedb/parse/addr.py @@ -231,6 +231,7 @@ def canonicalizeEmailDomain(domain, domainmap): :returns: The canonical domain name for the email address. """ permitted = None + domain = domain.decode('utf-8') if isinstance(domain, bytes) else domain try: permitted = domainmap.get(domain) diff --git a/bridgedb/schedule.py b/bridgedb/schedule.py index 8a7ca0f..4704130 100644 --- a/bridgedb/schedule.py +++ b/bridgedb/schedule.py @@ -200,13 +200,14 @@ class ScheduledInterval(Unscheduled): :raises UnknownInterval: if the specified **count** was invalid. """ try: - if count is None or not count > 0: + if count is None: count = 1 count = int(count) except (TypeError, ValueError): - raise UnknownInterval("%s.intervalCount: %r ist not an integer." + raise UnknownInterval("%s.intervalCount: %r is not an integer." % (self.__class__.__name__, count)) - self.intervalCount = count + + self.intervalCount = max(1, count) def _setIntervalPeriod(self, period=None): """Set our :attr:`intervalPeriod`. diff --git a/bridgedb/test/test_email_server.py b/bridgedb/test/test_email_server.py index 081a0e4..fb82cc0 100644 --- a/bridgedb/test/test_email_server.py +++ b/bridgedb/test/test_email_server.py @@ -154,7 +154,7 @@ class SMTPIncomingDeliveryTests(unittest.TestCase): """ self.helo = (domain, ipaddress) self._createProtocolWithHost(domain) - self.origin = Address('@'.join((username, domain,))) + self.origin = Address(b'@'.join((username, domain,))) self.user = User(username, self.helo, self.proto, self.origin) def _setUpMAILFROM(self): @@ -173,9 +173,9 @@ class SMTPIncomingDeliveryTests(unittest.TestCase): The default is to emulate sending: ``RCPT TO: bridges@localhost``. """ - name = username if username is not None else self.config.EMAIL_USERNAME - host = domain if domain is not None else 'localhost' - addr = ip if ip is not None else '127.0.0.1' + name = username if username is not None else self.config.EMAIL_USERNAME.encode('utf-8') + host = domain if domain is not None else b'localhost' + addr = ip if ip is not None else b'127.0.0.1' self._createUser(name, host, ip) self.delivery.setContext(self.context) @@ -203,7 +203,7 @@ class SMTPIncomingDeliveryTests(unittest.TestCase): ``'client(a)example.com'`` should contain a header stating: ``'Received: from example.com'``. """ - self._createUser('client', 'example.com', '127.0.0.1') + self._createUser(b'client', b'example.com', b'127.0.0.1') hdr = self.delivery.receivedHeader(self.helo, self.origin, [self.user,]) self.assertSubstring("Received: from example.com", hdr) @@ -237,14 +237,14 @@ class SMTPIncomingDeliveryTests(unittest.TestCase): def test_SMTPIncomingDelivery_validateTo_plusAddress(self): """Should return a callable that results in a SMTPMessage.""" - self._setUpRCPTTO('bridges+ar') + self._setUpRCPTTO(b'bridges+ar') validated = self.delivery.validateTo(self.user) self.assertIsInstance(validated, types.FunctionType) self.assertIsInstance(validated(), server.SMTPMessage) def test_SMTPIncomingDelivery_validateTo_badUsername_plusAddress(self): """'givemebridges+zh_cn@...' should raise an SMTPBadRcpt exception.""" - self._setUpRCPTTO('givemebridges+zh_cn') + self._setUpRCPTTO(b'givemebridges+zh_cn') self.assertRaises(SMTPBadRcpt, self.delivery.validateTo, self.user) def test_SMTPIncomingDelivery_validateTo_badUsername(self): @@ -252,20 +252,20 @@ class SMTPIncomingDeliveryTests(unittest.TestCase): ``RCPT TO: yo.mama@localhost`` should raise a ``twisted.mail.smtp.SMTPBadRcpt`` exception. """ - self._setUpRCPTTO('yo.mama') + self._setUpRCPTTO(b'yo.mama') self.assertRaises(SMTPBadRcpt, self.delivery.validateTo, self.user) def test_SMTPIncomingDelivery_validateTo_notOurDomain(self): """An SMTP ``RCPT TO: bridges(a)forealsi.es`` should raise an SMTPBadRcpt exception. """ - self._setUpRCPTTO('bridges', 'forealsi.es') + self._setUpRCPTTO(b'bridges', b'forealsi.es') self.assertRaises(SMTPBadRcpt, self.delivery.validateTo, self.user) def test_SMTPIncomingDelivery_validateTo_subdomain(self): """An SMTP ``RCPT TO: bridges(a)subdomain.localhost`` should be allowed. """ - self._setUpRCPTTO('bridges', 'subdomain.localhost') + self._setUpRCPTTO(b'bridges', b'subdomain.localhost') validated = self.delivery.validateTo(self.user) self.assertIsInstance(validated, types.FunctionType) self.assertIsInstance(validated(), server.SMTPMessage) @@ -339,7 +339,7 @@ class SMTPTestCaseMixin(util.TestCaseMixin): 'Subject: %s' % subject, '\r\n %s' % body, '.'] # SMTP DATA EOM command - emailText = self.proto.delimiter.join(contents) + emailText = self.proto.delimiter.decode('utf-8').join(contents) return emailText def _buildSMTP(self, commands): @@ -351,7 +351,7 @@ class SMTPTestCaseMixin(util.TestCaseMixin): :returns: The string for sending those **commands**, suitable for giving to a :api:`twisted.internet.Protocol.dataReceived` method. """ - data = self.proto.delimiter.join(commands) + self.proto.delimiter + data = self.proto.delimiter.decode('utf-8').join(commands) + self.proto.delimiter.decode('utf-8') return data def _test(self, commands, expected, noisy=False): @@ -369,8 +369,8 @@ class SMTPTestCaseMixin(util.TestCaseMixin): "client" and the "server" in a nicely formatted manner. """ data = self._buildSMTP(commands) - self.proto.dataReceived(data) - recv = self.transport.value() + self.proto.dataReceived(data.encode('utf-8')) + recv = self.transport.value().decode('utf-8') if noisy: client = data.replace('\r\n', '\r\n ') @@ -515,7 +515,12 @@ class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase): def tearDown(self): """Kill all connections with fire.""" if self.transport: + if not hasattr(self.transport, 'protocol'): + factory = server.addServer(self.config, self.dist) + self.transport.protocol = factory.buildProtocol(('127.0.0.1', 0)) + self.transport.loseConnection() + super(EmailServerServiceTests, self).tearDown() # FIXME: this is definitely not how we're supposed to do this, but it # kills the DirtyReactorAggregateErrors.

1 0

[bridgedb/master] Change Travis's Python version to 3.7.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 257b549d5545604114f0ac4047ce009955ac0c0e Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Jan 27 16:02:57 2020 -0800 Change Travis's Python version to 3.7. We won't be supporting Python 2 anymore, so we may as well drop it. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c0499b0..e57481d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ notifications: on_failure: change python: - - "2.7" + - "3.7" addons: hosts:

1 0

[bridgedb/master] Add missing pyOpenSSL dependency.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 86e379ff748225f63d0032fe6b1811b0d8a2d655 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Jan 27 16:14:17 2020 -0800 Add missing pyOpenSSL dependency. --- .travis.requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 7132226..1a1d7ff 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -25,6 +25,7 @@ gnupg==2.3.1 ipaddr==2.2.0 mechanize==0.4.5 Pillow==6.2.2 +pyOpenSSL==19.0.0 pygeoip==0.3.2 qrcode==6.1 service_identity==18.1.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020