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

[bridgedb/master] Make unit test use ipaddress instead of ipaddr.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit d035088f8eaa8ac7d0d0616b3e680c808a76e33b Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 29 18:22:18 2020 -0800 Make unit test use ipaddress instead of ipaddr. This should fix the following unit test: [FAIL] Traceback (most recent call last): File "/home/travis/build/NullHypothesis/bridgedb/bridgedb/test/test_https.py", line 227, in test_get_vanilla_ipv6 self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/twisted/trial/_synctest.py", line 649, in assertIsInstance instance, classOrTuple, suffix)) twisted.trial.unittest.FailTest: IPv4Address('98.255.18.132') is not an instance of <class 'ipaddr.IPv6Address'> --- bridgedb/test/test_https.py | 6 +++--- bridgedb/test/test_https_server.py | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index 00a6fd9..2349e28 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -27,7 +27,7 @@ repository. from __future__ import print_function import gettext -import ipaddr +import ipaddress import mechanize import os @@ -199,7 +199,7 @@ class HTTPTests(unittest.TestCase): for bridge in bridges: self.assertTrue(bridge != None) addr = bridge[0].rsplit(':', 1)[0] - self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) + self.assertIsInstance(ipaddress.ip_address(addr), ipaddress.IPv4Address) def test_get_vanilla_ipv6(self): self.openBrowser() @@ -212,7 +212,7 @@ class HTTPTests(unittest.TestCase): for bridge in bridges: self.assertTrue(bridge != None) addr = bridge[0].rsplit(':', 1)[0].strip('[]') - self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) + self.assertIsInstance(ipaddress.ip_address(addr), ipaddress.IPv6Address) def test_get_obfs4_ipv4(self): """Try asking for obfs4 bridges, and check that the PT arguments in the diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index 8482d9d..a4d6873 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -17,7 +17,7 @@ import logging import os import shutil -import ipaddr +import ipaddress from bs4 import BeautifulSoup @@ -588,14 +588,14 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): """Check that removing our remoteip setting produces a random IP.""" self.captchaResource.remoteIP = None ip = self.captchaResource.getRemoteIP() - realishIP = ipaddr.IPv4Address(ip).compressed + realishIP = ipaddress.IPv4Address(ip).compressed self.assertTrue(realishIP) self.assertNotEquals(realishIP, '111.111.111.111') def test_getRemoteIP_useConfiguredIP(self): """Check that our remoteip setting is used if configured.""" ip = self.captchaResource.getRemoteIP() - realishIP = ipaddr.IPv4Address(ip).compressed + realishIP = ipaddress.IPv4Address(ip).compressed self.assertTrue(realishIP) self.assertEquals(realishIP, '111.111.111.111') @@ -774,7 +774,7 @@ class BridgesResourceTests(unittest.TestCase): # Check that the IP and port seem okay: ip, port = fields[0].rsplit(':') - self.assertIsInstance(ipaddr.IPv4Address(ip), ipaddr.IPv4Address) + self.assertIsInstance(ipaddress.ip_address(ip), ipaddress.IPv4Address) self.assertIsInstance(int(port), int) self.assertGreater(int(port), 0) self.assertLessEqual(int(port), 65535) @@ -858,7 +858,7 @@ class BridgesResourceTests(unittest.TestCase): # Check that the IP and port seem okay: ip, port = bridgeLine[1].rsplit(':') - self.assertIsInstance(ipaddr.IPv4Address(ip), ipaddr.IPv4Address) + self.assertIsInstance(ipaddress.ip_address(ip), ipaddress.IPv4Address) self.assertIsInstance(int(port), int) self.assertGreater(int(port), 0) self.assertLessEqual(int(port), 65535) @@ -892,7 +892,7 @@ class BridgesResourceTests(unittest.TestCase): # Check that the IP and port seem okay: ip, port = bridgeLine[0].rsplit(b':') - self.assertIsInstance(ipaddr.IPv4Address(ip), ipaddr.IPv4Address) + self.assertIsInstance(ipaddress.ip_address(ip.decode("utf-8")), ipaddress.IPv4Address) self.assertIsInstance(int(port), int) self.assertGreater(int(port), 0) self.assertLessEqual(int(port), 65535)

1 0

[bridgedb/master] Convert filter() output to list() before len().
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 39ea49d5ebaa27e907c3c87e94ab70471e191eaf Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Jan 27 16:29:14 2020 -0800 Convert filter() output to list() before len(). ...otherwise Python 3 will complain: TypeError: object of type 'filter' has no len() --- bridgedb/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index 7776750..bc309c5 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -198,7 +198,7 @@ def load(state, hashring, clear=False): inserted = 0 logging.info("Trying to insert %d bridges into hashring, %d of which " "have the 'Running' flag..." % (len(bridges), - len(filter(lambda b: b.flags.running, bridges.values())))) + len(list(filter(lambda b: b.flags.running, bridges.values()))))) for fingerprint, bridge in bridges.items(): # Skip insertion of bridges which are geolocated to be in one of the

1 0

