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

[bridgedb/master] Upgrade to BeautifulSoup version 4
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 8ecf1cb35d252f387e22e947d6240ad4547e1972 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 13:25:30 2020 -0800 Upgrade to BeautifulSoup version 4 Installing beautifulsoup with python 3's pip fails with... You're trying to run a very old release of Beautiful Soup under Python 3. This will not work."<>"Please use Beautiful Soup 4, available through the pip package 'beautifulsoup4'. Attempting to use this as a drop-in replacement. Initially importing bs4 failed with... >>> import bs4 Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib/python3/dist-packages/bs4/__init__.py", line 30, in <module> from .builder import builder_registry, ParserRejectedMarkup File "/usr/lib/python3/dist-packages/bs4/builder/__init__.py", line 314, in <module> from . import _html5lib File "/usr/lib/python3/dist-packages/bs4/builder/_html5lib.py", line 70, in <module> class TreeBuilderForHtml5lib(html5lib.treebuilders._base.TreeBuilder): AttributeError: module 'html5lib.treebuilders' has no attribute '_base' Upgrading to a specific version of html5lib as per the following fixed this... https://stackoverflow.com/questions/38447738/beautifulsoup-html5lib-module-… Test results unchanged... before: FAILED (skips=6, failures=9, errors=194, successes=359) after: FAILED (skips=6, failures=9, errors=194, successes=359) --- bridgedb/captcha.py | 3 +-- bridgedb/test/test_https.py | 2 +- bridgedb/test/test_https_server.py | 2 +- requirements.txt | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index b758c09..a4753fa 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -65,8 +65,7 @@ import os import time import urllib.request -from BeautifulSoup import BeautifulSoup - +from bs4 import BeautifulSoup from zope.interface import Interface, Attribute, implementer from bridgedb import crypto diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index ffd7281..b6c3e0f 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -31,7 +31,7 @@ import ipaddr import mechanize import os -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from twisted.trial import unittest from twisted.trial.reporter import TestResult diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index 945ea06..3c799ba 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -19,7 +19,7 @@ import shutil import ipaddr -from BeautifulSoup import BeautifulSoup +from bs4 import BeautifulSoup from twisted.internet import reactor from twisted.internet import task diff --git a/requirements.txt b/requirements.txt index 5769e11..eed4889 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ Babel==2.8.0 -BeautifulSoup==3.2.2 +beautifulsoup4==4.8.2 +html5lib==1.0b8 Mako==1.1.1 pycryptodome==3.9.6 Twisted==19.10.0

1 0

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

19 Feb '20

