November 2017 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Nov '17

16 Nov '17

commit e81b2f47f2bad59cc2798ae46fe9f6d09e7bb18e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 16 08:15:41 2017 +0000 Update translations for https_everywhere --- bn_BD/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bn_BD/https-everywhere.dtd b/bn_BD/https-everywhere.dtd index 5e7ef6354..aa112f211 100644 --- a/bn_BD/https-everywhere.dtd +++ b/bn_BD/https-everywhere.dtd @@ -14,9 +14,9 @@ <!ENTITY https-everywhere.options.generalSettings "সাধারণ সেটিংস"> <!ENTITY https-everywhere.options.importSettings "সেটিংস আমদানি করুন"> <!ENTITY https-everywhere.options.import "আমদানি"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.imported "আপনার সেটিংস আমদানি করা হয়েছে।"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.export_settings "সেটিংস রপ্তানি করুন"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules">

1 0

[bridgedb/develop] Add script for using curl to test moat's JSON API.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 0c24fa3719aa29e967ca5804e8eaaab80af17e32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Sep 12 21:33:22 2017 +0000 Add script for using curl to test moat's JSON API. --- scripts/test-moat | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/scripts/test-moat b/scripts/test-moat new file mode 100755 index 0000000..6bfa500 --- /dev/null +++ b/scripts/test-moat @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +function usage() { + printf "Usage: %s [fetch] [check]\n" "$(basename $0)" +} + +if test "$#" -lt 1 ; then + usage + exit 1 +fi + +function do_fetch() { + curl -H 'Content-Type: application/vnd.api+json' \ + -H 'Accept: application/vnd.api+json' \ + --data '{"data": [{"supported": ["obfs4"], "version": "0.1.0", "type": "client-transports"}]}' \ + http://127.0.0.1:6790/meek/moat/fetch + echo +} + +function do_check() { + curl -H 'Content-Type: application/vnd.api+json' \ + -H 'Accept: application/vnd.api+json' \ + --data '{"data": [{"challenge": "foo", "solution": "bar", "version": "0.1.0", "qrcode": "false", "type": "moat-solution", "id": 2, "transport": "obfs4"}]}' \ + http://127.0.0.1:6790/meek/moat/check + echo +} + +while test -n "$1" ; do + case "$1" in + fetch) do_fetch ;; + check) do_check ;; + *) usage ;; + esac + + shift +done

1 0

[bridgedb/master] Update Babel dependency.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 363ef571ced1a246f02320763bffe7be39949798 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 2 00:07:10 2017 +0000 Update Babel dependency. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f60d817..d7713df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Babel==0.9.6 +Babel==2.5.1 BeautifulSoup==3.2.1 Mako==0.8.1 Twisted==16.1.1

1 0

[bridgedb/master] Update Sphinx documentation build dependencies.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit de4b3e26d562ee810324ae33dff909dc7fd46758 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 1 23:56:13 2017 +0000 Update Sphinx documentation build dependencies. --- doc/sphinx/requirements-for-sphinx-builds.txt | 11 ++++++----- doc/sphinx/source/conf.py | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/sphinx/requirements-for-sphinx-builds.txt b/doc/sphinx/requirements-for-sphinx-builds.txt index 0dc78e4..ce04d83 100644 --- a/doc/sphinx/requirements-for-sphinx-builds.txt +++ b/doc/sphinx/requirements-for-sphinx-builds.txt @@ -2,8 +2,9 @@ # documentation. You will also need all the requirements listed in # requirements.txt. -sphinxjp.themes.basicstrap==0.3.1 -sphinx-argparse==0.1.4 -sphinxcontrib-fulltoc==1.0 -repoze.sphinx.autointerface==0.7.1 -docutils==0.11 +sphinx==1.6.5 +sphinxjp.themes.basicstrap==0.4.3 +sphinx-argparse==0.2.1 +sphinxcontrib-fulltoc==1.2.0 +repoze.sphinx.autointerface==0.8 +docutils==0.14 diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 8eb0063..a50da1e 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -35,6 +35,7 @@ import bridgedb.Bridges import bridgedb.Bucket import bridgedb.crypto import bridgedb.distribute +import bridgedb.distributors import bridgedb.distributors.email import bridgedb.distributors.email.autoresponder import bridgedb.distributors.email.distributor @@ -42,12 +43,12 @@ import bridgedb.distributors.email.dkim import bridgedb.distributors.email.request import bridgedb.distributors.email.server import bridgedb.distributors.email.templates -import bridgedb.filters -import bridgedb.geo import bridgedb.distributors.https import bridgedb.distributors.https.distributor import bridgedb.distributors.https.request import bridgedb.distributors.https.server +import bridgedb.filters +import bridgedb.geo import bridgedb.parse import bridgedb.parse.addr import bridgedb.parse.descriptors

1 0

[bridgedb/master] Fix Sphinx documentation to build with newer dependencies.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 5ed3e53ebaf103dc0693e61825b1d5333730aa98 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 2 01:22:30 2017 +0000 Fix Sphinx documentation to build with newer dependencies. --- doc/sphinx/source/bridgedb.distributors.email.rst | 15 +++++++++++++++ doc/sphinx/source/bridgedb.distributors.https.rst | 12 ++++++++++++ doc/sphinx/source/bridgedb.email.rst | 15 --------------- doc/sphinx/source/bridgedb.https.rst | 12 ------------ doc/sphinx/source/bridgedb.rst | 6 +++--- doc/sphinx/source/conf.py | 2 -- 6 files changed, 30 insertions(+), 32 deletions(-) diff --git a/doc/sphinx/source/bridgedb.distributors.email.rst b/doc/sphinx/source/bridgedb.distributors.email.rst new file mode 100644 index 0000000..ed94065 --- /dev/null +++ b/doc/sphinx/source/bridgedb.distributors.email.rst @@ -0,0 +1,15 @@ +.. _email-pkg: + +bridgedb.distributors.email +---------------------------- + +.. contents:: bridgedb.distributors.email + :depth: 3 + +.. automodule:: bridgedb.distributors.email.__init__ +.. automodule:: bridgedb.distributors.email.autoresponder +.. automodule:: bridgedb.distributors.email.distributor +.. automodule:: bridgedb.distributors.email.dkim +.. automodule:: bridgedb.distributors.email.request +.. automodule:: bridgedb.distributors.email.server +.. automodule:: bridgedb.distributors.email.templates diff --git a/doc/sphinx/source/bridgedb.distributors.https.rst b/doc/sphinx/source/bridgedb.distributors.https.rst new file mode 100644 index 0000000..f58dd70 --- /dev/null +++ b/doc/sphinx/source/bridgedb.distributors.https.rst @@ -0,0 +1,12 @@ +.. _https-pkg: + +bridgedb.distributors.https +---------------------------- + +.. contents:: bridgedb.distributors.https + :depth: 3 + +.. automodule:: bridgedb.distributors.https.__init__ +.. automodule:: bridgedb.distributors.https.distributor +.. automodule:: bridgedb.distributors.https.request +.. automodule:: bridgedb.distributors.https.server diff --git a/doc/sphinx/source/bridgedb.email.rst b/doc/sphinx/source/bridgedb.email.rst deleted file mode 100644 index 020b614..0000000 --- a/doc/sphinx/source/bridgedb.email.rst +++ /dev/null @@ -1,15 +0,0 @@ -.. _email-pkg: - -bridgedb.email --------------- - -.. contents:: bridgedb.email - :depth: 3 - -.. automodule:: bridgedb.email.__init__ -.. automodule:: bridgedb.email.autoresponder -.. automodule:: bridgedb.email.distributor -.. automodule:: bridgedb.email.dkim -.. automodule:: bridgedb.email.request -.. automodule:: bridgedb.email.server -.. automodule:: bridgedb.email.templates diff --git a/doc/sphinx/source/bridgedb.https.rst b/doc/sphinx/source/bridgedb.https.rst deleted file mode 100644 index 36fa6c6..0000000 --- a/doc/sphinx/source/bridgedb.https.rst +++ /dev/null @@ -1,12 +0,0 @@ -.. _https-pkg: - -bridgedb.https ---------------- - -.. contents:: bridgedb.https - :depth: 3 - -.. automodule:: bridgedb.https.__init__ -.. automodule:: bridgedb.https.distributor -.. automodule:: bridgedb.https.request -.. automodule:: bridgedb.https.server diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index ea04ef4..1f272b3 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -14,12 +14,12 @@ Packages & Modules bridgedb.configure bridgedb.distribute bridgedb.crypto - bridgedb.email + bridgedb.distributors.email + bridgedb.distributors.https bridgedb.filters bridgedb.geo - bridgedb.https bridgedb.interfaces - bridgedb.Main + bridgedb.main bridgedb.parse bridgedb.persistent bridgedb.proxy diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index a50da1e..e98d2b2 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -117,8 +117,6 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.coverage', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', - 'sphinxjp.themecore', - 'sphinxarg.ext', 'sphinxcontrib.fulltoc', 'repoze.sphinx.autointerface', 'apilinks_sphinxext',

1 0

[bridgedb/master] No matter how much we test this, coverage will never notice.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 35603395dcac11e10a0088c1e902b4eca6672e44 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 2 01:24:16 2017 +0000 No matter how much we test this, coverage will never notice. --- bridgedb/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index d155a28..1601cf1 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -335,7 +335,7 @@ def run(options, reactor=reactor): state.key = key state.save() - def reload(inThread=True): + def reload(inThread=True): # pragma: no cover """Reload settings, proxy lists, and bridges. State should be saved before calling this method, and will be saved

1 0

[bridgedb/master] Add more tests for bridgedb.main.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 00a9288a141158552ee56790211ed230704775d7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 2 00:27:31 2017 +0000 Add more tests for bridgedb.main. --- bridgedb/main.py | 4 ++-- bridgedb/test/test_main.py | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/bridgedb/main.py b/bridgedb/main.py index cb3eee1..d155a28 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -459,7 +459,7 @@ def run(options, reactor=reactor): signal.signal(signal.SIGHUP, _handleSIGHUP) signal.signal(signal.SIGUSR1, _handleSIGUSR1) - if reactor: + if reactor: # pragma: no cover # And actually load it to start parsing. Get back our distributors. emailDistributor, ipDistributor = reload(False) @@ -508,7 +508,7 @@ def run(options, reactor=reactor): if reactor and not reactor.running: logging.info("Starting reactors.") reactor.run() - except KeyboardInterrupt: + except KeyboardInterrupt: # pragma: no cover logging.fatal("Received keyboard interrupt. Shutting down...") finally: if config.PIDFILE: diff --git a/bridgedb/test/test_main.py b/bridgedb/test/test_main.py index a2e975e..ab34055 100644 --- a/bridgedb/test/test_main.py +++ b/bridgedb/test/test_main.py @@ -71,6 +71,20 @@ class MockHashring(object): pass +class ExpandBridgeAuthDirTests(unittest.TestCase): + """Unittests for :func:`bridgedb.main.expandBridgeAuthDir`.""" + + def setUp(self): + self.authdir = "from-authority" + self.filename = "bridge-descriptors" + + def test_expandBridgeAuthDir_not_abs(self): + """A non-absolute path should turn into an absolute one.""" + result = main.expandBridgeAuthDir(self.authdir, self.filename) + + self.assertTrue(os.path.isabs(result)) + + class BridgedbTests(unittest.TestCase): """Integration tests for :func:`bridgedb.main.load`.""" @@ -229,6 +243,15 @@ class BridgedbTests(unittest.TestCase): d.addErrback(self._eb_Failure) return d + def test_main_load_then_reload(self): + """main.load() should run without error.""" + d = deferToThread(main.load, self.state, self.hashring) + d.addCallback(self._cbAssertFingerprints) + d.addErrback(self._eb_Failure) + d.addCallback(main._reloadFn) + d.addErrback(self._eb_Failure) + return d + def test_main_load_no_state(self): """main.load() should raise SystemExit without a state object.""" self.assertRaises(SystemExit, main.load, None, self.hashring)

1 0

[bridgedb/master] Specify the moat API.
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 9d452247e4378a44e46fb31b14acf2238e4d9dd6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Sep 12 21:33:22 2017 +0000 Specify the moat API. * FIXES part of https://bugs.torproject.org/22871 --- README.rst | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/README.rst b/README.rst index faeae5c..a2d3b27 100644 --- a/README.rst +++ b/README.rst @@ -420,6 +420,179 @@ e.g. bridges@...) and sent from an ``(a)riseup.net``, ``(a)gmail.com``, or You can email our BridgeDB instance `here <mailto:bridges@torproject.org>`__. + +---------------------------- +Accessing the Moat Interface +---------------------------- + +Moat is a bridge distributor for requesting bridges through `Tor Launcher's +<https://gitweb.torproject.org/tor-launcher.git/>`__ user interface. + +The following describes the Moat API, version 0.1.0. + +The client and server both MUST conform to `JSON-API <http://jsonapi.org/>`__. + +The client SHOULD direct all requests via the Meek reflector at ``MEEK_REFECTOR``. +.. + XXX meek reflector URL + +Requesting Bridges +"""""""""""""""""" + +The client MUST send a ``POST /meek/moat/fetch`` containing the following JSON:: + + { + 'data': { + 'version': '0.1.0', + 'type': 'moat client supported transports', + 'supported': [ 'TRANSPORT', 'TRANSPORT', ... ], + } + } + +where: + +* ``TRANSPORT`` is a string identifying a transport, e.g. ``"obfs3"`` or + ``"obfs4"``. Currently supported transport identifiers are: + - ``"vanilla"`` + - ``"fte"`` + - ``"obfs3"`` + - ``"obfs4"`` + - ``"scramblesuit"`` + + +Receiving a CAPTCHA challenge +""""""""""""""""""""""""""""" + +The moat server will respond with ``200 OK``. + +If there is no overlap with the transports which BridgeDB supports, the moat +server will respond with the list of transports which is *does* support:: + + { + 'data': { + 'version': '0.1.0', + 'type': 'moat server supported transports', + 'supported': [ 'TRANSPORT', 'TRANSPORT', ... ], + } + } + +If there is an overlap with what BridgeDB supports, the moat server will select +the "best" transport from the list of supported transports, and respond with the +following JSON containing a CAPTCHA challenge:: + + { + 'data': { + 'id': 1, + 'type': 'moat farfetchd challenge', + 'version': '0.1.0', + 'transport': TRANSPORT, + 'image': CAPTCHA, + 'challenge': CHALLENGE, + } + } + +where: + +* ``TRANSPORT`` is the agreed upon transport which will be distributed, +* ``CAPTCHA`` is a base64-encoded, jpeg image that is 400 pixels in + length and 125 pixels in height, +* ``CHALLENGE`` is a base64-encoded CAPTCHA challenge which MUST be + later passed back to the server along with the proposed solution. + +The challenge contains an encrypted-then-HMACed timestamp, and +solutions submitted more than 30 minutes after requesting the CAPTCHA +are considered invalid. + + +Responding to a CAPTCHA challenge +""""""""""""""""""""""""""""""""" + +To propose a solution to a CAPTCHA, the client MUST send a request for ``POST +/meek/moat/check``, where the body of the request contains the following JSON:: + + { + 'data': { + 'id': 2, + 'type': 'moat farfetchd solution', + 'version': '0.1.0', + 'transport': TRANSPORT, + 'challenge': CHALLENGE, + 'solution': SOLUTION, + 'qrcode': BOOLEAN, + } + } + + +where: + +* ``TRANSPORT`` is the agreed upon transport which will be distributed, +* ``CHALLENGE`` is a base64-encoded CAPTCHA challenge which MUST be + later passed back to the server along with the proposed solution. +* ``SOLUTION`` is a valid unicode string, up to 20 bytes in length, + containing the client's answer (i.e. what characters the CAPTCHA + image displayed). The solution is *not* case-sensitive. +* ``BOOLEAN`` is ``'true'`` if the client wants a qrcode containing the bridge + lines to be generated and returned; ``'false'`` otherwise. + + +Receiving Bridges +""""""""""""""""" + +If the ``CHALLENGE`` has already timed out, or if the ``SOLUTION`` was +incorrect, the server SHOULD respond with ``419 No You're A Teapot``. + +If the ``SOLUTION`` was successful for the supplied ``CHALLENGE``, the +server responds ``200 OK`` with the following JSON:: + + { + 'data': { + 'id': 3, + 'type': 'moat bridges', + 'version': '0.1.0', + 'bridges': [ 'BRIDGE_LINE', ... ], + 'qrcode': QRCODE, + } + } + +where: + +* ``BRIDGE_LINE`` is a bridge line suitable for configuration in a torrc, +* ``QRCODE`` is a base64-encoded jpeg image of a QRCode containing all the + ``BRIDGE_LINE``, if one was requested, otherwise this field will be ``NaN``. + +.. + XXX do we care to differentiate the errors for "unable to distribute + bridges"? are any of these useful to Tor Launcher? + +If the ``SOLUTION`` was successful for the supplied ``CHALLENGE``, but the +server is unable to distribute the requested Bridges, the server responds ``200 +OK`` with the following JSON:: + + { + 'error': { + 'id': 1, + 'code': '404', + 'status': 'Not Found', + 'title': 'Could not fetch the type of bridges you requested', + 'detail': DETAILS, + } + } + +where: + +* ``DETAILS`` is some string describing the detailed nature of the issue. + + +Other Responses +""""""""""""""" + +If the client requested some page other than ``/meek/moat/fetch``, or +``/meek/moat/check``, the server MUST respond with ``501 Not Implemented``. + +If the client attempts any other HTTP method, other than ``POST``, the server +MUST respond ``403 FORBIDDEN``. + + ================= Contact & Support =================

1 0

[bridgedb/master] Add unittests for bridgedb.parse.blacklist.parseBridgeBlacklistFile().
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit 0b68b8223ebec20e3bd6bdff0d3752509dadb337 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Nov 2 01:02:41 2017 +0000 Add unittests for bridgedb.parse.blacklist.parseBridgeBlacklistFile(). --- bridgedb/parse/blacklist.py | 12 +++++++- bridgedb/test/test_parse_blacklist.py | 56 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/bridgedb/parse/blacklist.py b/bridgedb/parse/blacklist.py index 092f3e1..0b129d0 100644 --- a/bridgedb/parse/blacklist.py +++ b/bridgedb/parse/blacklist.py @@ -59,9 +59,19 @@ def parseBridgeBlacklistFile(filename): else: for line in fh.readlines(): fields = line.split(' ', 1) - fingerprint, reason = fields[0], fields[1] if len(fields)==2 else '' + + if len(fields) == 2: + fingerprint, reason = fields[0].strip(), fields[1].strip() + else: + fingerprint, reason = fields[0].strip(), "" if isValidFingerprint(fingerprint): + logging.info("Blacklisted %s. Reason: \"%s\"" % + (fingerprint, reason)) blacklist[fingerprint] = reason + else: + logging.warn(("Can't blacklist %s (for reason \"%s\"): " + "invalid fingerprint") % + (fingerprint, reason)) return blacklist diff --git a/bridgedb/test/test_parse_blacklist.py b/bridgedb/test/test_parse_blacklist.py new file mode 100644 index 0000000..5aa569e --- /dev/null +++ b/bridgedb/test/test_parse_blacklist.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# :copyright: (c) 2017, Isis Lovecruft +# (c) 2017, The Tor Project, Inc. +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests for :class:`bridgedb.parse.blacklist` module.""" + +from __future__ import print_function + +import logging +import os + +from bridgedb.parse import blacklist + +BLACKLIST_ENTRIES = """\ +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA doing bad stuff +BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB b-b-b-b-bad to the bone +CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC invalid fingerprint +DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD +""" + +from twisted.trial import unittest +from twisted.trial.unittest import SkipTest + +logging.disable(50) + + +class ParseBridgeBlacklistFileTests(unittest.TestCase): + """Unittests for :func:`bridgedb.parse.blacklist.parseBridgeBlacklistFile`.""" + + def setUp(self): + self.fh = "TEST-blacklisted-bridges" + + with open(self.fh, 'w') as fh: + fh.write(BLACKLIST_ENTRIES) + fh.flush() + + def test_parseBridgeBlacklistFile(self): + blacklisted = blacklist.parseBridgeBlacklistFile(self.fh) + + self.assertIn("A"*40, blacklisted.keys()) + self.assertIn("B"*40, blacklisted.keys()) + self.assertNotIn("C"*40, blacklisted.keys()) + self.assertIn("D"*40, blacklisted.keys()) + + self.assertEqual(blacklisted.get("A"*40), "doing bad stuff") + self.assertEqual(blacklisted.get("B"*40), "b-b-b-b-bad to the bone") + self.assertEqual(blacklisted.get("D"*40), "") + + def tearDown(self): + if os.path.isfile(self.fh): + os.unlink(self.fh)

1 0

[bridgedb/master] Merge branch 'fix/22871_r1' into develop
by isis＠torproject.org 16 Nov '17

16 Nov '17

commit dda4bbee3c57314b16861304b1490b07b8caed7a Merge: 3560339 3667a63 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Sep 12 21:33:22 2017 +0000 Merge branch 'fix/22871_r1' into develop .coveragerc | 1 + README.rst | 173 +++++ bridgedb.conf | 104 ++- bridgedb/captcha.py | 1 - bridgedb/configure.py | 12 +- bridgedb/distributors/__init__.py | 3 - bridgedb/distributors/common/__init__.py | 2 + bridgedb/distributors/common/http.py | 80 +++ bridgedb/distributors/email/__init__.py | 18 +- bridgedb/distributors/email/distributor.py | 3 + bridgedb/distributors/https/__init__.py | 6 +- bridgedb/distributors/https/distributor.py | 11 + bridgedb/distributors/https/server.py | 63 +- bridgedb/distributors/moat/__init__.py | 4 + bridgedb/distributors/moat/distributor.py | 64 ++ bridgedb/distributors/moat/request.py | 133 ++++ bridgedb/distributors/moat/server.py | 776 ++++++++++++++++++++ bridgedb/main.py | 59 +- bridgedb/test/https_helpers.py | 5 +- bridgedb/test/moat_helpers.py | 110 +++ bridgedb/test/test_distributors_common_http.py | 100 +++ bridgedb/test/test_distributors_moat_request.py | 52 ++ bridgedb/test/test_distributors_moat_server.py | 918 ++++++++++++++++++++++++ bridgedb/test/test_https_server.py | 70 -- bridgedb/test/test_main.py | 65 +- scripts/setup-tests | 7 + setup.py | 2 + 27 files changed, 2638 insertions(+), 204 deletions(-)

1 0