[bridgedb/master] Normalize captcha's solution input
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit e3de9228f7f1969c2f8569f35f57603e2c2d8641 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 20 18:29:23 2020 -0800 Normalize captcha's solution input Honestly I don't know why BridgeDB has these tests at all, but these pass byte input as the solution so accounting for this. Traceback (most recent call last): File "/home/atagar/Desktop/tor/bridgedb/bridgedb/test/test_captcha.py", line 287, in test_check_encoding_ascii True) 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: False != True With this the tests finally pass! --- bridgedb/captcha.py | 4 ++++ bridgedb/test/test_captcha.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bridgedb/captcha.py b/bridgedb/captcha.py index 6d8e8f7..23bb333 100644 --- a/bridgedb/captcha.py +++ b/bridgedb/captcha.py @@ -270,6 +270,10 @@ class GimpCaptcha(Captcha): :returns: ``True`` if the CAPTCHA solution was correct and not stale. ``False`` otherwise. """ + + if isinstance(solution, bytes): + solution = solution.decode('utf-8') + hmacIsValid = False if not solution: diff --git a/bridgedb/test/test_captcha.py b/bridgedb/test/test_captcha.py index d504761..d52440d 100644 --- a/bridgedb/test/test_captcha.py +++ b/bridgedb/test/test_captcha.py @@ -182,7 +182,7 @@ class GimpCaptchaTests(unittest.TestCase): 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:]) + self.assertEqual(b'ThisAnswerShouldDecryptToThis', decrypted[12:]) def test_get(self): """GimpCaptcha.get() should return image and challenge strings."""

1 0

[bridgedb/master] Turn HTTP arguments dict from bytes to str.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 29c2bd17c43fb5ab541281e7a9d2822fc0045338 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Jan 30 15:28:06 2020 -0800 Turn HTTP arguments dict from bytes to str. --- bridgedb/distributors/https/server.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index 2d230b9..52a083f 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -974,6 +974,14 @@ class BridgesResource(CustomErrorHandlingResource, CSPResource): logging.info("Replying to web request from %s. Parameters were %r" % (ip, request.args)) + # Convert all key/value pairs from bytes to str. + str_args = {} + for arg, values in request.args.items(): + arg = arg if isinstance(arg, str) else arg.decode("utf-8") + values = [value.decode("utf-8") if isinstance(value, bytes) else value for value in values] + str_args[arg] = values + request.args = str_args + if ip: bridgeRequest = HTTPSBridgeRequest() bridgeRequest.client = ip

1 0

[bridgedb/master] Add CHANGELOG entry.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 39fa0b07cbcdc0346856abb387c1473d3e851d7d Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Feb 7 15:02:18 2020 -0800 Add CHANGELOG entry. --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bb1db03..6d4c402 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ + * FIXES https://bugs.torproject.org/30946 + This patch ports BridgeDB to Python 3. Python 2 is no longer supported + since Jan 1, 2020. + Changes in version 0.9.3 - 2020-02-18 * FIXES <https://bugs.torproject.org/33299>

1 0

[bridgedb/master] Make shebangs use Python 3.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit f9978bf5678d77eb1b03fcd2422c44b62a5733d3 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 12 09:57:40 2020 -0800 Make shebangs use Python 3. --- bridgedb/test/test_Storage.py | 2 +- scripts/bridgedb | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb/test/test_Storage.py b/bridgedb/test/test_Storage.py index dffba2b..ca10bb9 100644 --- a/bridgedb/test/test_Storage.py +++ b/bridgedb/test/test_Storage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Unittests for the :mod:`bridgedb.Storage` module.""" import os diff --git a/scripts/bridgedb b/scripts/bridgedb index 876fde9..5c92179 100644 --- a/scripts/bridgedb +++ b/scripts/bridgedb @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # This file is part of BridgeDB, a Tor bridge distribution system. diff --git a/setup.py b/setup.py index 55dea95..18c391b 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 #_____________________________________________________________________________ # # This file is part of BridgeDB, a Tor bridge distribution system.

1 0

