July 2015 - tor-commits - lists.torproject.org

[bridgedb/master] Switch to using relative imports for test helpers in test/tests_*.py.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 6d309cae1e709e615b592690f1a34369f60fa709 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 25 05:47:04 2015 +0000 Switch to using relative imports for test helpers in test/tests_*.py. --- bridgedb/util.py | 48 +++++++++++++++++++++----------------- test/email_helpers.py | 3 ++- test/https_helpers.py | 3 ++- test/legacy_Tests.py | 20 +++++++++------- test/test_Tests.py | 37 +++++++++++++++-------------- test/test_bridgedb.py | 4 ++-- test/test_bridges.py | 6 ++--- test/test_crypto.py | 5 ++-- test/test_email_autoresponder.py | 7 +++--- test/test_email_distributor.py | 3 ++- test/test_email_server.py | 7 +++--- test/test_https.py | 4 ++-- test/test_https_distributor.py | 7 +++--- test/test_https_server.py | 11 +++++---- test/test_parse_descriptors.py | 2 +- test/test_smtp.py | 4 ++-- test/test_translations.py | 2 +- test/util.py | 8 +++---- 18 files changed, 98 insertions(+), 83 deletions(-) diff --git a/bridgedb/util.py b/bridgedb/util.py index f15e08b..4c558c4 100644 --- a/bridgedb/util.py +++ b/bridgedb/util.py @@ -153,6 +153,7 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, the number of characters which must be changed in **s1** to make it identical to **s2**. + >>> from bridgedb.util import levenshteinDistance >>> levenshteinDistance('cat', 'cat') 0 >>> levenshteinDistance('cat', 'hat') @@ -188,6 +189,7 @@ def isascii(s): Note that this function differs from the str.is* methods in that it returns True for the empty string, rather than False. + >>> from bridgedb.util import isascii >>> isascii('\x80') False >>> isascii('foo\tbar\rbaz\n') @@ -206,6 +208,7 @@ def isascii_noncontrol(s): Note that this function differs from the str.is* methods in that it returns True for the empty string, rather than False. + >>> from bridgedb.util import isascii_noncontrol >>> isascii_noncontrol('\x80') False >>> isascii_noncontrol('foo\tbar\rbaz\n') @@ -220,6 +223,7 @@ def isascii_noncontrol(s): def replaceControlChars(text, replacement=None, encoding="utf-8"): """Remove ASCII control characters [0-31, 92, 127]. + >>> from bridgedb.util import replaceControlChars >>> replaceControlChars('foo\n bar\\ baz\r \t\0quux\n') 'foo bar baz quux' >>> replaceControlChars("\bI wonder if I'm outside the quotes now") @@ -344,36 +348,36 @@ class mixin: >>> from bridgedb.util import mixin >>> >>> class ClassA(object): - >>> def sayWhich(self): - >>> print("ClassA.sayWhich() called.") - >>> def doSuperThing(self): - >>> super(ClassA, self).__repr__() - >>> def doThing(self): - >>> print("ClassA is doing a thing.") - >>> + ... def sayWhich(self): + ... print("ClassA.sayWhich() called.") + ... def doSuperThing(self): + ... print("%s" % super(ClassA, self)) + ... def doThing(self): + ... print("ClassA is doing a thing.") + ... >>> class ClassB(ClassA): - >>> def sayWhich(self): - >>> print("ClassB.sayWhich() called.") - >>> def doSuperThing(self): - >>> super(ClassB, self).__repr__() - >>> def doOtherThing(self): - >>> print("ClassB is doing something else.") - >>> + ... def sayWhich(self): + ... print("ClassB.sayWhich() called.") + ... def doSuperThing(self): + ... print("%s" % super(ClassB, self)) + ... def doOtherThing(self): + ... print("ClassB is doing something else.") + ... >>> class ClassM(mixin): - >>> def sayWhich(self): - >>> print("ClassM.sayWhich() called.") - >>> + ... def sayWhich(self): + ... print("ClassM.sayWhich() called.") + ... >>> ClassM.register(ClassA) >>> >>> class ClassC(ClassM, ClassB): - >>> def sayWhich(self): - >>> super(ClassC, self).sayWhich() - >>> + ... def sayWhich(self): + ... super(ClassC, self).sayWhich() + ... >>> c = ClassC() >>> c.sayWhich() - ClassM.saywhich() called. + ClassM.sayWhich() called. >>> c.doSuperThing() - <super: <class 'ClassA'>, NULL> + <super: <class 'ClassB'>, <ClassC object>> >>> c.doThing() ClassA is doing a thing. >>> c.doOtherThing() diff --git a/test/email_helpers.py b/test/email_helpers.py index 14c86f4..8d7dd49 100644 --- a/test/email_helpers.py +++ b/test/email_helpers.py @@ -18,7 +18,8 @@ from bridgedb.email.distributor import IgnoreEmail from bridgedb.email.distributor import TooSoonEmail from bridgedb.email.server import MailServerContext from bridgedb.schedule import Unscheduled -from bridgedb.test import util + +from . import util EMAIL_DIST = True diff --git a/test/https_helpers.py b/test/https_helpers.py index e2c94ba..3fb4887 100644 --- a/test/https_helpers.py +++ b/test/https_helpers.py @@ -15,9 +15,10 @@ import io from twisted.web.test import requesthelper -from bridgedb.test import util from bridgedb.persistent import Conf +from . import util + SERVER_PUBLIC_FQDN = 'bridges.torproject.org' SERVER_PUBLIC_EXTERNAL_IP = '38.229.72.19' diff --git a/test/legacy_Tests.py b/test/legacy_Tests.py index 40f7ae4..22b2e13 100644 --- a/test/legacy_Tests.py +++ b/test/legacy_Tests.py @@ -30,19 +30,21 @@ from bridgedb.email.distributor import EmailDistributor from bridgedb.email.distributor import IgnoreEmail from bridgedb.email.distributor import TooSoonEmail from bridgedb.parse import addr -from bridgedb.test.util import bracketIPv6 -from bridgedb.test.util import randomIP -from bridgedb.test.util import randomIPv4 -from bridgedb.test.util import randomIPv6 -from bridgedb.test.util import randomIPString -from bridgedb.test.util import randomIPv4String -from bridgedb.test.util import randomIPv6String -from bridgedb.test.util import randomPort -from bridgedb.test.util import randomValidIPv6 + +from .util import bracketIPv6 +from .util import randomIP +from .util import randomIPv4 +from .util import randomIPv6 +from .util import randomIPString +from .util import randomIPv4String +from .util import randomIPv6String +from .util import randomPort +from .util import randomValidIPv6 from math import log warnings.filterwarnings('ignore', '.*tmpnam.*') +warnings.filterwarnings('ignore', '.*Config.*') def randomPortSpec(): diff --git a/test/test_Tests.py b/test/test_Tests.py index 84c3f8b..9209245 100644 --- a/test/test_Tests.py +++ b/test/test_Tests.py @@ -4,13 +4,13 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information -"""Class wrappers to adapt BridgeDB old unittests in :mod:`bridgedb.Tests` -(now kept in :mod:`bridgedb.test.legacy_Tests`) to be compatible with the +"""Class wrappers to adapt BridgeDB old unittests in ``bridgedb.Tests`` +(now kept in ``test/legacy_Tests``) to be compatible with the newer :api:`twisted.trial` unittests in this directory. """ @@ -22,16 +22,17 @@ import doctest import glob import logging import os -import warnings from twisted.python import monkey from twisted.trial import unittest -from bridgedb.test import legacy_Tests as Tests -from bridgedb.test import deprecated +from . import legacy_Tests as Tests +from . import deprecated + + +logging.disable(50) -warnings.filterwarnings('ignore', module="bridgedb\.test\.legacy_Tests") pyunit = __import__('unittest') @@ -64,16 +65,16 @@ def generateTrialAdaptedDoctestsSuite(): def monkeypatchTests(): """Monkeypatch the old unittests, replacing new, refactored code with their - original equivalents from :mod:`bridgedb.test.deprecated`. + original equivalents from :mod:`deprecated`. The first patch replaces the newer parsing function, :func:`~bridgedb.parse.networkstatus.parseALine`, with the older, - :func:`deprecated one <bridgedb.test.deprecated.parseORAddressLine>` (the + :func:`deprecated one <deprecated.parseORAddressLine>` (the old function was previously located at ``bridgedb.Bridges.parseORAddressLine``). The second patch replaces the new :class:`~bridgedb.parse.addr.PortList`, - with the :class:`older one <bridgedb.test.deprecated.PortList>` (which + with the :class:`older one <deprecated.PortList>` (which was previously located at ``bridgedb.Bridges.PortList``). The third, forth, and fifth monkeypatches add some module-level attributes @@ -81,7 +82,7 @@ def monkeypatchTests(): :rtype: :api:`~twisted.python.monkey.MonkeyPatcher` :returns: A :api:`~twisted.python.monkey.MonkeyPatcher`, preloaded with - patches from :mod:`bridgedb.test.deprecated`. + patches from :mod:`deprecated`. """ patcher = monkey.MonkeyPatcher() patcher.addPatch(Tests.bridgedb.Bridges, 'PluggableTransport', @@ -189,14 +190,14 @@ class DynamicTestCaseMeta(type): class OldUnittests(unittest.TestCase): - """A wrapper around :mod:`bridgedb.Tests` to produce :api:`~twisted.trial` + """A wrapper around :mod:`legacy_Tests` to produce :api:`~twisted.trial` compatible output. Generates a :api:`twisted.trial.unittest.TestCase` containing a - test for each of the individual tests in :mod:`bridgedb.Tests`. + test for each of the individual tests in :mod:`legacy_Tests`. Each test in this :api:`~twisted.trial.unittest.TestCase`` is dynamically - generated from one of the old unittests in :mod:`bridgedb.Tests`. Then, + generated from one of the old unittests in :mod:`legacy_Tests`. Then, the class is wrapped to cause the results reporting mechanisms to be :api:`~twisted.trial` compatible. @@ -209,13 +210,13 @@ class OldUnittests(unittest.TestCase): class MonkeypatchedOldUnittests(unittest.TestCase): - """A wrapper around :mod:`bridgedb.Tests` to produce :api:`~twisted.trial` + """A wrapper around :mod:`legacy_Tests` to produce :api:`~twisted.trial` compatible output. For each test in this ``TestCase``, one of the old unittests in bridgedb/Tests.py is run. For all of the tests, some functions and classes are :api:`twisted.python.monkey.MonkeyPatcher.patch`ed with old, - deprecated code from :mod:`bridgedb.test.deprecated` to ensure that any + deprecated code from :mod:`deprecated` to ensure that any new code has not caused any regressions. """ __metaclass__ = DynamicTestCaseMeta diff --git a/test/test_bridgedb.py b/test/test_bridgedb.py index 70c71f0..00c231b 100644 --- a/test/test_bridgedb.py +++ b/test/test_bridgedb.py @@ -21,8 +21,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import processExists -from bridgedb.test.util import getBridgeDBPID +from .util import processExists +from .util import getBridgeDBPID class BridgeDBCliTest(unittest.TestCase): diff --git a/test/test_bridges.py b/test/test_bridges.py index db662ae..9448e3f 100644 --- a/test/test_bridges.py +++ b/test/test_bridges.py @@ -148,10 +148,10 @@ class BridgeIntegrationTests(unittest.TestCase): .. data: OldTest (enum) These tests were refactored from the old tests for - :class:`~bridgedb.test.deprecated.Bridge`, which lived in + ``deprecated.Bridge`, which lived in ``lib/bridgedb/test/test_Bridges.py``. For the translations from the old - tests in ``bridgedb.test.test_Bridges.BridgeClassTest`` to their new - equivalents here in ``bridgedb.test.test_bridges.BridgeIntegrationTests``, + tests in ``test_Bridges.BridgeClassTest`` to their new + equivalents here in ``test_bridges.BridgeIntegrationTests``, which should test for the same things as their old equivalents, see the following table: diff --git a/test/test_crypto.py b/test/test_crypto.py index 3264ace..5220a58 100644 --- a/test/test_crypto.py +++ b/test/test_crypto.py @@ -33,8 +33,9 @@ from twisted.web.test import test_agent as txtagent from bridgedb import crypto from bridgedb import txrecaptcha from bridgedb.persistent import Conf -from bridgedb.test.util import fileCheckDecorator -from bridgedb.test.email_helpers import _createConfig + +from .util import fileCheckDecorator +from .email_helpers import _createConfig logging.disable(50) diff --git a/test/test_email_autoresponder.py b/test/test_email_autoresponder.py index 98302ca..77fb77a 100644 --- a/test/test_email_autoresponder.py +++ b/test/test_email_autoresponder.py @@ -26,9 +26,10 @@ from twisted.test import proto_helpers from bridgedb.email import autoresponder from bridgedb.email.server import SMTPMessage from bridgedb.email.distributor import TooSoonEmail -from bridgedb.test.email_helpers import _createConfig -from bridgedb.test.email_helpers import _createMailServerContext -from bridgedb.test.email_helpers import DummyEmailDistributorWithState + +from .email_helpers import _createConfig +from .email_helpers import _createMailServerContext +from .email_helpers import DummyEmailDistributorWithState class CreateResponseBodyTests(unittest.TestCase): diff --git a/test/test_email_distributor.py b/test/test_email_distributor.py index b4d88b2..f204d57 100644 --- a/test/test_email_distributor.py +++ b/test/test_email_distributor.py @@ -28,7 +28,8 @@ from bridgedb.email.request import EmailBridgeRequest from bridgedb.parse.addr import BadEmail from bridgedb.parse.addr import UnsupportedDomain from bridgedb.parse.addr import normalizeEmail -from bridgedb.test.util import generateFakeBridges + +from .util import generateFakeBridges logging.disable(50) diff --git a/test/test_email_server.py b/test/test_email_server.py index 9c4fabb..3a3d62d 100644 --- a/test/test_email_server.py +++ b/test/test_email_server.py @@ -36,9 +36,10 @@ from bridgedb.email.distributor import EmailDistributor from bridgedb.email.distributor import TooSoonEmail from bridgedb.parse.addr import BadEmail from bridgedb.schedule import Unscheduled -from bridgedb.test import util -from bridgedb.test.email_helpers import _createConfig -from bridgedb.test.email_helpers import _createMailServerContext + +from . import util +from .email_helpers import _createConfig +from .email_helpers import _createMailServerContext class SMTPMessageTests(unittest.TestCase): diff --git a/test/test_https.py b/test/test_https.py index 1e0c778..8a5754f 100644 --- a/test/test_https.py +++ b/test/test_https.py @@ -35,8 +35,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import processExists -from bridgedb.test.util import getBridgeDBPID +from .util import processExists +from .util import getBridgeDBPID HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' diff --git a/test/test_https_distributor.py b/test/test_https_distributor.py index 83f2503..3c1416d 100644 --- a/test/test_https_distributor.py +++ b/test/test_https_distributor.py @@ -26,9 +26,10 @@ from bridgedb.filters import byIPv6 from bridgedb.https import distributor from bridgedb.https.request import HTTPSBridgeRequest from bridgedb.proxy import ProxySet -from bridgedb.test.util import randomValidIPv4String -from bridgedb.test.util import generateFakeBridges -from bridgedb.test.https_helpers import DummyRequest + +from .util import randomValidIPv4String +from .util import generateFakeBridges +from .https_helpers import DummyRequest logging.disable(50) diff --git a/test/test_https_server.py b/test/test_https_server.py index e782135..708f7e3 100644 --- a/test/test_https_server.py +++ b/test/test_https_server.py @@ -29,11 +29,12 @@ from twisted.web.test import requesthelper from bridgedb.https import server from bridgedb.schedule import ScheduledInterval -from bridgedb.test.https_helpers import _createConfig -from bridgedb.test.https_helpers import DummyRequest -from bridgedb.test.https_helpers import DummyHTTPSDistributor -from bridgedb.test.util import DummyBridge -from bridgedb.test.util import DummyMaliciousBridge + +from .https_helpers import _createConfig +from .https_helpers import DummyRequest +from .https_helpers import DummyHTTPSDistributor +from .util import DummyBridge +from .util import DummyMaliciousBridge # For additional logger output for debugging, comment out the following: diff --git a/test/test_parse_descriptors.py b/test/test_parse_descriptors.py index dd6d146..5104ccd 100644 --- a/test/test_parse_descriptors.py +++ b/test/test_parse_descriptors.py @@ -33,7 +33,7 @@ except (ImportError, NameError), error: else: HAS_STEM = True -from bridgedb.test.util import Benchmarker +from .util import Benchmarker BRIDGE_NETWORKSTATUS_0 = '''\ diff --git a/test/test_smtp.py b/test/test_smtp.py index de443b3..0ac4ada 100644 --- a/test/test_smtp.py +++ b/test/test_smtp.py @@ -15,8 +15,8 @@ from twisted.trial import unittest from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest -from bridgedb.test.util import processExists -from bridgedb.test.util import getBridgeDBPID +from .util import processExists +from .util import getBridgeDBPID # ------------- SMTP Client Config SMTP_DEBUG_LEVEL = 0 # set to 1 to see SMTP message exchange diff --git a/test/test_translations.py b/test/test_translations.py index 48229c6..c1f0c8c 100644 --- a/test/test_translations.py +++ b/test/test_translations.py @@ -11,7 +11,7 @@ from twisted.trial import unittest from bridgedb import translations -from bridgedb.test.test_https_server import DummyRequest +from .https_helpers import DummyRequest REALISH_HEADERS = { diff --git a/test/util.py b/test/util.py index 0f1e0f9..bd8227d 100644 --- a/test/util.py +++ b/test/util.py @@ -4,12 +4,12 @@ # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> # please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2015, Isis Lovecruft +# (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file # :license: 3-Clause BSD, see LICENSE for licensing information -"""Unittests utilitys the `bridgedb.test` package.""" +"""Unittest utilities.""" from __future__ import print_function from __future__ import unicode_literals

1 0

[bridgedb/master] Merge branch 'fix/12506-separate-dist-dirs' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 5019761881c7807ab0f09f0728f337b5ce857ca5 Merge: dfbc8e0 a51f553 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 25 03:17:58 2015 +0000 Merge branch 'fix/12506-separate-dist-dirs' into develop doc/sphinx/source/bridgedb.HTTPServer.rst | 8 - doc/sphinx/source/bridgedb.https.rst | 11 + doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 4 +- lib/bridgedb/Bridges.py | 51 +- lib/bridgedb/Dist.py | 664 ++++++------ lib/bridgedb/Filters.py | 41 +- lib/bridgedb/HTTPServer.py | 935 ----------------- lib/bridgedb/Main.py | 116 +-- lib/bridgedb/bridgerequest.py | 23 +- lib/bridgedb/bridges.py | 123 ++- lib/bridgedb/email/autoresponder.py | 16 +- lib/bridgedb/email/request.py | 15 - lib/bridgedb/email/templates.py | 14 +- lib/bridgedb/https/__init__.py | 1 + lib/bridgedb/https/request.py | 143 +++ lib/bridgedb/https/server.py | 909 +++++++++++++++++ .../https/templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/https/templates/assets/css/custom.css | 158 +++ .../templates/assets/css/font-awesome-ie7.min.css | 384 +++++++ .../templates/assets/css/font-awesome.min.css | 403 ++++++++ lib/bridgedb/https/templates/assets/css/main.css | 24 + .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes .../https/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../https/templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../https/templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes .../https/templates/assets/tor-roots-blue.svg | 95 ++ lib/bridgedb/https/templates/assets/tor.svg | 6 + lib/bridgedb/https/templates/base.html | 108 ++ lib/bridgedb/https/templates/bridges.html | 203 ++++ lib/bridgedb/https/templates/captcha.html | 63 ++ lib/bridgedb/https/templates/howto.html | 39 + lib/bridgedb/https/templates/index.html | 43 + lib/bridgedb/https/templates/options.html | 164 +++ lib/bridgedb/https/templates/robots.txt | 1079 ++++++++++++++++++++ lib/bridgedb/strings.py | 270 ++++- lib/bridgedb/templates/assets/bridgedb.png | Bin 2946 -> 0 bytes .../templates/assets/css/bootstrap.min.css | 7 - lib/bridgedb/templates/assets/css/custom.css | 158 --- .../templates/assets/css/font-awesome-ie7.min.css | 384 ------- .../templates/assets/css/font-awesome.min.css | 403 -------- lib/bridgedb/templates/assets/css/main.css | 24 - .../templates/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 -------- .../templates/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 46160 -> 0 bytes .../templates/assets/font/lato-italic.woff | Bin 47168 -> 0 bytes .../templates/assets/font/lato-regular.woff | Bin 46108 -> 0 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 -- lib/bridgedb/templates/assets/tor.svg | 6 - lib/bridgedb/templates/base.html | 108 -- lib/bridgedb/templates/bridgedb.asc | 252 ----- lib/bridgedb/templates/bridges.html | 203 ---- lib/bridgedb/templates/captcha.html | 63 -- lib/bridgedb/templates/howto.html | 39 - lib/bridgedb/templates/index.html | 43 - lib/bridgedb/templates/options.html | 164 --- lib/bridgedb/templates/robots.txt | 1079 -------------------- lib/bridgedb/test/email_helpers.py | 36 +- lib/bridgedb/test/https_helpers.py | 130 +++ lib/bridgedb/test/legacy_Tests.py | 69 +- lib/bridgedb/test/test_Dist.py | 239 +++++ lib/bridgedb/test/test_HTTPServer.py | 804 --------------- lib/bridgedb/test/test_Main.py | 101 +- lib/bridgedb/test/test_bridgerequest.py | 20 +- lib/bridgedb/test/test_bridges.py | 83 +- lib/bridgedb/test/test_email_server.py | 5 +- lib/bridgedb/test/test_https_request.py | 91 ++ lib/bridgedb/test/test_https_server.py | 838 +++++++++++++++ lib/bridgedb/test/test_translations.py | 2 +- lib/bridgedb/test/util.py | 76 ++ setup.py | 5 +- 76 files changed, 6594 insertions(+), 5853 deletions(-)

1 0

[bridgedb/master] Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 16ff46eab29dede9cedccf6c385be5a69617eced Merge: c134d3e 0a26984 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 20 21:32:26 2015 +0000 Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop doc/sphinx/source/conf.py | 1 - 1 file changed, 1 deletion(-)

1 0

[bridgedb/master] Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 8bf4f5f995f0592a0c85347b440fa393a6f7a8e3 Merge: 4ebb784 6d309ca Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 25 06:43:27 2015 +0000 Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop .gitattributes | 2 +- .pylintrc | 2 +- Makefile | 10 +- bridgedb/Bridges.py | 684 ++++++++ bridgedb/Bucket.py | 288 ++++ bridgedb/Main.py | 507 ++++++ bridgedb/Stability.py | 295 ++++ bridgedb/Storage.py | 466 +++++ bridgedb/__init__.py | 17 + bridgedb/_langs.py | 26 + bridgedb/_version.py | 197 +++ bridgedb/bridgerequest.py | 206 +++ bridgedb/bridges.py | 1769 +++++++++++++++++++ bridgedb/captcha.py | 392 +++++ bridgedb/configure.py | 157 ++ bridgedb/crypto.py | 450 +++++ bridgedb/distribute.py | 275 +++ bridgedb/email/__init__.py | 1 + bridgedb/email/autoresponder.py | 704 ++++++++ bridgedb/email/distributor.py | 219 +++ bridgedb/email/dkim.py | 73 + bridgedb/email/request.py | 171 ++ bridgedb/email/server.py | 496 ++++++ bridgedb/email/templates.py | 200 +++ bridgedb/filters.py | 238 +++ bridgedb/geo.py | 82 + bridgedb/https/__init__.py | 1 + bridgedb/https/distributor.py | 328 ++++ bridgedb/https/request.py | 143 ++ bridgedb/https/server.py | 905 ++++++++++ .../https/templates/assets/css/bootstrap.min.css | 7 + bridgedb/https/templates/assets/css/custom.css | 158 ++ .../templates/assets/css/font-awesome-ie7.min.css | 384 +++++ .../templates/assets/css/font-awesome.min.css | 403 +++++ bridgedb/https/templates/assets/css/main.css | 24 + .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 +++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes .../https/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../https/templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../https/templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes bridgedb/https/templates/assets/tor-roots-blue.svg | 95 + bridgedb/https/templates/assets/tor.svg | 6 + bridgedb/https/templates/base.html | 108 ++ bridgedb/https/templates/bridges.html | 203 +++ bridgedb/https/templates/captcha.html | 63 + bridgedb/https/templates/howto.html | 39 + bridgedb/https/templates/index.html | 43 + bridgedb/https/templates/options.html | 164 ++ bridgedb/https/templates/robots.txt | 1079 ++++++++++++ bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 368 ++++ bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 386 +++++ bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 363 ++++ bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 ++ bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 384 +++++ bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 389 +++++ bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ++++ bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 +++++ bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 382 ++++ bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 +++++ bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 388 +++++ bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 ++ bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 ++ bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 387 +++++ bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 386 +++++ bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 393 +++++ bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 383 ++++ bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 ++ bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 ++ bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 384 +++++ bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 384 +++++ bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 ++ bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 391 +++++ bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 362 ++++ bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ++++ bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 ++ bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 ++ bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 ++ bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 ++ bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 384 +++++ bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 390 +++++ bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 388 +++++ bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 387 +++++ bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 386 +++++ bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 360 ++++ bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 389 +++++ bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 ++ bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 361 ++++ bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ++++ bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 ++++ bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 387 +++++ bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ++++ bridgedb/i18n/templates/bridgedb.pot | 393 +++++ bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 ++ bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 389 +++++ bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 384 +++++ bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 388 +++++ bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ++++ bridgedb/interfaces.py | 67 + bridgedb/parse/__init__.py | 79 + bridgedb/parse/addr.py | 589 +++++++ bridgedb/parse/descriptors.py | 298 ++++ bridgedb/parse/fingerprint.py | 64 + bridgedb/parse/headers.py | 79 + bridgedb/parse/nickname.py | 58 + bridgedb/parse/options.py | 295 ++++ bridgedb/parse/versions.py | 129 ++ bridgedb/persistent.py | 264 +++ bridgedb/proxy.py | 473 +++++ bridgedb/qrcodes.py | 77 + bridgedb/runner.py | 109 ++ bridgedb/safelog.py | 197 +++ bridgedb/schedule.py | 326 ++++ bridgedb/sitecustomize.py | 34 + bridgedb/strings.py | 565 ++++++ bridgedb/translations.py | 122 ++ bridgedb/txrecaptcha.py | 299 ++++ bridgedb/util.py | 389 +++++ lib/bridgedb/Bridges.py | 684 -------- lib/bridgedb/Bucket.py | 288 ---- lib/bridgedb/Main.py | 507 ------ lib/bridgedb/Stability.py | 295 ---- lib/bridgedb/Storage.py | 466 ----- lib/bridgedb/__init__.py | 17 - lib/bridgedb/_langs.py | 26 - lib/bridgedb/_version.py | 197 --- lib/bridgedb/bridgerequest.py | 206 --- lib/bridgedb/bridges.py | 1769 ------------------- lib/bridgedb/captcha.py | 392 ----- lib/bridgedb/configure.py | 157 -- lib/bridgedb/crypto.py | 450 ----- lib/bridgedb/distribute.py | 275 --- lib/bridgedb/email/__init__.py | 1 - lib/bridgedb/email/autoresponder.py | 704 -------- lib/bridgedb/email/distributor.py | 219 --- lib/bridgedb/email/dkim.py | 73 - lib/bridgedb/email/request.py | 171 -- lib/bridgedb/email/server.py | 496 ------ lib/bridgedb/email/templates.py | 200 --- lib/bridgedb/filters.py | 238 --- lib/bridgedb/geo.py | 82 - lib/bridgedb/https/__init__.py | 1 - lib/bridgedb/https/distributor.py | 328 ---- lib/bridgedb/https/request.py | 143 -- lib/bridgedb/https/server.py | 905 ---------- .../https/templates/assets/css/bootstrap.min.css | 7 - lib/bridgedb/https/templates/assets/css/custom.css | 158 -- .../templates/assets/css/font-awesome-ie7.min.css | 384 ----- .../templates/assets/css/font-awesome.min.css | 403 ----- lib/bridgedb/https/templates/assets/css/main.css | 24 - .../templates/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ----- .../templates/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes .../https/templates/assets/font/lato-bold.woff | Bin 46160 -> 0 bytes .../https/templates/assets/font/lato-italic.woff | Bin 47168 -> 0 bytes .../https/templates/assets/font/lato-regular.woff | Bin 46108 -> 0 bytes .../https/templates/assets/tor-roots-blue.svg | 95 - lib/bridgedb/https/templates/assets/tor.svg | 6 - lib/bridgedb/https/templates/base.html | 108 -- lib/bridgedb/https/templates/bridges.html | 203 --- lib/bridgedb/https/templates/captcha.html | 63 - lib/bridgedb/https/templates/howto.html | 39 - lib/bridgedb/https/templates/index.html | 43 - lib/bridgedb/https/templates/options.html | 164 -- lib/bridgedb/https/templates/robots.txt | 1079 ------------ lib/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 368 ---- lib/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 386 ----- lib/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 363 ---- lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 -- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 384 ----- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 389 ----- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 364 ---- lib/bridgedb/i18n/en/LC_MESSAGES/bridgedb.po | 433 ----- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 382 ---- lib/bridgedb/i18n/en_US/LC_MESSAGES/bridgedb.po | 433 ----- lib/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 388 ----- lib/bridgedb/i18n/es_CL/LC_MESSAGES/bridgedb.po | 102 -- lib/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 101 -- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 387 ----- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 386 ----- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 393 ----- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 383 ---- lib/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 101 -- lib/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 105 -- lib/bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 384 ----- lib/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 384 ----- lib/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 101 -- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 391 ----- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 362 ---- lib/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 360 ---- lib/bridgedb/i18n/kn/LC_MESSAGES/bridgedb.po | 102 -- lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 -- lib/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 101 -- lib/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 102 -- lib/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 384 ----- lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 390 ----- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 388 ----- lib/bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po | 387 ----- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 386 ----- lib/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 360 ---- lib/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 389 ----- lib/bridgedb/i18n/si_LK/LC_MESSAGES/bridgedb.po | 100 -- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 361 ---- lib/bridgedb/i18n/sk_SK/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/sl_SI/LC_MESSAGES/bridgedb.po | 359 ---- lib/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 380 ---- lib/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 387 ----- lib/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ---- lib/bridgedb/i18n/templates/bridgedb.pot | 391 ----- lib/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 101 -- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 389 ----- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 384 ----- lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 388 ----- lib/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ---- lib/bridgedb/interfaces.py | 67 - lib/bridgedb/parse/__init__.py | 79 - lib/bridgedb/parse/addr.py | 589 ------- lib/bridgedb/parse/descriptors.py | 298 ---- lib/bridgedb/parse/fingerprint.py | 64 - lib/bridgedb/parse/headers.py | 79 - lib/bridgedb/parse/nickname.py | 58 - lib/bridgedb/parse/options.py | 295 ---- lib/bridgedb/parse/versions.py | 129 -- lib/bridgedb/persistent.py | 264 --- lib/bridgedb/proxy.py | 473 ----- lib/bridgedb/qrcodes.py | 77 - lib/bridgedb/runner.py | 109 -- lib/bridgedb/safelog.py | 197 --- lib/bridgedb/schedule.py | 326 ---- lib/bridgedb/sitecustomize.py | 34 - lib/bridgedb/strings.py | 565 ------ lib/bridgedb/test/deprecated.py | 448 ----- lib/bridgedb/test/email_helpers.py | 179 -- lib/bridgedb/test/https_helpers.py | 130 -- lib/bridgedb/test/legacy_Tests.py | 332 ---- lib/bridgedb/test/test_Bucket.py | 63 - lib/bridgedb/test/test_Main.py | 437 ----- lib/bridgedb/test/test_Storage.py | 56 - lib/bridgedb/test/test_Tests.py | 248 --- lib/bridgedb/test/test_bridgedb.py | 103 -- lib/bridgedb/test/test_bridgerequest.py | 58 - lib/bridgedb/test/test_bridges.py | 1820 -------------------- lib/bridgedb/test/test_captcha.py | 337 ---- lib/bridgedb/test/test_configure.py | 67 - lib/bridgedb/test/test_crypto.py | 392 ----- lib/bridgedb/test/test_distribute.py | 44 - lib/bridgedb/test/test_email_autoresponder.py | 571 ------ lib/bridgedb/test/test_email_distributor.py | 258 --- lib/bridgedb/test/test_email_dkim.py | 86 - lib/bridgedb/test/test_email_request.py | 276 --- lib/bridgedb/test/test_email_server.py | 543 ------ lib/bridgedb/test/test_email_templates.py | 119 -- lib/bridgedb/test/test_filters.py | 333 ---- lib/bridgedb/test/test_geo.py | 96 -- lib/bridgedb/test/test_https.py | 415 ----- lib/bridgedb/test/test_https_distributor.py | 405 ----- lib/bridgedb/test/test_https_request.py | 91 - lib/bridgedb/test/test_https_server.py | 838 --------- lib/bridgedb/test/test_interfaces.py | 55 - lib/bridgedb/test/test_parse_addr.py | 749 -------- lib/bridgedb/test/test_parse_descriptors.py | 855 --------- lib/bridgedb/test/test_parse_headers.py | 52 - lib/bridgedb/test/test_parse_nickname.py | 63 - lib/bridgedb/test/test_parse_options.py | 102 -- lib/bridgedb/test/test_parse_versions.py | 42 - lib/bridgedb/test/test_persistent.py | 170 -- lib/bridgedb/test/test_persistentSaveAndLoad.py | 163 -- lib/bridgedb/test/test_proxy.py | 590 ------- lib/bridgedb/test/test_qrcodes.py | 73 - lib/bridgedb/test/test_safelog.py | 335 ---- lib/bridgedb/test/test_schedule.py | 224 --- lib/bridgedb/test/test_smtp.py | 206 --- lib/bridgedb/test/test_translations.py | 78 - lib/bridgedb/test/test_txrecaptcha.py | 270 --- lib/bridgedb/test/test_util.py | 144 -- lib/bridgedb/test/util.py | 301 ---- lib/bridgedb/translations.py | 122 -- lib/bridgedb/txrecaptcha.py | 299 ---- lib/bridgedb/util.py | 385 ----- scripts/bridgedb | 2 +- setup.cfg | 14 +- setup.py | 11 +- test/deprecated.py | 448 +++++ test/email_helpers.py | 180 ++ test/https_helpers.py | 131 ++ test/legacy_Tests.py | 334 ++++ test/test_Bucket.py | 63 + test/test_Main.py | 437 +++++ test/test_Storage.py | 56 + test/test_Tests.py | 249 +++ test/test_bridgedb.py | 103 ++ test/test_bridgerequest.py | 58 + test/test_bridges.py | 1820 ++++++++++++++++++++ test/test_captcha.py | 337 ++++ test/test_configure.py | 67 + test/test_crypto.py | 393 +++++ test/test_distribute.py | 44 + test/test_email_autoresponder.py | 572 ++++++ test/test_email_distributor.py | 259 +++ test/test_email_dkim.py | 86 + test/test_email_request.py | 276 +++ test/test_email_server.py | 544 ++++++ test/test_email_templates.py | 119 ++ test/test_filters.py | 333 ++++ test/test_geo.py | 96 ++ test/test_https.py | 415 +++++ test/test_https_distributor.py | 406 +++++ test/test_https_request.py | 91 + test/test_https_server.py | 839 +++++++++ test/test_interfaces.py | 55 + test/test_parse_addr.py | 749 ++++++++ test/test_parse_descriptors.py | 855 +++++++++ test/test_parse_headers.py | 52 + test/test_parse_nickname.py | 63 + test/test_parse_options.py | 102 ++ test/test_parse_versions.py | 42 + test/test_persistent.py | 170 ++ test/test_persistentSaveAndLoad.py | 163 ++ test/test_proxy.py | 590 +++++++ test/test_qrcodes.py | 73 + test/test_safelog.py | 335 ++++ test/test_schedule.py | 224 +++ test/test_smtp.py | 206 +++ test/test_translations.py | 78 + test/test_txrecaptcha.py | 270 +++ test/test_util.py | 144 ++ test/util.py | 301 ++++ 338 files changed, 46997 insertions(+), 46981 deletions(-)

1 0

[bridgedb/master] Update .gitignore location for bridgedb/_langs.py.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 5607297e47263abee5b2e0162e8d6d3ba7fbc9d7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 20 19:55:49 2015 +0000 Update .gitignore location for bridgedb/_langs.py. --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f208f3e..24b09e6 100644 --- a/.gitignore +++ b/.gitignore @@ -81,9 +81,9 @@ run/* *blocked-bridges *extra-infos -# do not recommit lib/bridgedb/_langs.py: +# do not recommit bridgedb/_langs.py: # (the "supported" variable is supposed to be rewritten at install time) -lib/bridgedb/_langs.py +bridgedb/_langs.py # ignore persistent state files *bridgedb.state*

1 0

[bridgedb/master] Merge branch 'fix/15968-16649-csp-and-mobile' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 343583dd3a15b36258bace06debe6f8d9d7bd9b7 Merge: 5e97d68 002104d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jul 24 06:47:25 2015 +0000 Merge branch 'fix/15968-16649-csp-and-mobile' into develop bridgedb.conf | 44 ++- bridgedb/configure.py | 3 +- bridgedb/https/server.py | 183 ++++++++++- bridgedb/https/templates/assets/css/custom.css | 158 --------- bridgedb/https/templates/assets/css/main.css | 419 +++++++++++++++++++++++- bridgedb/https/templates/assets/css/rtl.css | 7 + bridgedb/https/templates/assets/js/bridges.js | 83 +++++ bridgedb/https/templates/base.html | 142 ++++---- bridgedb/https/templates/bridges.html | 102 ++---- bridgedb/https/templates/captcha.html | 92 +++--- bridgedb/https/templates/howto.html | 11 +- bridgedb/https/templates/index.html | 12 +- bridgedb/https/templates/options.html | 124 ++++--- scripts/setup-tests | 1 + setup.py | 3 +- test/https_helpers.py | 32 +- test/test_https.py | 22 ++ test/test_https_server.py | 130 +++++++- 18 files changed, 1105 insertions(+), 463 deletions(-) diff --cc bridgedb/https/server.py index 81ce09f,ef40377..2f5ed83 --- a/bridgedb/https/server.py +++ b/bridgedb/https/server.py @@@ -76,9 -73,39 +76,39 @@@ lookup = TemplateLookup(directories=[TE collection_size=500) logging.debug("Set template root to %s" % TEMPLATE_DIR) + #: This server's public, fully-qualified domain name. + SERVER_PUBLIC_FQDN = None + + + def setFQDN(fqdn, https=True): + """Set the global :data:`SERVER_PUBLIC FQDN` variable. + + :param str fqdn: The public, fully-qualified domain name of the HTTP + server that will serve this resource. + :param bool https: If ``True``, then ``'https://'`` will be prepended to + the FQDN. This is primarily used to create a + ``Content-Security-Policy`` header that will only allow resources to + be sourced via HTTPS, otherwise, if ``False``, it allow resources to + be sourced via any transport protocol. + """ + if https: + fqdn = 'https://' + fqdn + + logging.info("Setting HTTP server public FQDN to %r" % fqdn) + + global SERVER_PUBLIC_FQDN + SERVER_PUBLIC_FQDN = fqdn + + def getFQDN(): + """Get the setting for the HTTP server's public FQDN from the global + :data:`SERVER_PUBLIC_FQDN variable. + + :rtype: str or None + """ + return SERVER_PUBLIC_FQDN def getClientIP(request, useForwardedHeader=False): - """Get the client's IP address from the :header:`X-Forwarded-For` + """Get the client's IP address from the ``'X-Forwarded-For:'`` header, or from the :api:`request <twisted.web.server.Request>`. :type request: :api:`twisted.web.http.Request`

1 0

[bridgedb/master] Remove import of bridgedb.test for Sphinx documentation builds.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 0a2698469b678adce9e1057e57a16bfcb68d98e4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 20 21:31:58 2015 +0000 Remove import of bridgedb.test for Sphinx documentation builds. --- doc/sphinx/source/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index cab614f..a4dba2c 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -64,7 +64,6 @@ import bridgedb.schedule import bridgedb.Stability import bridgedb.Storage import bridgedb.strings -import bridgedb.test import bridgedb.translations import bridgedb.txrecaptcha import bridgedb.util

1 0

[bridgedb/master] Add unittests for HSDir flags in bridge networkstatus documents.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit 5f3910b02dfa19a70cb8ba0cee7bbc3a2c82b8ed Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 20 19:58:18 2015 +0000 Add unittests for HSDir flags in bridge networkstatus documents. * FIXES #16616: https://bugs.torproject.org/16616 --- test/test_bridges.py | 19 +++++++++++++++++++ test/test_parse_descriptors.py | 24 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/test/test_bridges.py b/test/test_bridges.py index 9448e3f..3c5fe0d 100644 --- a/test/test_bridges.py +++ b/test/test_bridges.py @@ -403,6 +403,25 @@ class FlagsTests(unittest.TestCase): self.assertFalse(self.flags.fast) self.assertTrue(self.flags.stable) + def test_update_HSDir(self): + """Test adding the HSDir flag with the update() method. + + See also: :trac:`16616`. + """ + self.flags.update(["Fast", "Stable", "HSDir"]) + self.assertTrue(self.flags.fast) + self.assertTrue(self.flags.stable) + # We don't care about the HSDir flag: + self.assertIsNone(getattr(self.flags, "hsdir", None)) + + def test_update_Unicorn(self): + """Test adding a completely made-up flag, "Unicorn", with the update() + method. (It shouldn't get added.) + """ + self.flags.update(["Unicorn"]) + # We don't care about the make-believe Unicorn flag: + self.assertIsNone(getattr(self.flags, "unicorn", None)) + class BridgeAddressBaseTests(unittest.TestCase): """Tests for :class:`bridgedb.bridges.BridgeAddressBase`.""" diff --git a/test/test_parse_descriptors.py b/test/test_parse_descriptors.py index 5104ccd..bd3c3d5 100644 --- a/test/test_parse_descriptors.py +++ b/test/test_parse_descriptors.py @@ -391,6 +391,30 @@ class ParseDescriptorsTests(unittest.TestCase): descriptors.parseNetworkStatusFile, descFile) + def test_parse_descriptors_parseNetworkStatusFile_HSDir_flag(self): + """A Bridge networkstatus descriptor with the HSDir flag should be + possible to parse (without errors), however, the flag should be ignored + (since the :class:`bridgedb.bridges.Flags` class doesn't care about it). + + See also: :trac:`16616` + """ + unparseable = BRIDGE_NETWORKSTATUS_0.replace( + 's Fast Guard Running Stable Valid', + 's Fast Guard Running Stable Valid HSDir') + # Write the descriptor to a file for testing. This is necessary + # because the function opens the networkstatus file to read it. + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + unparseable) + routers = descriptors.parseNetworkStatusFile(descFile) + bridge = routers[0] + + for flag in [u'Fast', u'Guard', u'Running', + u'Stable', u'Valid', u'HSDir']: + self.assertTrue(flag in bridge.flags, + ("Expected to parse the %r flag from a bridge " + "networkstatus document, but the flag was not " + "found!")) + def test_parse_descriptors_parseNetworkStatusFile_IPv6_ORAddress(self): """A Bridge can't have its primary ORAddress be IPv6 without raising a ValueError.

1 0

[bridgedb/master] Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit fbd8121449ddefb6daa4910c6779c781d07c3390 Merge: 300bc11 5607297 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 20 19:56:51 2015 +0000 Merge branch 'hotfix/0.3.2-remove-lib-dir' into develop .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[bridgedb/master] Tiny documentation fixes for how to use the Sphinx traclinks extension.
by isis＠torproject.org 25 Jul '15

25 Jul '15

commit c134d3eeddd5f1ae99c8b09fd63891c15f7cc3b9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jul 20 21:23:30 2015 +0000 Tiny documentation fixes for how to use the Sphinx traclinks extension. --- bridgedb/parse/descriptors.py | 2 +- doc/sphinx/ext/traclinks.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bridgedb/parse/descriptors.py b/bridgedb/parse/descriptors.py index 1b0108e..2986fd3 100644 --- a/bridgedb/parse/descriptors.py +++ b/bridgedb/parse/descriptors.py @@ -92,7 +92,7 @@ def parseNetworkStatusFile(filename, validate=True, skipAnnotations=True, descriptorClass=RouterStatusEntryV3): """Parse a file which contains an ``@type bridge-networkstatus`` document. - See :trac:`#12254` for why networkstatus-bridges documents don't look + See :trac:`12254` for why networkstatus-bridges documents don't look anything like the networkstatus v2 documents that they are purported to look like. They are missing all headers, and the entire footer including authority signatures. diff --git a/doc/sphinx/ext/traclinks.py b/doc/sphinx/ext/traclinks.py index fd2d9b3..75abce4 100644 --- a/doc/sphinx/ext/traclinks.py +++ b/doc/sphinx/ext/traclinks.py @@ -3,13 +3,14 @@ RestructuredText interpreted text role that looks like this:: :trac:`trac_link_text` -for example:: +For example:: - :trac:`#2015` + :trac:`2015` -creates a link to ticket number 2015. +would create a link to ticket number #2015 (e.g. the link URI would be +https://bugs.torproject.org/2015). -adapted from recipe here_. +Adapted from recipe here_. .. _here: http://stackoverflow.com/a/2111327/13564 """

1 0