January 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Change assertion in Tests.py to check for new class.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 849720885d7cfe40599753eddf5ba423c7f72f60 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 03:49:49 2013 +0000 Change assertion in Tests.py to check for new class. --- lib/bridgedb/Tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 1d4679a..52040e0 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -659,7 +659,7 @@ class ParseDescFileTests(unittest.TestCase): for a,p,c in bridgedb.Bridges.parseCountryBlockFile(test.split('\n')): assert type(a) in (ipaddr.IPv6Address, ipaddr.IPv4Address) - assert isinstance(p, bridgedb.Bridges.PortList) + assert isinstance(p, addr.PortList) assert isinstance(c, list) assert len(c) > 0 for y in c:

1 0

[bridgedb/master] Fix bridgedb.Tests.randomIP*() methods to return the correct IP type.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 97918ce31cbdc71399347bbc59dc848850f66be7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 03:42:54 2013 +0000 Fix bridgedb.Tests.randomIP*() methods to return the correct IP type. --- 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 90726cb..881463b 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -44,13 +44,13 @@ def randomIP(): return randomIP6() def randomIP4(): - return ipaddr.IPAddress(random.getrandbits(32)) + return ipaddr.IPv4Address(random.getrandbits(32)) def randomIP4String(): return str(ipaddr.IPAddress(random.getrandbits(32))) def randomIP6(): - return ipaddr.IPAddress(random.getrandbits(128)) + return ipaddr.IPv6Address(random.getrandbits(128)) def randomIP6String(): # as used by Tor, with enclosing []

1 0

[bridgedb/master] Fix Tests.randomIP*String() methods to enclose in brackets explicitly.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 2579092121744cf7a2fcc172e323953c5784d4d5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 03:44:14 2013 +0000 Fix Tests.randomIP*String() methods to enclose in brackets explicitly. This was causing problems for the parsers, some of which expect an IPv6 address without brackets, and others with brackets. It's easier if we're explicit about whether we're putting brackets around an address. --- lib/bridgedb/Tests.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 881463b..5c48cc4 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -47,20 +47,23 @@ def randomIP4(): return ipaddr.IPv4Address(random.getrandbits(32)) def randomIP4String(): - return str(ipaddr.IPAddress(random.getrandbits(32))) + return randomIP4().compressed def randomIP6(): return ipaddr.IPv6Address(random.getrandbits(128)) def randomIP6String(): - # as used by Tor, with enclosing [] - return "[%s]" % randomIP6() + return bracketIP6(randomIP6().compressed) def randomIPString(): - # as used by Tor, with enclosing [] for IPv6 addresses - if random.choice(xrange(2)): return randomIP4String() + if random.choice(xrange(2)): + return randomIP4String() return randomIP6String() +def bracketIP6(ip): + """Put brackets around an IPv6 address, just as tor does.""" + return "[%s]" % ip + def random16IP(): upper = "123.123." # same 16 lower = ".".join([str(random.randrange(1,256)) for _ in xrange(2)])

1 0

[bridgedb/master] Only test fakeBridges with valid IPs in Tests.py.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 5acdad9598c0e24619f212456da49463b97cac83 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 03:47:24 2013 +0000 Only test fakeBridges with valid IPs in Tests.py. The random IP address generation in these old unittests would mean that some tests would unreproducibly fail due to their fakeBridge()s using invalid IP addresses. --- lib/bridgedb/Tests.py | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 5c48cc4..1d4679a 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -31,6 +31,7 @@ from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.Stability import BridgeHistory +from bridgedb.parse import addr from bridgedb.parse import networkstatus from math import log @@ -112,16 +113,24 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) + oraddrs = [] if or_addresses: for i in xrange(8): - address,portlist = networkstatus.parseALine( - "%s:%s" % (randomIPString(), randomPortSpec())) - try: - portlist.add(b.or_addresses[address]) - except KeyError: - pass - finally: - b.or_addresses[address] = portlist + # Only add or_addresses if they are valid. Otherwise, the test + # will randomly fail if an invalid address is chosen: + address = randomIP4String() + portlist = addr.PortList(randomPortSpec()) + if addr.isValidIP(address): + oraddrs.append((address, portlist,)) + + for address, portlist in oraddrs: + networkstatus.parseALine("{0}:{1}".format(address, portlist)) + try: + portlist.add(b.or_addresses[address]) + except KeyError: + pass + finally: + b.or_addresses[address] = portlist if transports: for i in xrange(0,8): @@ -138,13 +147,25 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) + oraddrs = [] if or_addresses: - for i in xrange(0,8): - address, portlist = networkstatus.parseALine("a %s:%s" % ( - randomIPString(), randomPortSpec())) - - self.assertIsNotNone(address, "fakeBridge6(): Got null address!") - self.assertIsNotNone(address, "fakeBridge6(): Got null portlist!") + for i in xrange(8): + # Only add or_addresses if they are valid. Otherwise, the test + # will randomly fail if an invalid address is chosen: + address = randomIP6() + portlist = addr.PortList(randomPortSpec()) + if addr.isValidIP(address): + address = bracketIP6(address) + oraddrs.append((address, portlist,)) + + for address, portlist in oraddrs: + networkstatus.parseALine("{0}:{1}".format(address, portlist)) + try: + portlist.add(b.or_addresses[address]) + except KeyError: + pass + finally: + b.or_addresses[address] = portlist try: portlist.add(b.or_addresses[address])