commit f5cfc688fe7d809c7d76bd6935b5a630fde6401f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 13:33:30 2020 -0800 Fix exec syntax Updating the syntax for exec... https://docs.python.org/2.0/ref/exec.html https://docs.python.org/3/library/functions.html#exec This fixes the following errors... Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 823, in loadByName return self.suiteFactory([self.findByName(name, recurse=recurse)]) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 702, in findByName __import__(name) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_https.py", line 41, in <module> from bridgedb.test.test_Tests import DynamicTestCaseMeta File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Tests.py", line 29, in <module> from bridgedb.test import legacy_Tests as Tests File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/legacy_Tests.py", line 21, in <module> import bridgedb.main File "/home/atagar/Desktop/tor/bridgedb/bridgedb/main.py", line 24, in <module> from bridgedb import persistent File "/home/atagar/Desktop/tor/bridgedb/bridgedb/persistent.py", line 30, in <module> from bridgedb.configure import Conf builtins.SyntaxError: Missing parentheses in call to 'exec' (configure.py, line 85) This changes test results as follows... before: FAILED (skips=6, failures=9, errors=194, successes=359) after: FAILED (skips=103, failures=9, errors=189, successes=366) --- bridgedb/configure.py | 2 +- bridgedb/test/email_helpers.py | 2 +- bridgedb/test/https_helpers.py | 2 +- bridgedb/test/moat_helpers.py | 2 +- bridgedb/test/test_persistent.py | 2 +- bridgedb/test/test_persistentSaveAndLoad.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bridgedb/configure.py b/bridgedb/configure.py index 0bc4dd1..e069ea3 100644 --- a/bridgedb/configure.py +++ b/bridgedb/configure.py @@ -82,7 +82,7 @@ def loadConfig(configFile=None, configCls=None): if itsSafeToUseLogging: logging.info("Loading settings from config file: '%s'" % conffile) compiled = compile(open(conffile).read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) if itsSafeToUseLogging: logging.debug("New configuration settings:") diff --git a/bridgedb/test/email_helpers.py b/bridgedb/test/email_helpers.py index e149dd5..2fe8cdc 100644 --- a/bridgedb/test/email_helpers.py +++ b/bridgedb/test/email_helpers.py @@ -103,7 +103,7 @@ def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(configFile.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = Conf(**configuration) return config diff --git a/bridgedb/test/https_helpers.py b/bridgedb/test/https_helpers.py index fad841e..8c77085 100644 --- a/bridgedb/test/https_helpers.py +++ b/bridgedb/test/https_helpers.py @@ -107,7 +107,7 @@ def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(configFile.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = Conf(**configuration) return config diff --git a/bridgedb/test/moat_helpers.py b/bridgedb/test/moat_helpers.py index 07b44a0..8c40c82 100644 --- a/bridgedb/test/moat_helpers.py +++ b/bridgedb/test/moat_helpers.py @@ -94,7 +94,7 @@ def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(configFile.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = Conf(**configuration) return config diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 3ff6d87..72b4b85 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -47,7 +47,7 @@ class StateTest(unittest.TestCase): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = persistent.Conf(**configuration) fakeArgs = ['-c', os.path.join(os.getcwdu(), '..', 'bridgedb.conf')] diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 0ebb1e2..07ea73b 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -42,7 +42,7 @@ class StateSaveAndLoadTests(unittest.TestCase): configuration = {} TEST_CONFIG_FILE.seek(0) compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') - exec compiled in configuration + exec(compiled, configuration) config = persistent.Conf(**configuration) self.config = config

1 0

[bridgedb/master] Read router status entries as bytes
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 8db4ba1efcdfa8dbe72e1c237eb45fef0f91d79b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 13:41:20 2020 -0800 Read router status entries as bytes Stem expects descriptors to be bytes. This fixes the following errors... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_parse_descriptors.py", line 392, in test_parse_descriptors_parseNetworkStatusFile_bad_nickname ... File "/home/atagar/Desktop/tor/bridgedb/bridgedb/parse/descriptors.py", line 135, in parseNetworkStatusFile routers.extend(list(document)) File "/usr/local/lib/python3.5/dist-packages/stem/descriptor/router_status_entry.py", line 101, in _parse_file desc_content = bytes.join(b'', desc_lines) builtins.TypeError: sequence item 0: expected a bytes-like object, str found Just fixing that caused the tests to hang due to an infinite loop in descriptor parsing. Unsure why Isis implemented it that way so simply pulling that out. Test results changed as follows... before: FAILED (skips=103, failures=9, errors=189, successes=366) after: FAILED (skips=103, failures=6, errors=183, successes=375) --- bridgedb/parse/descriptors.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/bridgedb/parse/descriptors.py b/bridgedb/parse/descriptors.py index 1b01023..ff32226 100644 --- a/bridgedb/parse/descriptors.py +++ b/bridgedb/parse/descriptors.py @@ -122,10 +122,10 @@ def parseNetworkStatusFile(filename, validate=True, skipAnnotations=True, routers = [] logging.info("Parsing networkstatus file: %s" % filename) - with open(filename) as fh: + with open(filename, 'rb') as fh: position = fh.tell() if skipAnnotations: - while not fh.readline().startswith('r '): + while not fh.readline().startswith(b'r '): position = fh.tell() logging.debug("Skipping %d bytes of networkstatus file." % position) fh.seek(position) @@ -161,20 +161,8 @@ def parseServerDescriptorsFile(filename, validate=True): logging.info("Parsing server descriptors with Stem: %s" % filename) descriptorType = 'server-descriptor 1.0' document = parse_file(filename, descriptorType, validate=validate) - routers = list() + return list(document) - # Work around https://bugs.torproject.org/26023 by parsing each descriptor - # at a time and catching any errors not handled in stem: - while True: - try: - routers.append(document.next()) - except StopIteration: - break - except Exception as error: - logging.debug("Error while parsing a bridge server descriptor: %s" - % error) - - return routers def __cmp_published__(x, y): """A custom ``cmp()`` which sorts descriptors by published date.

