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

[bridgedb/master] Merge branch 'fix/make-config.py' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 6ccf0c7f4b421ecca5273592892ba61def71df6b Merge: bb0a743 d24f778 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 08:45:50 2014 +0000 Merge branch 'fix/make-config.py' into develop lib/bridgedb/Main.py | 126 ++++----------------------------- lib/bridgedb/configure.py | 132 +++++++++++++++++++++++++++++++++++ lib/bridgedb/persistent.py | 14 +--- lib/bridgedb/test/test_configure.py | 67 ++++++++++++++++++ 4 files changed, 214 insertions(+), 125 deletions(-)

1 0

[bridgedb/master] Fail test_smtp.py tests if we couldn't start BridgeDB process on CI servers.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 77f08d955407b9ed935ce7c766db8481587569a9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 08:03:44 2014 +0000 Fail test_smtp.py tests if we couldn't start BridgeDB process on CI servers. --- lib/bridgedb/test/test_smtp.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index 176492f..cc9e79c 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -129,6 +129,9 @@ class SMTPTests(unittest.TestCase): self.server.stop() def test_getBridges(self): + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") if not self.pid or not processExists(self.pid): raise SkipTest("Can't run test: no BridgeDB process running.") @@ -141,6 +144,9 @@ class SMTPTests(unittest.TestCase): self.server.getAndCheckMessageContains("Here are your bridges") def test_getBridges_rateLimitExceeded(self): + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") if not self.pid or not processExists(self.pid): raise SkipTest("Can't run test: no BridgeDB process running.") @@ -170,6 +176,9 @@ class SMTPTests(unittest.TestCase): '''Sends a large number of emails in a short period of time, and checks that a response is received for each message. ''' + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") if not self.pid or not processExists(self.pid): raise SkipTest("Can't run test: no BridgeDB process running.")

1 0

[bridgedb/master] Remove bridgedb.Bridges.HEX_DIGEST_LEN; it's completely unused.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 7d7ce52b48a129fda18bb8c799020ab9966c4fae Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 10 22:07:31 2014 +0000 Remove bridgedb.Bridges.HEX_DIGEST_LEN; it's completely unused. --- lib/bridgedb/Bridges.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 5b5e678..a338b40 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -37,7 +37,6 @@ except ImportError: ID_LEN = 20 -HEX_DIGEST_LEN = 40 DIGEST_LEN = 20 PORTSPEC_LEN = 16

1 0

[bridgedb/master] Add unittests for bridgedb.configure module.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit d24f778c9115c9fce54a686774211fd5f40c47ec Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 08:37:27 2014 +0000 Add unittests for bridgedb.configure module. --- lib/bridgedb/configure.py | 2 +- lib/bridgedb/test/test_configure.py | 67 +++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 6220fce..33cc458 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -93,7 +93,7 @@ def loadConfig(configFile=None, configCls=None): for attr in ["PROXY_LIST_FILES", "BRIDGE_FILES", "EXTRA_INFO_FILES"]: setting = getattr(config, attr, None) - if setting is None: + if setting is None: # pragma: no cover setattr(config, attr, []) # If they weren't set, make them lists else: setattr(config, attr, # If they were set, expand the paths: diff --git a/lib/bridgedb/test/test_configure.py b/lib/bridgedb/test/test_configure.py new file mode 100644 index 0000000..501ed1f --- /dev/null +++ b/lib/bridgedb/test/test_configure.py @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: please see the AUTHORS file for attributions +# :copyright: (c) 2013-2014, Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. +# :license: see LICENSE for licensing information + +"""Tests for :mod:`bridgedb.configure`.""" + +from __future__ import print_function + +import os + +from twisted.trial import unittest + +from bridgedb import configure + + +class ConfigureTests(unittest.TestCase): + """Tests for miscelaneous functions in :mod:`bridgedb.configure`.""" + + def setUp(self): + """Find the config file in the top directory of this repo.""" + here = os.getcwd() + topdir = here.rstrip('_trial_temp') + self.configFilename = os.path.join(topdir, 'bridgedb.conf') + + def test_loadConfig_with_file(self): + """We should be able to load and parse the standard ``bridgedb.conf`` + file from the top directory of this repository. + """ + config = configure.loadConfig(self.configFilename) + self.assertTrue(config) + + def test_loadConfig_with_file_and_class(self): + """We should be able to reload and parse the ``bridgedb.conf`` + file, if we have a config class as well. + """ + config = configure.loadConfig(self.configFilename) + newConfig = configure.loadConfig(self.configFilename, configCls=config) + self.assertTrue(newConfig) + + def test_loadConfig_with_class(self): + """We should be able to recreate a config, given its class.""" + config = configure.loadConfig(self.configFilename) + newConfig = configure.loadConfig(configCls=config) + self.assertTrue(newConfig) + + def test_loadConfig_set_EXTRA_INFO_FILES_when_None(self): + """If certain options, like the ``EXTRA_INFO_FILES`` option in the + config file weren't set, they should be made into lists so that our + parsers don't choke on them later. + """ + config = configure.loadConfig(self.configFilename) + setattr(config, "EXTRA_INFO_FILES", None) + self.assertTrue(config.EXTRA_INFO_FILES is None) + newConfig = configure.loadConfig(configCls=config) + self.assertIsInstance(newConfig.EXTRA_INFO_FILES, list) + + def test_loadConfig_returns_Conf(self): + """After loading and parsing the ``bridgedb.conf`` file, we should have + a :class:`bridgedb.configure.Conf`. + """ + config = configure.loadConfig(self.configFilename) + self.assertIsInstance(config, configure.Conf)