1 0

[bridgedb/master] The logging module in py2.6 doesn't have logging.warnings.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 7981f9c2c33cb4eeaf9a866d3d287c079ed11e19 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 06:11:09 2013 +0000 The logging module in py2.6 doesn't have logging.warnings. --- lib/bridgedb/test/test_Tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index 514e90c..4cd834f 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -29,7 +29,7 @@ from bridgedb import Tests from bridgedb.test import deprecated -logging.warnings.filterwarnings('ignore', module="Tests") +warnings.filterwarnings('ignore', module="bridgedb\.Tests") pyunit = __import__('unittest')

1 0

[bridgedb/master] Add Sphinx param docs for bridgedb.Bridges.is_valid_ip().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 5703944d575abd23ab389260de0b5954569a3dbf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 06:59:02 2013 +0000 Add Sphinx param docs for bridgedb.Bridges.is_valid_ip(). --- lib/bridgedb/Bridges.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 44cb787..01de8b7 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -48,6 +48,8 @@ def is_valid_ip(ip): False >>> Bridges.is_valid_ip('xyzzy') False + + :param str ip: A string representing an IPv4 or IPv6 address. """ # ipaddr does not treat "1.2" as a synonym for "0.0.1.2"

1 0

[bridgedb/master] Decrease the noisyness of bridgedb.test.fileCheckDecorator().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 685f125c8f1d122a092225dab56570cf688a2058 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 06:10:19 2013 +0000 Decrease the noisyness of bridgedb.test.fileCheckDecorator(). --- lib/bridgedb/test/util.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 65abd28..a09c0d1 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -47,15 +47,13 @@ def fileCheckDecorator(func): """ @wraps(func) def wrapper(self, src, dst, description): - print("Copying %s:\n %r\n\t\t↓ ↓ ↓\n %r\n" - % (str(description), src, dst)) self.assertTrue(os.path.isfile(src), "Couldn't find original %s file: %r" % (str(description), src)) func(self, src, dst, description) self.assertTrue(os.path.isfile(dst), - "Couldn't find new %s file: %r" - % (str(description), dst)) + "Couldn't find new %s file: %r. Original: %r" + % (str(description), dst, src)) return wrapper if __name__ == "__main__":

1 0

[bridgedb/master] Fix doctest context in bridgedb.Bridges.is_valid_ip().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 6ba48b9a02f6e3dc1d3724ee01e51a19a3853e5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 06:58:33 2013 +0000 Fix doctest context in bridgedb.Bridges.is_valid_ip(). --- lib/bridgedb/Bridges.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 177173c..44cb787 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -35,17 +35,18 @@ def is_valid_ip(ip): """Return True if ip is the string encoding of a valid IPv4 address, and False otherwise. - >>> is_valid_ip('1.2.3.4') + >>> from bridgedb import Bridges + >>> Bridges.is_valid_ip('1.2.3.4') True - >>> is_valid_ip('1.2.3.255') + >>> Bridges.is_valid_ip('1.2.3.255') True - >>> is_valid_ip('1.2.3.256') + >>> Bridges.is_valid_ip('1.2.3.256') False - >>> is_valid_ip('1') + >>> Bridges.is_valid_ip('1') False - >>> is_valid_ip('1.2.3') + >>> Bridges.is_valid_ip('1.2.3') False - >>> is_valid_ip('xyzzy') + >>> Bridges.is_valid_ip('xyzzy') False """

1 0

[bridgedb/master] Add Sphinx param docs for bridgedb.Dist.uniformMap().
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 4dc4c37b533677b16f5614318b9bd5cad87607bc Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 07:00:19 2013 +0000 Add Sphinx param docs for bridgedb.Dist.uniformMap(). --- lib/bridgedb/Dist.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 706873f..5fc8094 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -22,11 +22,13 @@ from bridgedb.Filters import filterBridgesByIP6 def uniformMap(ip): """Map an IP to an arbitrary 'area' string, such that any two /24 addresses - get the same string. + get the same string. >>> from bridgedb import Dist >>> Dist.uniformMap('1.2.3.4') '1.2.3' + + :param str ip: A string representing an IPv4 or IPv6 address. """ if type(IPAddress(ip)) is IPv6Address: return ":".join(IPv6Address(ip).exploded.split(':')[:4])

1 0

[bridgedb/master] Fix docstring context for bridgedb.Time.IntervalSchedule.
by isis＠torproject.org 12 Jan '14

12 Jan '14

commit 33e471ad027fd303c1adfc85e40922aeb9feca46 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 20 07:01:18 2013 +0000 Fix docstring context for bridgedb.Time.IntervalSchedule. --- lib/bridgedb/Time.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/Time.py b/lib/bridgedb/Time.py index 8d7c65a..57ba69f 100644 --- a/lib/bridgedb/Time.py +++ b/lib/bridgedb/Time.py @@ -68,6 +68,8 @@ class IntervalSchedule(Schedule): """Return a string representing the interval that contains the time 'when'. + >>> import calendar + >>> from bridgedb.Time import IntervalSchedule >>> t = calendar.timegm((2007, 12, 12, 0, 0, 0)) >>> I = IntervalSchedule('month', 1) >>> I.getInterval(t)

1 0