1 0

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

19 Feb '20

commit 215fa51bada924ed54702c6670c42307c967705f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 10 15:55:51 2020 -0800 Fix metaclass definition Following the metaclass example prescribed by this module... https://docs.python.org/3/library/abc.html This fixes... Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 823, in loadByName return self.suiteFactory([self.findByName(name, recurse=recurse)]) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 702, in findByName __import__(name) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_email_distributor.py", line 32, in <module> from bridgedb.test.util import generateFakeBridges File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/util.py", line 236, in <module> TestCaseMixin.register(unittest.TestCase) builtins.AttributeError: type object 'mixin' has no attribute 'register' Few more passing tests... before: FAILED (skips=2, failures=7, errors=154, successes=351) after: FAILED (skips=6, failures=9, errors=191, successes=359) --- bridgedb/util.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bridgedb/util.py b/bridgedb/util.py index 63f508e..eb20ce7 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -360,7 +360,7 @@ class JustifiedLogFormatter(logging.Formatter): return super(JustifiedLogFormatter, self).format(record) -class mixin: +class mixin(metaclass=abc.ABCMeta): """Subclasses of me can be used as a mixin class by registering another class, ``ClassA``, which should be mixed with the ``mixin`` subclass, in order to provide simple, less error-prone, multiple inheritance models:: @@ -407,4 +407,3 @@ class mixin: .. info:: This class' name is lowercased because pylint is hardcoded to expect mixin classes to end in ``'mixin'``. """ - __metaclass__ = abc.ABCMeta

1 0

[bridgedb/master] Fix GOOGLE_INTERNET_AUTHORITY_CA_CERT constant initialization
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit f1a1dfe3b66f1857fcb6ce2f0291c88a2d6a7a72 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 13 18:05:22 2020 -0800 Fix GOOGLE_INTERNET_AUTHORITY_CA_CERT constant initialization Byte strings have always been initialized via b'msg'. Calling bytes() for this constant never made sense - in python 2.x it was a no-op, and in python 3.x it errors... Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 823, in loadByName return self.suiteFactory([self.findByName(name, recurse=recurse)]) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 702, in findByName __import__(name) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_txrecaptcha.py", line 31, in <module> from bridgedb import txrecaptcha File "/home/atagar/Desktop/tor/bridgedb/bridgedb/txrecaptcha.py", line 71, in <module> -----END CERTIFICATE-----""")) builtins.TypeError: string argument without an encoding This changes the test results as follows... before: FAILED (skips=106, failures=17, errors=256, successes=425) after: FAILED (skips=109, failures=18, errors=386, successes=468) --- bridgedb/txrecaptcha.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bridgedb/txrecaptcha.py b/bridgedb/txrecaptcha.py index 885b40d..26ead43 100644 --- a/bridgedb/txrecaptcha.py +++ b/bridgedb/txrecaptcha.py @@ -51,7 +51,7 @@ API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER #: (:class:`OpenSSL.crypto.X509`) Only trust certificate for the reCAPTCHA #: :data:`API_SSL_SERVER` which were signed by the Google Internet Authority CA. -GOOGLE_INTERNET_AUTHORITY_CA_CERT = load_certificate(FILETYPE_PEM, bytes("""\ +GOOGLE_INTERNET_AUTHORITY_CA_CERT = load_certificate(FILETYPE_PEM, b"""\ -----BEGIN CERTIFICATE----- MIICsDCCAhmgAwIBAgIDFXfhMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0 @@ -68,7 +68,7 @@ Y3Jscy9zZWN1cmVjYS5jcmwwDQYJKoZIhvcNAQEFBQADgYEAvprjecFG+iJsxzEF ZUNgujFQodUovxOWZshcnDW7fZ7mTlk3zpeVJrGPZzhaDhvuJjIfKqHweFB7gwB+ ARlIjNvrPq86fpVg0NOTawALkSqOUMl3MynBQO+spR7EHcRbADQ/JemfTEh2Ycfl vZqhEFBfurZkX0eTANq98ZvVfpg= ------END CERTIFICATE-----""")) +-----END CERTIFICATE-----""") # `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 # (see ticket #11219: https://bugs.torproject.org/11219)