1 0

[bridgedb/master] Support requiring distribution of bridges with the "Running" flag.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 55f669dac35c3f86f2a24d67e0e9d899b75c73c8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 20:15:21 2014 +0000 Support requiring distribution of bridges with the "Running" flag. * CHANGE bridgedb.Bridges.BridgeRingParameters class to support using the FORCE_FLAGS config setting to require some N of bridges distributed to have the "Running" flag. --- bridgedb.conf | 8 ++++++-- lib/bridgedb/Bridges.py | 6 +----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index a1d6c59..c8c0de1 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -20,9 +20,12 @@ # # CHANGELOG: # ~~~~~~~~~~ -# Changes in version 0.0.10 - 2014-07-06 +# Changes in version 0.0.11 - 2014-07-06 # * ADD EMAIL_BLACKLIST and EMAIL_FUZZY_MATCH settings. # +# Changes in version 0.0.10 - 2014-06-06 +# * Support requiring distribution of bridges with the "Running" flag. +# # Changes in version 0.0.9 - 2014-06-06 # * ADD EMAIL_WHITELIST setting. # @@ -196,7 +199,8 @@ N_IP_CLUSTERS = 4 FORCE_PORTS = [(443, 1)] # If possible, always give a certain number of answers with a given flag. -# Only "Stable" is now supported. This is a list of (flag,minimum) tuples. +# Both "Running" and "Stable" are supported. +# This is a list of (flag,minimum) tuples. FORCE_FLAGS = [("Stable", 1)] # Only consider routers whose purpose matches this string. diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index d159b64..fa9c246 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -755,10 +755,6 @@ class BridgeRingParameters(object): """Control the creation of subrings by including a minimum number of bridges which possess certain attributes. - XXX In bridgedb.conf, there is a note on the FORCE_FLAGS setting which - reads: "Only 'stable' is now supported." Is this still the case? - Why? - :type needPorts: iterable :param needPorts: An iterable of two-tuples. Each two tuple should contain ``(port, minimum)``, where ``port`` is an integer @@ -782,7 +778,7 @@ class BridgeRingParameters(object): raise TypeError("Count %s out of range." % count) for flag, count in needFlags: flag = flag.lower() - if flag not in ["stable",]: + if flag not in ["stable", "running",]: raise TypeError("Unsupported flag %s" % flag) if count <= 0: raise TypeError("Count %s out of range." % count)

1 0

[bridgedb/master] Fix old Tests.py; networkstatus.parseALine returns a string.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit d7fd62fa581a8a6dba7213e9619561c5307e5540 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 21:35:33 2014 +0000 Fix old Tests.py; networkstatus.parseALine returns a string. * CHANGE test_regressionsNewCode_IPBridgeDistTests_testDistWithFilterIP4() and test_regressionsNewCode_IPBridgeDistTests_testDistWithFilterIP6() to convert the string returned from networkstatus.parseALine into an ipaddr.IPAddress. --- lib/bridgedb/Tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 219802b..93ee4f2 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -320,7 +320,7 @@ class IPBridgeDistTests(unittest.TestCase): bridge = random.choice(bridges) bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv6Address) address, portlist = networkstatus.parseALine(bridge_line) - assert type(address) is ipaddr.IPv6Address + assert type(ipaddr.IPAddress(address)) is ipaddr.IPv6Address assert filterBridgesByIP6(random.choice(bridges)) def testDistWithFilterIP4(self): @@ -336,7 +336,7 @@ class IPBridgeDistTests(unittest.TestCase): bridge = random.choice(bridges) bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address) address, portlist = networkstatus.parseALine(bridge_line) - assert type(address) is ipaddr.IPv4Address + assert type(ipaddr.IPAddress(address)) is ipaddr.IPv4Address assert filterBridgesByIP4(random.choice(bridges)) def testDistWithFilterBoth(self):

1 0