[bridgedb/master] Discard attribute that's no longer used.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit b452f6f9ffb4992bb6be00763ce53ee0e5479878 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 29 18:10:41 2020 -0800 Discard attribute that's no longer used. This fixes the following unit test: [ERROR] Traceback (most recent call last): File "/home/travis/build/NullHypothesis/bridgedb/bridgedb/test/test_https.py", line 177, in test_content_security_policy headers = ''.join(self.br.response().info().headers) builtins.AttributeError: 'HTTPMessage' object has no attribute 'headers' bridgedb.test.test_https.HTTPTests.test_content_security_policy --- bridgedb/test/test_https.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index 52ad936..00a6fd9 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -174,10 +174,10 @@ class HTTPTests(unittest.TestCase): self.br.set_debug_http(True) self.br.open(HTTP_ROOT) - headers = ''.join(self.br.response().info().headers) + headers = self.br.response().info() - self.assertIn("Content-Security-Policy", headers) - self.assertIn("default-src 'none';", headers) + self.assertIn("Content-Security-Policy", headers.keys()) + self.assertIn("default-src 'none';", ''.join(headers.values())) def test_404(self): """Asking for a non-existent resource should yield our custom 404 page,

1 0

[bridgedb/master] Explicitly specify parser for BeautifulSoup.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 93783bba150e4714a60825974a91aec83e2cdb59 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 29 21:16:16 2020 -0800 Explicitly specify parser for BeautifulSoup. This should fix CI warnings like the following: /home/travis/build/NullHypothesis/bridgedb/bridgedb/test/test_https_server.py:533: UserWarning: No parser was explicitly specified, so I'm using the best available HTML parser for this system ("html5lib"). This usually isn't a problem, but if you run this code on another system, or in a different virtual environment, it may use a different parser and behave differently. The code that caused this warning is on line 533 of the file /home/travis/build/NullHypothesis/bridgedb/bridgedb/test/test_https_server.py. To get rid of this warning, pass the additional argument 'features="html5lib"' to the BeautifulSoup constructor. --- bridgedb/test/test_https.py | 2 +- bridgedb/test/test_https_server.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index 2349e28..8e3de1b 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -137,7 +137,7 @@ class HTTPTests(unittest.TestCase): # ------------- Results # URL should be the same as last time self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - soup = BeautifulSoup(captcha_response.read()) + soup = BeautifulSoup(captcha_response.read(), features="html5lib") return soup def getBridgeLinesFromSoup(self, soup, fieldsPerBridge): diff --git a/bridgedb/test/test_https_server.py b/bridgedb/test/test_https_server.py index a4d6873..ff7a1e3 100644 --- a/bridgedb/test/test_https_server.py +++ b/bridgedb/test/test_https_server.py @@ -337,7 +337,7 @@ class CaptchaProtectedResourceTests(unittest.TestCase): request = DummyRequest([self.pagename]) request.method = b'POST' page = self.captchaResource.render_POST(request) - self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + self.assertEqual(BeautifulSoup(page, features="html5lib").find('meta')['http-equiv'], 'refresh') @@ -462,7 +462,7 @@ class GimpCaptchaProtectedResourceTests(unittest.TestCase): self.request.addArg('captcha_response_field', '') page = self.captchaResource.render_POST(self.request) - self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + self.assertEqual(BeautifulSoup(page, features="html5lib").find('meta')['http-equiv'], 'refresh') def test_render_POST_wrongSolution(self): @@ -477,7 +477,7 @@ class GimpCaptchaProtectedResourceTests(unittest.TestCase): self.request.addArg('captcha_response_field', expectedResponse) page = self.captchaResource.render_POST(self.request) - self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], + self.assertEqual(BeautifulSoup(page, features="html5lib").find('meta')['http-equiv'], 'refresh') @@ -530,7 +530,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): def testCB(request): """Check the ``Request`` returned from ``_renderDeferred``.""" self.assertIsInstance(request, DummyRequest) - soup = BeautifulSoup(b''.join(request.written)).find(b'meta')['http-equiv'] + soup = BeautifulSoup(b''.join(request.written), features="html5lib").find(b'meta')['http-equiv'] self.assertEqual(soup, 'refresh') d = task.deferLater(reactor, 0, lambda x: x, (False, self.request)) @@ -674,7 +674,7 @@ class BridgesResourceTests(unittest.TestCase): :returns: A list of the bridge lines contained on the **page**. """ # The bridge lines are contained in a <div class='bridges'> tag: - soup = BeautifulSoup(page) + soup = BeautifulSoup(page, features="html5lib") well = soup.find('div', {'class': 'bridge-lines'}) content = well.renderContents().decode('utf-8').strip() lines = content.splitlines()

1 0

[bridgedb/master] Fix str/bytes issue in serving of QR code.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 63ffb833e2592558265d5b23b8b0e1d146daaae7 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Feb 14 10:06:46 2020 -0800 Fix str/bytes issue in serving of QR code. --- bridgedb/distributors/https/server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index 98b31d0..503744e 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -1066,7 +1066,9 @@ class BridgesResource(CustomErrorHandlingResource, CSPResource): qrjpeg = generateQR(bridgeLines) if qrjpeg: - qrcode = 'data:image/jpeg;base64,%s' % base64.b64encode(qrjpeg) + qrcode = b'data:image/jpeg;base64,%s' % base64.b64encode(qrjpeg) + qrcode = qrcode.decode("utf-8") + try: langs = translations.getLocaleFromHTTPRequest(request) rtl = translations.usingRTLLang(langs)

1 0

[bridgedb/master] Fix typo in directive.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit ec9f157a26af9962e80ae1f3e508c755d76ddc51 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 12 12:32:14 2020 -0800 Fix typo in directive. This fixes the following warning that showed up during installation: warning: manifest_maker: MANIFEST.in, line 4: unknown action 'recursice-include' --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index bbe1e74..bb16c8c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include versioneer.py include bridgedb/_version.py include requirements.txt -recursice-include bridgedb/i18n *.po *.pot +recursive-include bridgedb/i18n *.po *.pot

1 0