1 0

[bridgedb/master] Fix context manager creation
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit c1a48d1b568b00fab19a308e6497881f31d17680 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 16:38:25 2020 -0800 Fix context manager creation BridgeDB subclassed a GeneratorContextManager class which became private in python 3.x. Its constructor signature changed, so attempting to simply use the private version failed with... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_Storage.py", line 76, in test_insertBridgeAndGetRing_already_seen_bridge with Storage.getDB() as db: File "/home/atagar/Desktop/tor/bridgedb/bridgedb/Storage.py", line 400, in helper return DBGeneratorContextManager(func(*args, **kwds)) builtins.TypeError: __init__() missing 2 required positional arguments: 'args' and 'kwds' Storage.py is pretty confusing, but they seem to simply want a context manager so simply implementing one. This changes the test results as follows... before: FAILED (skips=106, failures=16, errors=272, successes=410) after: FAILED (skips=106, failures=17, errors=266, successes=415) --- bridgedb/Storage.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index 9e2be8e..1f81052 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -8,7 +8,6 @@ import binascii import sqlite3 import time import hashlib -from contextlib import _GeneratorContextManager from functools import wraps from ipaddr import IPAddress import sys @@ -345,11 +344,18 @@ def openDatabase(sqlite_file): return conn -class DBGeneratorContextManager(_GeneratorContextManager): +class DBGeneratorContextManager(object): """Helper for @contextmanager decorator. Overload __exit__() so we can call the generator many times """ + + def __init__(self, gen): + self.gen = gen + + def __enter__(self): + return next(self.gen) + def __exit__(self, type, value, traceback): """Handle exiting a with statement block

1 0