[bridgedb/master] Move old b.Bridges.is_valid_ip() doctest to b.p.addr.isValidIP().
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit fc07c5b64de89a63b0518864b3b8d250e1503533 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 11 00:09:08 2014 +0000 Move old b.Bridges.is_valid_ip() doctest to b.p.addr.isValidIP(). --- lib/bridgedb/parse/addr.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index ace4c80..01acf58 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -320,21 +320,6 @@ def isIPAddress(ip, compressed=True): def _isIPv(version, ip): """Check if **ip** is a certain **version** (IPv4 or IPv6). - >>> from bridgedb.parse.addr import isValidIP - >>> isValidIP('1.2.3.4') - True - >>> isValidIP('1.2.3.255') - True - >>> isValidIP('1.2.3.256') - False - >>> isValidIP('1') - False - >>> isValidIP('1.2.3') - False - >>> isValidIP('xyzzy') - False - - .. warning: Do *not* put any calls to the logging module in this function, or else an infinite recursion will occur when the call is made, due the the log :class:`~logging.Filter`s in :mod:`~bridgedb.safelog` @@ -397,6 +382,20 @@ def isValidIP(ip): * A :term:`Site-Local Address` or an :term:`Unique Local Address`. + >>> from bridgedb.parse.addr import isValidIP + >>> isValidIP('1.2.3.4') + True + >>> isValidIP('1.2.3.255') + True + >>> isValidIP('1.2.3.256') + False + >>> isValidIP('1') + False + >>> isValidIP('1.2.3') + False + >>> isValidIP('xyzzy') + False + :type ip: An :class:`ipaddr.IPAddress`, :class:`ipaddr.IPv4Address`, or :class:`ipaddr.IPv6Address`. :param ip: An ``ipaddr.IPAddress`` class.

1 0

[bridgedb/master] Change import of IBridgeRequest to IRequestBridges in test_bridgerequest.py.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 0168a79dbbe311449cc7cba0dc859c0b3e45901d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Aug 27 10:27:53 2014 +0000 Change import of IBridgeRequest to IRequestBridges in test_bridgerequest.py. --- lib/bridgedb/test/test_bridgerequest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridgerequest.py b/lib/bridgedb/test/test_bridgerequest.py index 1db8814..24dcad2 100644 --- a/lib/bridgedb/test/test_bridgerequest.py +++ b/lib/bridgedb/test/test_bridgerequest.py @@ -14,7 +14,7 @@ from twisted.trial import unittest from bridgedb import bridgerequest -from bridgedb.bridgerequest import IBridgeRequest +from bridgedb.bridgerequest import IRequestBridges from bridgedb.bridgerequest import BridgeRequestBase @@ -27,7 +27,7 @@ class BridgeRequestBaseTests(unittest.TestCase): def test_BridgeRequestBase_implements_IRequestBridges(self): """BridgeRequestBase should implement IRequestBridges interface.""" - self.assertTrue(IBridgeRequest.implementedBy(BridgeRequestBase)) + self.assertTrue(IRequestBridges.implementedBy(BridgeRequestBase)) def test_BridgeRequestBase_withoutBlockInCountry(self): """BridgeRequestBase.withoutBlockInCountry() should add the country CC

1 0

[bridgedb/master] Merge branch 'fix/12029-refactor-Bridges' into develop
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit bebe41b6081b88f3c07e9af3a896307961facd70 Merge: 6ccf0c7 d7fd62f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 28 03:19:49 2014 +0000 Merge branch 'fix/12029-refactor-Bridges' into develop bridgedb.conf | 8 +++- lib/bridgedb/Bridges.py | 52 +++++-------------------- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/bridgerequest.py | 5 ++- lib/bridgedb/interfaces.py | 19 +++++++++ lib/bridgedb/parse/addr.py | 64 ++++++++++++++++++++----------- lib/bridgedb/parse/fingerprint.py | 44 +++++++++++++++++++++ lib/bridgedb/test/deprecated.py | 33 ++++++++++++++++ lib/bridgedb/test/test_Tests.py | 6 +++ lib/bridgedb/test/test_bridgerequest.py | 4 +- 10 files changed, 167 insertions(+), 72 deletions(-)

1 0

[bridgedb/master] Add Sphinx source file for bridgedb.interfaces documentation.
by isis＠torproject.org 03 Feb '15

03 Feb '15

commit 08bce640e9359dd28defeaae474ea3927afc0353 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 28 08:45:03 2014 +0000 Add Sphinx source file for bridgedb.interfaces documentation. --- doc/sphinx/source/bridgedb.interfaces.rst | 8 ++++++++ doc/sphinx/source/bridgedb.rst | 1 + 2 files changed, 9 insertions(+) diff --git a/doc/sphinx/source/bridgedb.interfaces.rst b/doc/sphinx/source/bridgedb.interfaces.rst new file mode 100644 index 0000000..fb41f2c --- /dev/null +++ b/doc/sphinx/source/bridgedb.interfaces.rst @@ -0,0 +1,8 @@ +bridgedb.interfaces +---------------------- + +.. automodule:: bridgedb.interfaces + :members: + :undoc-members: + :private-members: + :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index 92d16bd..6da86f0 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -21,6 +21,7 @@ BridgeDB Package and Module Documentation bridgedb.email.templates bridgedb.Filters bridgedb.HTTPServer + bridgedb.interfaces bridgedb.Main bridgedb.parse bridgedb.persistent

1 0