[bridgedb/master] Replace usage of unicode function
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit a3104da794ba4fcbe78ac5293d6855f75fc119a8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 15:35:39 2020 -0800 Replace usage of unicode function In most cases unicode() is being called on static strings that are already unicode in python 3.x. In the few instances where these actually seem to attempt normalization the proper way to convert bytes is "my_bytes.decode('utf-8')". This fixes the following exceptions... Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 823, in loadByName return self.suiteFactory([self.findByName(name, recurse=recurse)]) File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 702, in findByName __import__(name) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_persistentSaveAndLoad.py", line 31, in <module> TEST_CONFIG_FILE = io.StringIO(unicode("""\ builtins.NameError: name 'unicode' is not defined Test results change as follows... before: FAILED (skips=106, failures=6, errors=182, successes=375) after: FAILED (skips=106, failures=16, errors=273, successes=409) --- bridgedb/distributors/email/server.py | 2 +- bridgedb/test/email_helpers.py | 4 ++-- bridgedb/test/https_helpers.py | 4 ++-- bridgedb/test/moat_helpers.py | 4 ++-- bridgedb/test/test_captcha.py | 2 +- bridgedb/test/test_email_dkim.py | 4 ++-- bridgedb/test/test_email_templates.py | 2 +- bridgedb/test/test_persistent.py | 4 ++-- bridgedb/test/test_persistentSaveAndLoad.py | 4 ++-- bridgedb/test/test_txrecaptcha.py | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bridgedb/distributors/email/server.py b/bridgedb/distributors/email/server.py index 051ce74..c1ce56f 100644 --- a/bridgedb/distributors/email/server.py +++ b/bridgedb/distributors/email/server.py @@ -253,7 +253,7 @@ class SMTPMessage(object): """ rawMessage = io.StringIO() for line in self.lines: - rawMessage.writelines(unicode(line.decode('utf8')) + u'\n') + rawMessage.writelines(line.decode('utf8') + '\n') rawMessage.seek(0) return rfc822.Message(rawMessage) diff --git a/bridgedb/test/email_helpers.py b/bridgedb/test/email_helpers.py index 2fe8cdc..edc8196 100644 --- a/bridgedb/test/email_helpers.py +++ b/bridgedb/test/email_helpers.py @@ -52,7 +52,7 @@ EMAIL_FROM_ADDR = "bridges@localhost" EMAIL_BIND_IP = "127.0.0.1" EMAIL_PORT = 5225 -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ EMAIL_DIST = %s EMAIL_ROTATION_PERIOD = %s EMAIL_INCLUDE_FINGERPRINTS = %s @@ -96,7 +96,7 @@ EMAIL_PORT = %s repr(EMAIL_N_BRIDGES_PER_ANSWER), repr(EMAIL_FROM_ADDR), repr(EMAIL_BIND_IP), - repr(EMAIL_PORT)))) + repr(EMAIL_PORT))) def _createConfig(configFile=TEST_CONFIG_FILE): diff --git a/bridgedb/test/https_helpers.py b/bridgedb/test/https_helpers.py index 8c77085..ca268c9 100644 --- a/bridgedb/test/https_helpers.py +++ b/bridgedb/test/https_helpers.py @@ -50,7 +50,7 @@ CSP_ENABLED = True CSP_REPORT_ONLY = True CSP_INCLUDE_SELF = True -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ SERVER_PUBLIC_FQDN = %r SERVER_PUBLIC_EXTERNAL_IP = %r HTTPS_DIST = %r @@ -100,7 +100,7 @@ CSP_INCLUDE_SELF = %r GIMP_CAPTCHA_RSA_KEYFILE, CSP_ENABLED, CSP_REPORT_ONLY, - CSP_INCLUDE_SELF))) + CSP_INCLUDE_SELF)) def _createConfig(configFile=TEST_CONFIG_FILE): diff --git a/bridgedb/test/moat_helpers.py b/bridgedb/test/moat_helpers.py index 8c40c82..236b529 100644 --- a/bridgedb/test/moat_helpers.py +++ b/bridgedb/test/moat_helpers.py @@ -48,7 +48,7 @@ MOAT_ROTATION_PERIOD = "3 hours" MOAT_GIMP_CAPTCHA_HMAC_KEYFILE = 'moat_captcha_hmac_key' MOAT_GIMP_CAPTCHA_RSA_KEYFILE = 'moat_captcha_rsa_key' -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ GIMP_CAPTCHA_DIR = %r SERVER_PUBLIC_FQDN = %r SUPPORTED_TRANSPORTS = %r @@ -88,7 +88,7 @@ MOAT_GIMP_CAPTCHA_RSA_KEYFILE = %r MOAT_N_IP_CLUSTERS, MOAT_ROTATION_PERIOD, MOAT_GIMP_CAPTCHA_HMAC_KEYFILE, - MOAT_GIMP_CAPTCHA_RSA_KEYFILE))) + MOAT_GIMP_CAPTCHA_RSA_KEYFILE)) def _createConfig(configFile=TEST_CONFIG_FILE): configuration = {} diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index 24a14a4..92cc716 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -291,7 +291,7 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() - solution = unicode(c.answer) + solution = c.answer if isinstance(c.answer, str) else c.answer.decode('utf-8') self.assertEquals( c.check(challenge, solution, c.secretKey, c.hmacKey), True) diff --git a/bridgedb/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py index be34370..e8fe3f3 100644 --- a/bridgedb/test/test_email_dkim.py +++ b/bridgedb/test/test_email_dkim.py @@ -46,8 +46,8 @@ get bridges } def _createMessage(self, messageString): - """Create an ``rfc822.Message`` from a string.""" - messageIO = io.StringIO(unicode(messageString)) + """Create an ``email.message.Message`` from a string.""" + messageIO = io.StringIO(messageString if isinstance(messageString, str) else messageString.decode('utf-8')) return rfc822.Message(messageIO) def test_checkDKIM_good(self): diff --git a/bridgedb/test/test_email_templates.py b/bridgedb/test/test_email_templates.py index 8464fe9..4703019 100644 --- a/bridgedb/test/test_email_templates.py +++ b/bridgedb/test/test_email_templates.py @@ -27,7 +27,7 @@ class EmailTemplatesTests(unittest.TestCase): """Unittests for :func:`b.e.templates`.""" def setUp(self): - self.t = NullTranslations(StringIO(unicode('test'))) + self.t = NullTranslations(StringIO('test')) self.client = Address('blackhole(a)torproject.org') self.answer = 'obfs3 1.1.1.1:1111\nobfs3 2.2.2.2:2222' # This is the fingerprint of BridgeDB's offline, certification-only diff --git a/bridgedb/test/test_persistent.py b/bridgedb/test/test_persistent.py index 72b4b85..269cc86 100644 --- a/bridgedb/test/test_persistent.py +++ b/bridgedb/test/test_persistent.py @@ -33,9 +33,9 @@ from sure import the from sure import expect -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ BRIDGE_FILES = ['bridge-descriptors', 'bridge-descriptors.new'] -LOGFILE = 'bridgedb.log'""")) +LOGFILE = 'bridgedb.log'""") class StateTest(unittest.TestCase): diff --git a/bridgedb/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py index 07ea73b..d01a536 100644 --- a/bridgedb/test/test_persistentSaveAndLoad.py +++ b/bridgedb/test/test_persistentSaveAndLoad.py @@ -28,9 +28,9 @@ from twisted.trial import unittest from bridgedb import persistent -TEST_CONFIG_FILE = io.StringIO(unicode("""\ +TEST_CONFIG_FILE = io.StringIO("""\ BRIDGE_FILES = ['bridge-descriptors', 'bridge-descriptors.new'] -LOGFILE = 'bridgedb.log'""")) +LOGFILE = 'bridgedb.log'""") class StateSaveAndLoadTests(unittest.TestCase): diff --git a/bridgedb/test/test_txrecaptcha.py b/bridgedb/test/test_txrecaptcha.py index 22505b9..fd7365f 100644 --- a/bridgedb/test/test_txrecaptcha.py +++ b/bridgedb/test/test_txrecaptcha.py @@ -270,7 +270,7 @@ class MiscTests(unittest.TestCase): """:func:`txrecapcha._encodeIfNecessary` should convert unicode objects into strings. """ - origString = unicode('abc') + origString = 'abc' self.assertIsInstance(origString, unicode) newString = txrecaptcha._encodeIfNecessary(origString) self.assertIsInstance(newString, str)

1 0

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

19 Feb '20

commit e2af8e34664c1ed91ccbe2b5b93e4b2b99f9270c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 13 18:15:20 2020 -0800 Fix txcaptcha tests The _encodeIfNecessary() helper didn't make sense. It claimed to encode unicode into unicode whereas what it really did was simply normalizing inputs to bytes. I tested urlencode() with a mixture of unicode/bytes and it normalizes its inputs so this helper doesn't do anything. This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_txrecaptcha.py", line 274, in test_encodeIfNecessary self.assertIsInstance(origString, unicode) builtins.NameError: name 'unicode' is not defined Test results changed as follows... before: FAILED (skips=109, failures=18, errors=386, successes=468) after: FAILED (skips=109, failures=18, errors=383, successes=470) --- bridgedb/test/test_txrecaptcha.py | 11 +---------- bridgedb/txrecaptcha.py | 21 ++++++++------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/bridgedb/test/test_txrecaptcha.py b/bridgedb/test/test_txrecaptcha.py index fd7365f..db37506 100644 --- a/bridgedb/test/test_txrecaptcha.py +++ b/bridgedb/test/test_txrecaptcha.py @@ -142,7 +142,7 @@ class BodyProducerTests(unittest.TestCase): def setUp(self): """Setup the tests.""" - self.content = 'Line 1\r\nLine 2\r\n' + self.content = b'Line 1\r\nLine 2\r\n' self.producer = txrecaptcha._BodyProducer(self.content) def test_interface(self): @@ -265,12 +265,3 @@ class MiscTests(unittest.TestCase): result = txrecaptcha._ebRequest(fail) self.assertIsInstance(result, txrecaptcha.RecaptchaResponse) self.assertRegexpMatches(result.error_code, msg) - - def test_encodeIfNecessary(self): - """:func:`txrecapcha._encodeIfNecessary` should convert unicode objects - into strings. - """ - origString = 'abc' - self.assertIsInstance(origString, unicode) - newString = txrecaptcha._encodeIfNecessary(origString) - self.assertIsInstance(newString, str) diff --git a/bridgedb/txrecaptcha.py b/bridgedb/txrecaptcha.py index 6308af8..7292360 100644 --- a/bridgedb/txrecaptcha.py +++ b/bridgedb/txrecaptcha.py @@ -46,8 +46,8 @@ from zope.interface import implementer from bridgedb.crypto import SSLVerifyingContextFactory #: This was taken from :data:`recaptcha.client.captcha.API_SSL_SERVER`. -API_SSL_SERVER = API_SERVER = "https://www.google.com/recaptcha/api" -API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER +API_SSL_SERVER = API_SERVER = b"https://www.google.com/recaptcha/api" +API_SSL_VERIFY_URL = b"%s/verify" % API_SSL_SERVER #: (:class:`OpenSSL.crypto.X509`) Only trust certificate for the reCAPTCHA #: :data:`API_SSL_SERVER` which were signed by the Google Internet Authority CA. @@ -253,12 +253,6 @@ def _ebRequest(fail): error = fail.getErrorMessage() or "possible problem in _ebRequest()" return RecaptchaResponse(is_valid=False, error_code=error) -def _encodeIfNecessary(string): - """Encode unicode objects in utf-8 if necessary.""" - if isinstance(string, unicode): - return string.encode('utf-8') - return string - def submit(recaptcha_challenge_field, recaptcha_response_field, private_key, remoteip, agent=_agent): """Submits a reCaptcha request for verification. This function is a patched @@ -292,13 +286,14 @@ def submit(recaptcha_challenge_field, recaptcha_response_field, return d params = urllib.parse.urlencode({ - 'privatekey': _encodeIfNecessary(private_key), - 'remoteip': _encodeIfNecessary(remoteip), - 'challenge': _encodeIfNecessary(recaptcha_challenge_field), - 'response': _encodeIfNecessary(recaptcha_response_field)}) + 'privatekey': private_key, + 'remoteip': remoteip, + 'challenge': recaptcha_challenge_field, + 'response': recaptcha_response_field, + }).encode('utf-8') body = _BodyProducer(params) headers = Headers({"Content-type": ["application/x-www-form-urlencoded"], "User-agent": ["reCAPTCHA Python"]}) - d = agent.request('POST', API_SSL_VERIFY_URL, headers, body) + d = agent.request(b'POST', API_SSL_VERIFY_URL, headers, body) d.addCallbacks(_cbRequest, _ebRequest) return d

1 0

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

19 Feb '20

commit 7cc865b7899ad9389d4748ce1ed388282df5995c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 13 18:10:21 2020 -0800 Fix urlencode call Oops, my bad on this one. Earlier I ported from urllib2 to urllib, but the urlencode function is on urllib.parse instead... https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlencode This fixes... Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_txrecaptcha.py", line 205, in test_submit_returnsDeferred self.ip) File "/home/atagar/Desktop/tor/bridgedb/bridgedb/txrecaptcha.py", line 294, in submit params = urllib.urlencode({ builtins.AttributeError: module 'urllib' has no attribute 'urlencode' Test results unchanged... before: FAILED (skips=109, failures=18, errors=386, successes=468) after: FAILED (skips=109, failures=18, errors=386, successes=468) --- bridgedb/txrecaptcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/txrecaptcha.py b/bridgedb/txrecaptcha.py index 26ead43..6308af8 100644 --- a/bridgedb/txrecaptcha.py +++ b/bridgedb/txrecaptcha.py @@ -291,7 +291,7 @@ def submit(recaptcha_challenge_field, recaptcha_response_field, d.errback(failure.Failure(ValueError('incorrect-captcha-sol'))) return d - params = urllib.urlencode({ + params = urllib.parse.urlencode({ 'privatekey': _encodeIfNecessary(private_key), 'remoteip': _encodeIfNecessary(remoteip), 'challenge': _encodeIfNecessary(recaptcha_challenge_field),

1 0

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

19 Feb '20

commit 6ec43aeb660d7e51e5fc6ba392f96172510e5ac0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 11 14:05:50 2020 -0800 Fix queue import Python 3.x changed its queue module name. This fixes... Traceback (most recent call last): File "/usr/local/lib/python3.5/dist-packages/twisted/trial/runner.py", line 823, in loadByName return self.suiteFactory([self.findByName(name, recurse=recurse)]) ... File "./bridgedb/test/test_smtp.py", line 8, in <module> import Queue builtins.ImportError: No module named 'Queue' This changes test results as follows... before: FAILED (skips=103, failures=6, errors=183, successes=375) after: FAILED (skips=106, failures=6, errors=182, successes=375) --- bridgedb/test/test_smtp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bridgedb/test/test_smtp.py b/bridgedb/test/test_smtp.py index de443b3..2a532b2 100644 --- a/bridgedb/test/test_smtp.py +++ b/bridgedb/test/test_smtp.py @@ -5,7 +5,7 @@ from __future__ import print_function import smtplib import asyncore import threading -import Queue +import queue import random import os @@ -58,7 +58,7 @@ class EmailServer(SMTPServer): self.close() def start(self): - self.message_queue = Queue.Queue() + self.message_queue = queue.Queue() self._stop = threading.Event() self._thread = threading.Thread(target=self.thread_proc) # Ensures that if any tests do fail, then threads will exit when the @@ -93,7 +93,7 @@ class EmailServer(SMTPServer): # failures: # # https://travis-ci.org/isislovecruft/bridgedb/jobs/58996136#L3281 - except Queue.Empty: + except queue.Empty: pass else: assert message.find(text) != -1, ("Message did not contain text '%s'." @@ -103,7 +103,7 @@ class EmailServer(SMTPServer): def checkNoMessageReceived(self, timeoutInSecs=2.0): try: self.message_queue.get(block=True, timeout=timeoutInSecs) - except Queue.Empty: + except queue.Empty: return True assert False, "Found a message in the queue, but expected none"

1 0