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

[bridgedb/develop] Add unittests for bridges.BridgeAddressBase class.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 36c66b1418fb046201dd221439f924793386a412 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:41:54 2014 +0000 Add unittests for bridges.BridgeAddressBase class. --- lib/bridgedb/test/test_bridges.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 649bca3..23ee70b 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -417,6 +417,41 @@ class FlagsTests(unittest.TestCase): self.assertTrue(self.flags.stable) +class BridgeAddressBaseTests(unittest.TestCase): + """Tests for :class:`bridgedb.bridges.BridgeAddressBase`.""" + + def setUp(self): + self.fingerprint = '2C3225C4805331025E211F4B6E5BF45C333FDD2C' + self.bab = bridges.BridgeAddressBase() + + def test_BridgeAddressBase_init(self): + """The BridgeAddressBase's _address and _fingerprint should be None.""" + self.assertIsNone(self.bab._address) + self.assertIsNone(self.bab._fingerprint) + + def test_BridgeAddressBase_fingerprint_del(self): + """The del method for the fingerprint property should reset the + fingerprint to None. + """ + self.bab.fingerprint = self.fingerprint + self.assertEqual(self.bab.fingerprint, self.fingerprint) + + del(self.bab.fingerprint) + self.assertIsNone(self.bab.fingerprint) + self.assertIsNone(self.bab._fingerprint) + + def test_BridgeAddressBase_address_del(self): + """The del method for the address property should reset the + address to None. + """ + self.bab.address = '11.12.13.14' + self.assertEqual(self.bab.address, ipaddr.IPv4Address('11.12.13.14')) + + del(self.bab.address) + self.assertIsNone(self.bab.address) + self.assertIsNone(self.bab._address) + + class PluggableTransportTests(unittest.TestCase): """Tests for :class:`bridgedb.bridges.PluggableTransport."""

1 0

[bridgedb/develop] Add unittest for del() of bridges.PluggableTransport.port property.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 868b6e62fe791ad01fab511107646ebf25342700 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:42:17 2014 +0000 Add unittest for del() of bridges.PluggableTransport.port property. --- lib/bridgedb/test/test_bridges.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 23ee70b..794351f 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -470,6 +470,18 @@ class PluggableTransportTests(unittest.TestCase): pt = bridges.PluggableTransport() self.assertIsInstance(pt, bridges.PluggableTransport) + def test_PluggableTransport_port_del(self): + """The del method for the port property should reset the port to None. + """ + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + {'sharedsecret': 'foobar'}) + self.assertEqual(pt.port, 443) + + del(pt.port) + self.assertIsNone(pt.port) + self.assertIsNone(pt._port) + def test_PluggableTransport_parseArgumentsIntoDict_valid_list(self): """Parsing a valid list of PT args should return a dictionary.""" pt = bridges.PluggableTransport()

1 0

[bridgedb/develop] Add unittest for PluggableTransport.getTransportLine() with IPv6 address.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit f78bea9e46270afa5a603c061ffa76238d83c2f9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:43:16 2014 +0000 Add unittest for PluggableTransport.getTransportLine() with IPv6 address. --- lib/bridgedb/test/test_bridges.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 794351f..c481578 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -627,6 +627,18 @@ class PluggableTransportTests(unittest.TestCase): ("password=unicorns sharedsecret=foobar" in bridgeLine) or ("sharedsecret=foobar password=unicorns" in bridgeLine)) + def test_PluggableTransport_getTransportLine_IPv6(self): + """The address portion of a bridge line with an IPv6 address should + have square brackets around it. + """ + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "2006:42::1234", 443, + {'sharedsecret': 'foobar', + 'password': 'unicorns'}) + bridgeLine = pt.getTransportLine() + self.assertEqual(pt.address.version, 6) + self.assertIn("[2006:42::1234]:443", bridgeLine) + class BridgeBackwardsCompatibilityTests(unittest.TestCase): """Tests for :class:`bridgedb.bridges.BridgeBackwardsCompatibility`."""

1 0

[bridgedb/develop] Change test_bridges.py unittest to also check bridgeline != None.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 227371b8668f3331df73379403a548846c4755e9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:39:45 2014 +0000 Change test_bridges.py unittest to also check bridgeline != None. --- lib/bridgedb/test/test_bridges.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 8328e16..86b60bf 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -265,6 +265,7 @@ class BridgeIntegrationTests(unittest.TestCase): id_digest=self.id_digest, or_addresses=self.or_addresses) bridgeLine = bridge.getConfigLine(includeFingerprint=True) + self.assertIsNotNone(bridgeLine) self.assertSubstring(self.fingerprint, bridgeLine) ip = bridgeLine.split(':')[0] self.assertTrue(ipaddr.IPAddress(ip))

1 0

[bridgedb/develop] Move bridgedb.Tests → bridgedb.test.legacy_Tests.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit e6ebfaa1c70f89bee6b5c6f59ab457bc97217b88 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:20:55 2014 +0000 Move bridgedb.Tests → bridgedb.test.legacy_Tests. * MOVE bridgedb.Tests to bridgedb.test.legacy_Tests. * CHANGE bridgedb.test.test_Tests to import the moved module. --- lib/bridgedb/Tests.py | 780 ------------------------------------ lib/bridgedb/test/legacy_Tests.py | 785 +++++++++++++++++++++++++++++++++++++ lib/bridgedb/test/test_Tests.py | 9 +- 3 files changed, 790 insertions(+), 784 deletions(-) diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py deleted file mode 100644 index 93ee4f2..0000000 --- a/lib/bridgedb/Tests.py +++ /dev/null @@ -1,780 +0,0 @@ -# BridgeDB by Nick Mathewson. -# Copyright (c) 2007-2009, The Tor Project, Inc. -# See LICENSE for licensing information - -from __future__ import print_function - -import doctest -import os -import random -import sqlite3 -import tempfile -import unittest -import warnings -import time -from datetime import datetime - -import bridgedb.Bridges -import bridgedb.Main -import bridgedb.Dist -import bridgedb.schedule -import bridgedb.Storage -import re -import ipaddr - -from bridgedb.Filters import filterBridgesByIP4 -from bridgedb.Filters import filterBridgesByIP6 -from bridgedb.Filters import filterBridgesByOnlyIP4 -from bridgedb.Filters import filterBridgesByOnlyIP6 -from bridgedb.Filters import filterBridgesByTransport -from bridgedb.Filters import filterBridgesByNotBlockedIn - -from bridgedb.Stability import BridgeHistory - -from bridgedb.parse import addr -from bridgedb.parse import networkstatus - -from math import log - -def suppressWarnings(): - warnings.filterwarnings('ignore', '.*tmpnam.*') - -def randomIP(): - if random.choice(xrange(2)): - return randomIP4() - return randomIP6() - -def randomIP4(): - return ipaddr.IPv4Address(random.getrandbits(32)) - -def randomIP4String(): - return randomIP4().compressed - -def randomIP6(): - return ipaddr.IPv6Address(random.getrandbits(128)) - -def randomIP6String(): - return bracketIP6(randomIP6().compressed) - -def randomIPString(): - 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)]) - return upper+lower - -def randomPort(): - return random.randint(1,65535) - -def randomPortSpec(): - """ - returns a random list of ports - """ - ports = [] - for i in range(0,24): - ports.append(random.randint(1,65535)) - ports.sort(reverse=True) - - portspec = "" - for i in range(0,16): - portspec += "%d," % random.choice(ports) - portspec = portspec.rstrip(',') #remove trailing , - return portspec - -def randomCountry(): - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - #XXX: load from geoip - return random.choice(countries) - -def randomCountrySpec(): - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - #XXX: load from geoip - spec = "" - choices = [] - for i in xrange(10): - choices.append(random.choice(countries)) - choices = set(choices) #dedupe - choices = list(choices) - spec += ",".join(choices) - return spec - -def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, - transports=False): - nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP4()) - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) - b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) - b.setStatus(running, stable) - - oraddrs = [] - if or_addresses: - 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 = 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): - b.transports.append(bridgedb.Bridges.PluggableTransport(b, - random.choice(["obfs", "obfs2", "pt1"]), - randomIP(), randomPort())) - return b - -def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, - transports=False): - nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP6()) - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) - b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) - b.setStatus(running, stable) - - oraddrs = [] - if or_addresses: - 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]) - except KeyError: - pass - finally: - b.or_addresses[address] = portlist - - if transports: - for i in xrange(0,8): - b.transports.append(bridgedb.Bridges.PluggableTransport(b, - random.choice(["obfs", "obfs2", "pt1"]), - randomIP(), randomPort())) - - return b - -def fake16Bridge(orport=8080, running=True, stable=True): - nn = "bridge-%s"%random.randrange(0,1000000) - ip = random16IP() - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) - b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) - b.setStatus(running, stable) - return b - -simpleDesc = "router Unnamed %s %s 0 9030\n"\ -"opt fingerprint DEAD BEEF F00F DEAD BEEF F00F DEAD BEEF F00F DEAD\n"\ -"opt @purpose bridge\n" -orAddress = "or-address %s:%s\n" -def gettimestamp(): - ts = time.strftime("%Y-%m-%d %H:%M:%S") - return "opt published %s\n" % ts - -class RhymesWith255Category: - def contains(self, ip): - return ip.endswith(".255") - -class EmailBridgeDistTests(unittest.TestCase): - def setUp(self): - self.fd, self.fname = tempfile.mkstemp() - self.db = bridgedb.Storage.Database(self.fname) - bridgedb.Storage.setDB(self.db) - self.cur = self.db._conn.cursor() - - def tearDown(self): - self.db.close() - os.close(self.fd) - os.unlink(self.fname) - - def testEmailRateLimit(self): - db = self.db - EMAIL_DOMAIN_MAP = {'example.com':'example.com'} - d = bridgedb.Dist.EmailBasedDistributor( - "Foo", - {'example.com': 'example.com', - 'dkim.example.com': 'dkim.example.com'}, - {'example.com': [], 'dkim.example.com': ['dkim']}) - for _ in xrange(256): - d.insert(fakeBridge()) - d.getBridgesForEmail('abc(a)example.com', 1, 3) - self.assertRaises(bridgedb.Dist.TooSoonEmail, - d.getBridgesForEmail, 'abc(a)example.com', 1, 3) - self.assertRaises(bridgedb.Dist.IgnoreEmail, - d.getBridgesForEmail, 'abc(a)example.com', 1, 3) - - def testUnsupportedDomain(self): - db = self.db - self.assertRaises(bridgedb.parse.addr.UnsupportedDomain, - bridgedb.parse.addr.normalizeEmail, - 'bad(a)email.com', - {'example.com':'example.com'}, - {'example.com':[]}) - -class IPBridgeDistTests(unittest.TestCase): - def dumbAreaMapper(self, ip): - return ip - def testBasicDist(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(256): - d.insert(fakeBridge()) - n = d.getBridgesForIP("1.2.3.4", "x", 2) - n2 = d.getBridgesForIP("1.2.3.4", "x", 2) - self.assertEquals(n, n2) - - def testDistWithCategories(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo", - [RhymesWith255Category()]) - assert len(d.categories) == 1 - for _ in xrange(256): - d.insert(fakeBridge()) - - for _ in xrange(256): - # Make sure that the categories do not overlap - f = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(4)]) - g = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(3)] + ['255']) - n = d.getBridgesForIP(g(), "x", 10) - n2 = d.getBridgesForIP(f(), "x", 10) - - assert(len(n) > 0) - assert(len(n2) > 0) - - for b in n: - assert (b not in n2) - - for b in n2: - assert (b not in n) - - #XXX: #6175 breaks this test! - #def testDistWithPortRestrictions(self): - # param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) - # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Baz", - # answerParameters=param) - # for _ in xrange(32): - # d.insert(fakeBridge(443)) - # for _ in range(256): - # d.insert(fakeBridge()) - # for _ in xrange(32): - # i = randomIP() - # n = d.getBridgesForIP(i, "x", 5) - # count = 0 - # fps = {} - # for b in n: - # fps[b.getID()] = 1 - # if b.orport == 443: - # count += 1 - # self.assertEquals(len(fps), len(n)) - # self.assertEquals(len(fps), 5) - # self.assertTrue(count >= 1) - - #def testDistWithFilter16(self): - # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - # for _ in xrange(256): - # d.insert(fake16Bridge()) - # n = d.getBridgesForIP("1.2.3.4", "x", 10) - - # slash16s = dict() - # for bridge in n: - # m = re.match(r'(\d+\.\d+)\.\d+\.\d+', bridge.ip) - # upper16 = m.group(1) - # self.assertTrue(upper16 not in slash16s) - # slash16s[upper16] = True - - def testDistWithFilterIP6(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for i in xrange(500): - bridges = d.getBridgesForIP(randomIP4String(), - "faketimestamp", - bridgeFilterRules=[filterBridgesByIP6]) - bridge = random.choice(bridges) - bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv6Address) - address, portlist = networkstatus.parseALine(bridge_line) - assert type(ipaddr.IPAddress(address)) is ipaddr.IPv6Address - assert filterBridgesByIP6(random.choice(bridges)) - - def testDistWithFilterIP4(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for i in xrange(500): - bridges = d.getBridgesForIP(randomIP4String(), - "faketimestamp", - bridgeFilterRules=[filterBridgesByIP4]) - bridge = random.choice(bridges) - bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address) - address, portlist = networkstatus.parseALine(bridge_line) - assert type(ipaddr.IPAddress(address)) is ipaddr.IPv4Address - assert filterBridgesByIP4(random.choice(bridges)) - - def testDistWithFilterBoth(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for i in xrange(50): - bridges = d.getBridgesForIP(randomIP4String(), - "faketimestamp", 1, - bridgeFilterRules=[ - filterBridgesByIP4, - filterBridgesByIP6]) - if bridges: - t = bridges.pop() - assert filterBridgesByIP4(t) - assert filterBridgesByIP6(t) - address, portlist = networkstatus.parseALine( - t.getConfigLine(addressClass=ipaddr.IPv4Address)) - assert type(address) is ipaddr.IPv4Address - address, portlist = networkstatus.parseALine( - t.getConfigLine(addressClass=ipaddr.IPv6Address)) - assert type(address) is ipaddr.IPv6Address - - - def testDistWithFilterAll(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for i in xrange(5): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ - filterBridgesByOnlyIP4, filterBridgesByOnlyIP6]) - assert len(b) == 0 - - def testDistWithFilterBlockedCountries(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True)) - d.insert(fakeBridge(or_addresses=True)) - - for b in d.splitter.bridges: - # china blocks all :-( - for pt in b.transports: - key = "%s:%s" % (pt.address, pt.port) - b.blockingCountries[key] = set(['cn']) - for address, portlist in b.or_addresses.items(): - for port in portlist: - key = "%s:%s" % (address, port) - b.blockingCountries[key] = set(['cn']) - key = "%s:%s" % (b.ip, b.orport) - b.blockingCountries[key] = set(['cn']) - - for i in xrange(5): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ - filterBridgesByNotBlockedIn("cn")]) - assert len(b) == 0 - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ - filterBridgesByNotBlockedIn("us")]) - assert len(b) > 0 - - def testDistWithFilterBlockedCountriesAdvanced(self): - d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - for _ in xrange(250): - d.insert(fakeBridge6(or_addresses=True, transports=True)) - d.insert(fakeBridge(or_addresses=True, transports=True)) - - for b in d.splitter.bridges: - # china blocks some transports - for pt in b.transports: - if random.choice(xrange(2)) > 0: - key = "%s:%s" % (pt.address, pt.port) - b.blockingCountries[key] = set(['cn']) - for address, portlist in b.or_addresses.items(): - # china blocks some transports - for port in portlist: - if random.choice(xrange(2)) > 0: - key = "%s:%s" % (address, port) - b.blockingCountries[key] = set(['cn']) - key = "%s:%s" % (b.ip, b.orport) - b.blockingCountries[key] = set(['cn']) - - # we probably will get at least one bridge back! - # it's pretty unlikely to lose a coin flip 250 times in a row - for i in xrange(5): - b = d.getBridgesForIP(randomIPString(), "x", 1, - bridgeFilterRules=[ - filterBridgesByNotBlockedIn("cn", methodname='obfs2'), - filterBridgesByTransport('obfs2'), - ]) - try: assert len(b) > 0 - except AssertionError: - print("epic fail") - b = d.getBridgesForIP(randomIPString(), "x", 1, bridgeFilterRules=[ - filterBridgesByNotBlockedIn("us")]) - assert len(b) > 0 - - -class SQLStorageTests(unittest.TestCase): - def setUp(self): - self.fd, self.fname = tempfile.mkstemp() - self.db = bridgedb.Storage.Database(self.fname) - self.cur = self.db._conn.cursor() - - def tearDown(self): - self.db.close() - os.close(self.fd) - os.unlink(self.fname) - - def assertCloseTo(self, a, b, delta=60): - self.assertTrue(abs(a-b) <= delta) - - def testBridgeStorage(self): - db = self.db - B = bridgedb.Bridges.Bridge - t = time.time() - cur = self.cur - - k1 = "aaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb" - k2 = "abababababababababababababababababababab" - k3 = "cccccccccccccccccccccccccccccccccccccccc" - b1 = B("serv1", "1.2.3.4", 999, fingerprint=k1) - b1_v2 = B("serv1", "1.2.3.5", 9099, fingerprint=k1) - b2 = B("serv2", "2.3.4.5", 9990, fingerprint=k2) - b3 = B("serv3", "2.3.4.6", 9008, fingerprint=k3) - validRings = ["ring1", "ring2", "ring3"] - - r = db.insertBridgeAndGetRing(b1, "ring1", t, validRings) - self.assertEquals(r, "ring1") - r = db.insertBridgeAndGetRing(b1, "ring10", t+500, validRings) - self.assertEquals(r, "ring1") - - cur.execute("SELECT distributor, address, or_port, first_seen, " - "last_seen FROM Bridges WHERE hex_key = ?", (k1,)) - v = cur.fetchone() - self.assertEquals(v, - ("ring1", "1.2.3.4", 999, - bridgedb.Storage.timeToStr(t), - bridgedb.Storage.timeToStr(t+500))) - - r = db.insertBridgeAndGetRing(b1_v2, "ring99", t+800, validRings) - self.assertEquals(r, "ring1") - cur.execute("SELECT distributor, address, or_port, first_seen, " - "last_seen FROM Bridges WHERE hex_key = ?", (k1,)) - v = cur.fetchone() - self.assertEquals(v, - ("ring1", "1.2.3.5", 9099, - bridgedb.Storage.timeToStr(t), - bridgedb.Storage.timeToStr(t+800))) - - db.insertBridgeAndGetRing(b2, "ring2", t, validRings) - db.insertBridgeAndGetRing(b3, "ring3", t, validRings) - - cur.execute("SELECT COUNT(distributor) FROM Bridges") - v = cur.fetchone() - self.assertEquals(v, (3,)) - - r = db.getEmailTime("abc(a)example.com") - self.assertEquals(r, None) - db.setEmailTime("abc(a)example.com", t) - db.setEmailTime("def(a)example.com", t+1000) - r = db.getEmailTime("abc(a)example.com") - self.assertCloseTo(r, t) - r = db.getEmailTime("def(a)example.com") - self.assertCloseTo(r, t+1000) - r = db.getEmailTime("ghi(a)example.com") - self.assertEquals(r, None) - - db.cleanEmailedBridges(t+200) - db.setEmailTime("def(a)example.com", t+5000) - r = db.getEmailTime("abc(a)example.com") - self.assertEquals(r, None) - r = db.getEmailTime("def(a)example.com") - self.assertCloseTo(r, t+5000) - cur.execute("SELECT * FROM EmailedBridges") - self.assertEquals(len(cur.fetchall()), 1) - - db.addBridgeBlock(b2.fingerprint, 'us') - self.assertEquals(db.isBlocked(b2.fingerprint, 'us'), True) - db.delBridgeBlock(b2.fingerprint, 'us') - self.assertEquals(db.isBlocked(b2.fingerprint, 'us'), False) - db.addBridgeBlock(b2.fingerprint, 'uk') - db.addBridgeBlock(b3.fingerprint, 'uk') - self.assertEquals(set([b2.fingerprint, b3.fingerprint]), - set(db.getBlockedBridges('uk'))) - - db.addBridgeBlock(b2.fingerprint, 'cn') - db.addBridgeBlock(b2.fingerprint, 'de') - db.addBridgeBlock(b2.fingerprint, 'jp') - db.addBridgeBlock(b2.fingerprint, 'se') - db.addBridgeBlock(b2.fingerprint, 'kr') - - self.assertEquals(set(db.getBlockingCountries(b2.fingerprint)), - set(['uk', 'cn', 'de', 'jp', 'se', 'kr'])) - self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) - db.setWarnedEmail("def(a)example.com") - self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) - db.setWarnedEmail("def(a)example.com", False) - self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) - - db.setWarnedEmail("def(a)example.com") - self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) - db.cleanWarnedEmails(t+200) - self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) - -class ParseDescFileTests(unittest.TestCase): - def testSimpleDesc(self): - test = "" - - for i in range(100): - test+= "".join(simpleDesc % (randomIP(), randomPort())) - test+=gettimestamp() - test+="router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testSingleOrAddress(self): - test = "" - - for i in range(100): - test+= simpleDesc % (randomIP(), randomPort()) - test+= orAddress % (randomIP(),randomPort()) - test+=gettimestamp() - test+= "router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testMultipleOrAddress(self): - test = "" - for i in range(100): - test+= simpleDesc % (randomIPString(), randomPort()) - for i in xrange(8): - test+= orAddress % (randomIPString(),randomPortSpec()) - test+=gettimestamp() - test+= "router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testConvolutedOrAddress(self): - test = "" - for i in range(100): - test+= simpleDesc % (randomIPString(), randomPort()) - for i in xrange(8): - test+= orAddress % (randomIPString(),randomPortSpec()) - test+=gettimestamp() - test+= "router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testParseCountryBlockFile(self): - simpleBlock = "%s:%s %s\n" - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - test = str() - for i in range(100): - test += simpleBlock % (randomIPString(), randomPort(), - randomCountrySpec()) - test+=gettimestamp() - - for a,p,c in bridgedb.Bridges.parseCountryBlockFile(test.split('\n')): - assert type(a) in (ipaddr.IPv6Address, ipaddr.IPv4Address) - assert isinstance(p, addr.PortList) - assert isinstance(c, list) - assert len(c) > 0 - for y in c: - assert y in countries - #print "address: %s" % a - #print "portlist: %s" % p - #print "countries: %s" % c - -class BridgeStabilityTests(unittest.TestCase): - def setUp(self): - self.fd, self.fname = tempfile.mkstemp() - self.db = bridgedb.Storage.Database(self.fname) - bridgedb.Storage.setDB(self.db) - self.cur = self.db._conn.cursor() - - def tearDown(self): - self.db.close() - os.close(self.fd) - os.unlink(self.fname) - - def testAddOrUpdateSingleBridgeHistory(self): - db = self.db - b = fakeBridge() - timestamp = time.time() - bhe = bridgedb.Stability.addOrUpdateBridgeHistory(b, timestamp) - assert isinstance(bhe, BridgeHistory) - assert isinstance(db.getBridgeHistory(b.fingerprint), BridgeHistory) - assert len([y for y in db.getAllBridgeHistory()]) == 1 - - def testDeletingSingleBridgeHistory(self): - db = self.db - b = fakeBridge() - timestamp = time.time() - bhe = bridgedb.Stability.addOrUpdateBridgeHistory(b, timestamp) - assert isinstance(bhe, BridgeHistory) - assert isinstance(db.getBridgeHistory(b.fingerprint), BridgeHistory) - db.delBridgeHistory(b.fingerprint) - assert db.getBridgeHistory(b.fingerprint) is None - assert len([y for y in db.getAllBridgeHistory()]) == 0 - - def testTOSA(self): - db = self.db - b = random.choice([fakeBridge,fakeBridge6])() - def timestampSeries(x): - for i in xrange(61): - yield (i+1)*60*30 + x # 30 minute intervals - now = time.time() - time_on_address = long(60*30*60) # 30 hours - downtime = 60*60*random.randint(0,4) # random hours of downtime - - for t in timestampSeries(now): - bridgedb.Stability.addOrUpdateBridgeHistory(b,t) - assert db.getBridgeHistory(b.fingerprint).tosa == time_on_address - - b.orport += 1 - - for t in timestampSeries(now + time_on_address + downtime): - bhe = bridgedb.Stability.addOrUpdateBridgeHistory(b,t) - assert db.getBridgeHistory(b.fingerprint).tosa == time_on_address + downtime - - def testLastSeenWithDifferentAddressAndPort(self): - db = self.db - for i in xrange(10): - num_desc = 30 - time_start = time.time() - ts = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] - b = random.choice([fakeBridge(), fakeBridge6()]) - [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] - - # change the port - b.orport = b.orport+1 - last_seen = ts[-1] - ts = [ 60*30*(i+1) + last_seen for i in xrange(num_desc) ] - [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] - b = db.getBridgeHistory(b.fingerprint) - assert b.tosa == ts[-1] - last_seen - assert (long(last_seen*1000) == b.lastSeenWithDifferentAddressAndPort) - assert (long(ts[-1]*1000) == b.lastSeenWithThisAddressAndPort) - - def testFamiliar(self): - # create some bridges - # XXX: slow - num_bridges = 10 - num_desc = 4*48 # 30m intervals, 48 per day - time_start = time.time() - bridges = [ fakeBridge() for x in xrange(num_bridges) ] - t = time.time() - ts = [ (i+1)*60*30+t for i in xrange(num_bridges) ] - for b in bridges: - time_series = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] - [ bridgedb.Stability.addOrUpdateBridgeHistory(b, i) for i in time_series ] - assert None not in bridges - # +1 to avoid rounding errors - assert bridges[-(num_bridges/8 + 1)].familiar == True - - def testDiscountAndPruneBridgeHistory(self): - """ Test pruning of old Bridge History """ - if os.environ.get('TRAVIS'): - self.skipTest("Hangs on Travis-CI.") - - db = self.db - - # make a bunch of bridges - num_bridges = 20 - time_start = time.time() - bridges = [random.choice([fakeBridge, fakeBridge6])() - for i in xrange(num_bridges)] - - # run some of the bridges for the full time series - running = bridges[:num_bridges/2] - # and some that are not - expired = bridges[num_bridges/2:] - - for b in running: assert b not in expired - - # Solving: - # 1 discount event per 12 hours, 24 descriptors 30m apart - num_successful = random.randint(2,60) - # figure out how many intervals it will take for weightedUptime to - # decay to < 1 - num_desc = int(30*log(1/float(num_successful*30*60))/(-0.05)) - timeseries = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] - - for i in timeseries: - for b in running: - bridgedb.Stability.addOrUpdateBridgeHistory(b, i) - - if num_successful > 0: - for b in expired: - bridgedb.Stability.addOrUpdateBridgeHistory(b, i) - num_successful -= 1 - - # now we expect to see the bridge has been removed from history - for bridge in expired: - b = db.getBridgeHistory(bridge.fingerprint) - assert b is None - # and make sure none of the others have - for bridge in running: - b = db.getBridgeHistory(bridge.fingerprint) - assert b is not None - -def testSuite(): - suite = unittest.TestSuite() - loader = unittest.TestLoader() - - for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, - ParseDescFileTests, BridgeStabilityTests]: - suite.addTest(loader.loadTestsFromTestCase(klass)) - - for module in [ bridgedb.Bridges, - bridgedb.Main, - bridgedb.Dist, - bridgedb.schedule ]: - suite.addTest(doctest.DocTestSuite(module)) - - return suite - -def main(): - suppressWarnings() - - unittest.TextTestRunner(verbosity=1).run(testSuite()) - diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py new file mode 100644 index 0000000..fa7a13c --- /dev/null +++ b/lib/bridgedb/test/legacy_Tests.py @@ -0,0 +1,785 @@ +# BridgeDB by Nick Mathewson. +# Copyright (c) 2007-2009, The Tor Project, Inc. +# See LICENSE for licensing information + +"""These are legacy integration and unittests which historically lived at +``lib/bridgedb/Tests.py``. They have been moved here to keep the test code +separate from the production codebase. +""" + +from __future__ import print_function + +import doctest +import os +import random +import sqlite3 +import tempfile +import unittest +import warnings +import time +from datetime import datetime + +import bridgedb.Bridges +import bridgedb.Main +import bridgedb.Dist +import bridgedb.schedule +import bridgedb.Storage +import re +import ipaddr + +from bridgedb.Filters import filterBridgesByIP4 +from bridgedb.Filters import filterBridgesByIP6 +from bridgedb.Filters import filterBridgesByOnlyIP4 +from bridgedb.Filters import filterBridgesByOnlyIP6 +from bridgedb.Filters import filterBridgesByTransport +from bridgedb.Filters import filterBridgesByNotBlockedIn + +from bridgedb.Stability import BridgeHistory + +from bridgedb.parse import addr +from bridgedb.parse import networkstatus + +from math import log + +def suppressWarnings(): + warnings.filterwarnings('ignore', '.*tmpnam.*') + +def randomIP(): + if random.choice(xrange(2)): + return randomIP4() + return randomIP6() + +def randomIP4(): + return ipaddr.IPv4Address(random.getrandbits(32)) + +def randomIP4String(): + return randomIP4().compressed + +def randomIP6(): + return ipaddr.IPv6Address(random.getrandbits(128)) + +def randomIP6String(): + return bracketIP6(randomIP6().compressed) + +def randomIPString(): + 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)]) + return upper+lower + +def randomPort(): + return random.randint(1,65535) + +def randomPortSpec(): + """ + returns a random list of ports + """ + ports = [] + for i in range(0,24): + ports.append(random.randint(1,65535)) + ports.sort(reverse=True) + + portspec = "" + for i in range(0,16): + portspec += "%d," % random.choice(ports) + portspec = portspec.rstrip(',') #remove trailing , + return portspec + +def randomCountry(): + countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] + #XXX: load from geoip + return random.choice(countries) + +def randomCountrySpec(): + countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] + #XXX: load from geoip + spec = "" + choices = [] + for i in xrange(10): + choices.append(random.choice(countries)) + choices = set(choices) #dedupe + choices = list(choices) + spec += ",".join(choices) + return spec + +def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, + transports=False): + nn = "bridge-%s"%random.randrange(0,1000000) + ip = ipaddr.IPAddress(randomIP4()) + fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) + b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) + b.setStatus(running, stable) + + oraddrs = [] + if or_addresses: + 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 = 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): + b.transports.append(bridgedb.Bridges.PluggableTransport(b, + random.choice(["obfs", "obfs2", "pt1"]), + randomIP(), randomPort())) + return b + +def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, + transports=False): + nn = "bridge-%s"%random.randrange(0,1000000) + ip = ipaddr.IPAddress(randomIP6()) + fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) + b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) + b.setStatus(running, stable) + + oraddrs = [] + if or_addresses: + 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]) + except KeyError: + pass + finally: + b.or_addresses[address] = portlist + + if transports: + for i in xrange(0,8): + b.transports.append(bridgedb.Bridges.PluggableTransport(b, + random.choice(["obfs", "obfs2", "pt1"]), + randomIP(), randomPort())) + + return b + +def fake16Bridge(orport=8080, running=True, stable=True): + nn = "bridge-%s"%random.randrange(0,1000000) + ip = random16IP() + fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) + b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) + b.setStatus(running, stable) + return b + +simpleDesc = "router Unnamed %s %s 0 9030\n"\ +"opt fingerprint DEAD BEEF F00F DEAD BEEF F00F DEAD BEEF F00F DEAD\n"\ +"opt @purpose bridge\n" +orAddress = "or-address %s:%s\n" +def gettimestamp(): + ts = time.strftime("%Y-%m-%d %H:%M:%S") + return "opt published %s\n" % ts + +class RhymesWith255Category: + def contains(self, ip): + return ip.endswith(".255") + +class EmailBridgeDistTests(unittest.TestCase): + def setUp(self): + self.fd, self.fname = tempfile.mkstemp() + self.db = bridgedb.Storage.Database(self.fname) + bridgedb.Storage.setDB(self.db) + self.cur = self.db._conn.cursor() + + def tearDown(self): + self.db.close() + os.close(self.fd) + os.unlink(self.fname) + + def testEmailRateLimit(self): + db = self.db + EMAIL_DOMAIN_MAP = {'example.com':'example.com'} + d = bridgedb.Dist.EmailBasedDistributor( + "Foo", + {'example.com': 'example.com', + 'dkim.example.com': 'dkim.example.com'}, + {'example.com': [], 'dkim.example.com': ['dkim']}) + for _ in xrange(256): + d.insert(fakeBridge()) + d.getBridgesForEmail('abc(a)example.com', 1, 3) + self.assertRaises(bridgedb.Dist.TooSoonEmail, + d.getBridgesForEmail, 'abc(a)example.com', 1, 3) + self.assertRaises(bridgedb.Dist.IgnoreEmail, + d.getBridgesForEmail, 'abc(a)example.com', 1, 3) + + def testUnsupportedDomain(self): + db = self.db + self.assertRaises(bridgedb.parse.addr.UnsupportedDomain, + bridgedb.parse.addr.normalizeEmail, + 'bad(a)email.com', + {'example.com':'example.com'}, + {'example.com':[]}) + +class IPBridgeDistTests(unittest.TestCase): + def dumbAreaMapper(self, ip): + return ip + def testBasicDist(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(256): + d.insert(fakeBridge()) + n = d.getBridgesForIP("1.2.3.4", "x", 2) + n2 = d.getBridgesForIP("1.2.3.4", "x", 2) + self.assertEquals(n, n2) + + def testDistWithCategories(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo", + [RhymesWith255Category()]) + assert len(d.categories) == 1 + for _ in xrange(256): + d.insert(fakeBridge()) + + for _ in xrange(256): + # Make sure that the categories do not overlap + f = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(4)]) + g = lambda: ".".join([str(random.randrange(1,255)) for _ in xrange(3)] + ['255']) + n = d.getBridgesForIP(g(), "x", 10) + n2 = d.getBridgesForIP(f(), "x", 10) + + assert(len(n) > 0) + assert(len(n2) > 0) + + for b in n: + assert (b not in n2) + + for b in n2: + assert (b not in n) + + #XXX: #6175 breaks this test! + #def testDistWithPortRestrictions(self): + # param = bridgedb.Bridges.BridgeRingParameters(needPorts=[(443, 1)]) + # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Baz", + # answerParameters=param) + # for _ in xrange(32): + # d.insert(fakeBridge(443)) + # for _ in range(256): + # d.insert(fakeBridge()) + # for _ in xrange(32): + # i = randomIP() + # n = d.getBridgesForIP(i, "x", 5) + # count = 0 + # fps = {} + # for b in n: + # fps[b.getID()] = 1 + # if b.orport == 443: + # count += 1 + # self.assertEquals(len(fps), len(n)) + # self.assertEquals(len(fps), 5) + # self.assertTrue(count >= 1) + + #def testDistWithFilter16(self): + # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + # for _ in xrange(256): + # d.insert(fake16Bridge()) + # n = d.getBridgesForIP("1.2.3.4", "x", 10) + + # slash16s = dict() + # for bridge in n: + # m = re.match(r'(\d+\.\d+)\.\d+\.\d+', bridge.ip) + # upper16 = m.group(1) + # self.assertTrue(upper16 not in slash16s) + # slash16s[upper16] = True + + def testDistWithFilterIP6(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True)) + d.insert(fakeBridge(or_addresses=True)) + + for i in xrange(500): + bridges = d.getBridgesForIP(randomIP4String(), + "faketimestamp", + bridgeFilterRules=[filterBridgesByIP6]) + bridge = random.choice(bridges) + bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv6Address) + address, portlist = networkstatus.parseALine(bridge_line) + assert type(ipaddr.IPAddress(address)) is ipaddr.IPv6Address + assert filterBridgesByIP6(random.choice(bridges)) + + def testDistWithFilterIP4(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True)) + d.insert(fakeBridge(or_addresses=True)) + + for i in xrange(500): + bridges = d.getBridgesForIP(randomIP4String(), + "faketimestamp", + bridgeFilterRules=[filterBridgesByIP4]) + bridge = random.choice(bridges) + bridge_line = bridge.getConfigLine(addressClass=ipaddr.IPv4Address) + address, portlist = networkstatus.parseALine(bridge_line) + assert type(ipaddr.IPAddress(address)) is ipaddr.IPv4Address + assert filterBridgesByIP4(random.choice(bridges)) + + def testDistWithFilterBoth(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True)) + d.insert(fakeBridge(or_addresses=True)) + + for i in xrange(50): + bridges = d.getBridgesForIP(randomIP4String(), + "faketimestamp", 1, + bridgeFilterRules=[ + filterBridgesByIP4, + filterBridgesByIP6]) + if bridges: + t = bridges.pop() + assert filterBridgesByIP4(t) + assert filterBridgesByIP6(t) + address, portlist = networkstatus.parseALine( + t.getConfigLine(addressClass=ipaddr.IPv4Address)) + assert type(address) is ipaddr.IPv4Address + address, portlist = networkstatus.parseALine( + t.getConfigLine(addressClass=ipaddr.IPv6Address)) + assert type(address) is ipaddr.IPv6Address + + + def testDistWithFilterAll(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True)) + d.insert(fakeBridge(or_addresses=True)) + + for i in xrange(5): + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + filterBridgesByOnlyIP4, filterBridgesByOnlyIP6]) + assert len(b) == 0 + + def testDistWithFilterBlockedCountries(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True)) + d.insert(fakeBridge(or_addresses=True)) + + for b in d.splitter.bridges: + # china blocks all :-( + for pt in b.transports: + key = "%s:%s" % (pt.address, pt.port) + b.blockingCountries[key] = set(['cn']) + for address, portlist in b.or_addresses.items(): + for port in portlist: + key = "%s:%s" % (address, port) + b.blockingCountries[key] = set(['cn']) + key = "%s:%s" % (b.ip, b.orport) + b.blockingCountries[key] = set(['cn']) + + for i in xrange(5): + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + filterBridgesByNotBlockedIn("cn")]) + assert len(b) == 0 + b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + filterBridgesByNotBlockedIn("us")]) + assert len(b) > 0 + + def testDistWithFilterBlockedCountriesAdvanced(self): + d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") + for _ in xrange(250): + d.insert(fakeBridge6(or_addresses=True, transports=True)) + d.insert(fakeBridge(or_addresses=True, transports=True)) + + for b in d.splitter.bridges: + # china blocks some transports + for pt in b.transports: + if random.choice(xrange(2)) > 0: + key = "%s:%s" % (pt.address, pt.port) + b.blockingCountries[key] = set(['cn']) + for address, portlist in b.or_addresses.items(): + # china blocks some transports + for port in portlist: + if random.choice(xrange(2)) > 0: + key = "%s:%s" % (address, port) + b.blockingCountries[key] = set(['cn']) + key = "%s:%s" % (b.ip, b.orport) + b.blockingCountries[key] = set(['cn']) + + # we probably will get at least one bridge back! + # it's pretty unlikely to lose a coin flip 250 times in a row + for i in xrange(5): + b = d.getBridgesForIP(randomIPString(), "x", 1, + bridgeFilterRules=[ + filterBridgesByNotBlockedIn("cn", methodname='obfs2'), + filterBridgesByTransport('obfs2'), + ]) + try: assert len(b) > 0 + except AssertionError: + print("epic fail") + b = d.getBridgesForIP(randomIPString(), "x", 1, bridgeFilterRules=[ + filterBridgesByNotBlockedIn("us")]) + assert len(b) > 0 + + +class SQLStorageTests(unittest.TestCase): + def setUp(self): + self.fd, self.fname = tempfile.mkstemp() + self.db = bridgedb.Storage.Database(self.fname) + self.cur = self.db._conn.cursor() + + def tearDown(self): + self.db.close() + os.close(self.fd) + os.unlink(self.fname) + + def assertCloseTo(self, a, b, delta=60): + self.assertTrue(abs(a-b) <= delta) + + def testBridgeStorage(self): + db = self.db + B = bridgedb.Bridges.Bridge + t = time.time() + cur = self.cur + + k1 = "aaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb" + k2 = "abababababababababababababababababababab" + k3 = "cccccccccccccccccccccccccccccccccccccccc" + b1 = B("serv1", "1.2.3.4", 999, fingerprint=k1) + b1_v2 = B("serv1", "1.2.3.5", 9099, fingerprint=k1) + b2 = B("serv2", "2.3.4.5", 9990, fingerprint=k2) + b3 = B("serv3", "2.3.4.6", 9008, fingerprint=k3) + validRings = ["ring1", "ring2", "ring3"] + + r = db.insertBridgeAndGetRing(b1, "ring1", t, validRings) + self.assertEquals(r, "ring1") + r = db.insertBridgeAndGetRing(b1, "ring10", t+500, validRings) + self.assertEquals(r, "ring1") + + cur.execute("SELECT distributor, address, or_port, first_seen, " + "last_seen FROM Bridges WHERE hex_key = ?", (k1,)) + v = cur.fetchone() + self.assertEquals(v, + ("ring1", "1.2.3.4", 999, + bridgedb.Storage.timeToStr(t), + bridgedb.Storage.timeToStr(t+500))) + + r = db.insertBridgeAndGetRing(b1_v2, "ring99", t+800, validRings) + self.assertEquals(r, "ring1") + cur.execute("SELECT distributor, address, or_port, first_seen, " + "last_seen FROM Bridges WHERE hex_key = ?", (k1,)) + v = cur.fetchone() + self.assertEquals(v, + ("ring1", "1.2.3.5", 9099, + bridgedb.Storage.timeToStr(t), + bridgedb.Storage.timeToStr(t+800))) + + db.insertBridgeAndGetRing(b2, "ring2", t, validRings) + db.insertBridgeAndGetRing(b3, "ring3", t, validRings) + + cur.execute("SELECT COUNT(distributor) FROM Bridges") + v = cur.fetchone() + self.assertEquals(v, (3,)) + + r = db.getEmailTime("abc(a)example.com") + self.assertEquals(r, None) + db.setEmailTime("abc(a)example.com", t) + db.setEmailTime("def(a)example.com", t+1000) + r = db.getEmailTime("abc(a)example.com") + self.assertCloseTo(r, t) + r = db.getEmailTime("def(a)example.com") + self.assertCloseTo(r, t+1000) + r = db.getEmailTime("ghi(a)example.com") + self.assertEquals(r, None) + + db.cleanEmailedBridges(t+200) + db.setEmailTime("def(a)example.com", t+5000) + r = db.getEmailTime("abc(a)example.com") + self.assertEquals(r, None) + r = db.getEmailTime("def(a)example.com") + self.assertCloseTo(r, t+5000) + cur.execute("SELECT * FROM EmailedBridges") + self.assertEquals(len(cur.fetchall()), 1) + + db.addBridgeBlock(b2.fingerprint, 'us') + self.assertEquals(db.isBlocked(b2.fingerprint, 'us'), True) + db.delBridgeBlock(b2.fingerprint, 'us') + self.assertEquals(db.isBlocked(b2.fingerprint, 'us'), False) + db.addBridgeBlock(b2.fingerprint, 'uk') + db.addBridgeBlock(b3.fingerprint, 'uk') + self.assertEquals(set([b2.fingerprint, b3.fingerprint]), + set(db.getBlockedBridges('uk'))) + + db.addBridgeBlock(b2.fingerprint, 'cn') + db.addBridgeBlock(b2.fingerprint, 'de') + db.addBridgeBlock(b2.fingerprint, 'jp') + db.addBridgeBlock(b2.fingerprint, 'se') + db.addBridgeBlock(b2.fingerprint, 'kr') + + self.assertEquals(set(db.getBlockingCountries(b2.fingerprint)), + set(['uk', 'cn', 'de', 'jp', 'se', 'kr'])) + self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) + db.setWarnedEmail("def(a)example.com") + self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) + db.setWarnedEmail("def(a)example.com", False) + self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) + + db.setWarnedEmail("def(a)example.com") + self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) + db.cleanWarnedEmails(t+200) + self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) + +class ParseDescFileTests(unittest.TestCase): + def testSimpleDesc(self): + test = "" + + for i in range(100): + test+= "".join(simpleDesc % (randomIP(), randomPort())) + test+=gettimestamp() + test+="router-signature\n" + + bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] + self.assertEquals(len(bs), 100) + + for b in bs: + b.assertOK() + + def testSingleOrAddress(self): + test = "" + + for i in range(100): + test+= simpleDesc % (randomIP(), randomPort()) + test+= orAddress % (randomIP(),randomPort()) + test+=gettimestamp() + test+= "router-signature\n" + + bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] + self.assertEquals(len(bs), 100) + + for b in bs: + b.assertOK() + + def testMultipleOrAddress(self): + test = "" + for i in range(100): + test+= simpleDesc % (randomIPString(), randomPort()) + for i in xrange(8): + test+= orAddress % (randomIPString(),randomPortSpec()) + test+=gettimestamp() + test+= "router-signature\n" + + bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] + self.assertEquals(len(bs), 100) + + for b in bs: + b.assertOK() + + def testConvolutedOrAddress(self): + test = "" + for i in range(100): + test+= simpleDesc % (randomIPString(), randomPort()) + for i in xrange(8): + test+= orAddress % (randomIPString(),randomPortSpec()) + test+=gettimestamp() + test+= "router-signature\n" + + bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] + self.assertEquals(len(bs), 100) + + for b in bs: + b.assertOK() + + def testParseCountryBlockFile(self): + simpleBlock = "%s:%s %s\n" + countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] + test = str() + for i in range(100): + test += simpleBlock % (randomIPString(), randomPort(), + randomCountrySpec()) + test+=gettimestamp() + + for a,p,c in bridgedb.Bridges.parseCountryBlockFile(test.split('\n')): + assert type(a) in (ipaddr.IPv6Address, ipaddr.IPv4Address) + assert isinstance(p, addr.PortList) + assert isinstance(c, list) + assert len(c) > 0 + for y in c: + assert y in countries + #print "address: %s" % a + #print "portlist: %s" % p + #print "countries: %s" % c + +class BridgeStabilityTests(unittest.TestCase): + def setUp(self): + self.fd, self.fname = tempfile.mkstemp() + self.db = bridgedb.Storage.Database(self.fname) + bridgedb.Storage.setDB(self.db) + self.cur = self.db._conn.cursor() + + def tearDown(self): + self.db.close() + os.close(self.fd) + os.unlink(self.fname) + + def testAddOrUpdateSingleBridgeHistory(self): + db = self.db + b = fakeBridge() + timestamp = time.time() + bhe = bridgedb.Stability.addOrUpdateBridgeHistory(b, timestamp) + assert isinstance(bhe, BridgeHistory) + assert isinstance(db.getBridgeHistory(b.fingerprint), BridgeHistory) + assert len([y for y in db.getAllBridgeHistory()]) == 1 + + def testDeletingSingleBridgeHistory(self): + db = self.db + b = fakeBridge() + timestamp = time.time() + bhe = bridgedb.Stability.addOrUpdateBridgeHistory(b, timestamp) + assert isinstance(bhe, BridgeHistory) + assert isinstance(db.getBridgeHistory(b.fingerprint), BridgeHistory) + db.delBridgeHistory(b.fingerprint) + assert db.getBridgeHistory(b.fingerprint) is None + assert len([y for y in db.getAllBridgeHistory()]) == 0 + + def testTOSA(self): + db = self.db + b = random.choice([fakeBridge,fakeBridge6])() + def timestampSeries(x): + for i in xrange(61): + yield (i+1)*60*30 + x # 30 minute intervals + now = time.time() + time_on_address = long(60*30*60) # 30 hours + downtime = 60*60*random.randint(0,4) # random hours of downtime + + for t in timestampSeries(now): + bridgedb.Stability.addOrUpdateBridgeHistory(b,t) + assert db.getBridgeHistory(b.fingerprint).tosa == time_on_address + + b.orport += 1 + + for t in timestampSeries(now + time_on_address + downtime): + bhe = bridgedb.Stability.addOrUpdateBridgeHistory(b,t) + assert db.getBridgeHistory(b.fingerprint).tosa == time_on_address + downtime + + def testLastSeenWithDifferentAddressAndPort(self): + db = self.db + for i in xrange(10): + num_desc = 30 + time_start = time.time() + ts = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] + b = random.choice([fakeBridge(), fakeBridge6()]) + [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] + + # change the port + b.orport = b.orport+1 + last_seen = ts[-1] + ts = [ 60*30*(i+1) + last_seen for i in xrange(num_desc) ] + [ bridgedb.Stability.addOrUpdateBridgeHistory(b, t) for t in ts ] + b = db.getBridgeHistory(b.fingerprint) + assert b.tosa == ts[-1] - last_seen + assert (long(last_seen*1000) == b.lastSeenWithDifferentAddressAndPort) + assert (long(ts[-1]*1000) == b.lastSeenWithThisAddressAndPort) + + def testFamiliar(self): + # create some bridges + # XXX: slow + num_bridges = 10 + num_desc = 4*48 # 30m intervals, 48 per day + time_start = time.time() + bridges = [ fakeBridge() for x in xrange(num_bridges) ] + t = time.time() + ts = [ (i+1)*60*30+t for i in xrange(num_bridges) ] + for b in bridges: + time_series = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] + [ bridgedb.Stability.addOrUpdateBridgeHistory(b, i) for i in time_series ] + assert None not in bridges + # +1 to avoid rounding errors + assert bridges[-(num_bridges/8 + 1)].familiar == True + + def testDiscountAndPruneBridgeHistory(self): + """ Test pruning of old Bridge History """ + if os.environ.get('TRAVIS'): + self.skipTest("Hangs on Travis-CI.") + + db = self.db + + # make a bunch of bridges + num_bridges = 20 + time_start = time.time() + bridges = [random.choice([fakeBridge, fakeBridge6])() + for i in xrange(num_bridges)] + + # run some of the bridges for the full time series + running = bridges[:num_bridges/2] + # and some that are not + expired = bridges[num_bridges/2:] + + for b in running: assert b not in expired + + # Solving: + # 1 discount event per 12 hours, 24 descriptors 30m apart + num_successful = random.randint(2,60) + # figure out how many intervals it will take for weightedUptime to + # decay to < 1 + num_desc = int(30*log(1/float(num_successful*30*60))/(-0.05)) + timeseries = [ 60*30*(i+1) + time_start for i in xrange(num_desc) ] + + for i in timeseries: + for b in running: + bridgedb.Stability.addOrUpdateBridgeHistory(b, i) + + if num_successful > 0: + for b in expired: + bridgedb.Stability.addOrUpdateBridgeHistory(b, i) + num_successful -= 1 + + # now we expect to see the bridge has been removed from history + for bridge in expired: + b = db.getBridgeHistory(bridge.fingerprint) + assert b is None + # and make sure none of the others have + for bridge in running: + b = db.getBridgeHistory(bridge.fingerprint) + assert b is not None + +def testSuite(): + suite = unittest.TestSuite() + loader = unittest.TestLoader() + + for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, + ParseDescFileTests, BridgeStabilityTests]: + suite.addTest(loader.loadTestsFromTestCase(klass)) + + for module in [ bridgedb.Bridges, + bridgedb.Main, + bridgedb.Dist, + bridgedb.schedule ]: + suite.addTest(doctest.DocTestSuite(module)) + + return suite + +def main(): + suppressWarnings() + + unittest.TextTestRunner(verbosity=1).run(testSuite()) + diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index e57f4a1..53d0e81 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -9,8 +9,9 @@ # (c) 2007-2013, 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` to -be compatible with the newer :api:`twisted.trial` unittests in this directory. +"""Class wrappers to adapt BridgeDB old unittests in :mod:`bridgedb.Tests` +(now kept in :mod:`bridgedb.test.legacy_Tests`) to be compatible with the +newer :api:`twisted.trial` unittests in this directory. """ from __future__ import print_function @@ -26,11 +27,11 @@ import warnings from twisted.python import monkey from twisted.trial import unittest -from bridgedb import Tests +from bridgedb.test import legacy_Tests as Tests from bridgedb.test import deprecated -warnings.filterwarnings('ignore', module="bridgedb\.Tests") +warnings.filterwarnings('ignore', module="bridgedb\.test\.legacy_Tests") pyunit = __import__('unittest')

1 0

[bridgedb/develop] Implement `client` and `getHashringPlacement()` interfaces.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit eb28b43d69ea3d91b8ccab6fbc7569817fc25ebb Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:57:36 2014 +0000 Implement `client` and `getHashringPlacement()` interfaces. * ADD base class implementations of IRequestBridges.client and IRequestBridges.getHashringPlacement() to BridgeRequestBase class. --- lib/bridgedb/bridgerequest.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 840b2fc..d7b4d18 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -20,6 +20,7 @@ from zope.interface import Attribute from zope.interface import Interface from bridgedb import Filters +from bridgedb.crypto import getHMACFunc class IRequestBridges(Interface): @@ -93,8 +94,34 @@ class BridgeRequestBase(object): self.filters = list() self.transports = list() self.notBlockedIn = list() + #: This should be some information unique to the client making the + #: request for bridges, such that we are able to HMAC this unique data + #: in order to place the client into a hashring (determining which + #: bridge addresses they get in the request response). It defaults to + #: the string ``'default'``. + self.client = 'default' self.valid = False + def getHashringPlacement(self, key, client=None): + """Create an HMAC of some **client** info using a **key**. + + :param str key: The key to use for HMACing. + :param str client: Some (hopefully unique) information about the + client who is requesting bridges, such as an IP or email address. + :rtype: long + :returns: A long specifying index of the first node in a hashring to + be distributed to the client. This value should obviously be used + mod the number of nodes in the hashring. + """ + if not client: + client = self.client + + # Get an HMAC with the key of the client identifier: + digest = getHMACFunc(key)(client) + # Take the lower 8 bytes of the digest and convert to a long: + position = long(digest[:8], 16) + return position + def isValid(self, valid=None): """Set or determine if this request was valid.

1 0

[bridgedb/develop] Add methods to bridgedb.bridges.Bridge for backwards compatibility.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 0c1f4edccabb752266b628e87090f3d72f17f6be Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 6 00:56:20 2014 +0000 Add methods to bridgedb.bridges.Bridge for backwards compatibility. * ADD several methods and attributes for backwards compatibility, contained within the Bridge._backwardsCompatible() method, the latter is only activated if the Bridge is initialised with *args and **kwargs (as was the case with the old Bridge class). The methods and attributes implementing backwards compatibility are not available if the Bridge class is initialised in the new way, i.e. via descriptors parsed with Stem. --- lib/bridgedb/bridges.py | 161 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index ecbf863..100dd12 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -9,13 +9,22 @@ """Classes for manipulating and storing Bridges and their attributes.""" +from __future__ import print_function import ipaddr import logging import os +from bridgedb import safelog +from bridgedb import bridgerequest +from bridgedb.parse.addr import isIPAddress +from bridgedb.parse.addr import isIPv6 from bridgedb.parse.addr import isValidIP +from bridgedb.parse.addr import PortList from bridgedb.parse.fingerprint import isValidFingerprint +from bridgedb.parse.fingerprint import toHex +from bridgedb.parse.fingerprint import fromHex + class MalformedBridgeInfo(ValueError): @@ -394,8 +403,21 @@ class Bridge(object): #: created with the ``signing-key`` contained in that descriptor. _checkServerDescriptorSignature = True - def __init__(self): - """Create a new ``Bridge``.""" + def __init__(self, + # for backwards compatibility: + nickname=None, ip=None, orport=None, + fingerprint=None, id_digest=None, or_addresses=None): + """Create a and store information for a new ``Bridge``. + + .. info: For backwards compatibility, `nickname`, `ip`, and `orport` + must be the first, second, and third arguments, respectively. The + `fingerprint` and `id_digest` were previously kwargs, and are also + provided for backwards compatibility. New calls to + :meth:`__init__` *should* avoid using these kwargs, and instead + use the methods :meth:`updateFromNetworkStatus`, + :meth:`updateFromServerDescriptor`, and + :meth:`updateFromExtraInfoDescriptor`. + """ self.fingerprint = None self.nickname = None self.address = None @@ -435,6 +457,141 @@ class Bridge(object): self.descriptorDigest = None self.extrainfoDigest = None + # For backwards compatibility with the old, deprecated version of this + # class: + if nickname or ip or orport or fingerprint or id_digest: + self._backwardsCompatible(nickname=nickname, address=ip, + orPort=orport, fingerprint=fingerprint, + idDigest=id_digest, + orAddresses=or_addresses) + + def _backwardsCompatible(self, nickname=None, address=None, orPort=None, + fingerprint=None, idDigest=None, + orAddresses=None): + """Functionality for maintaining backwards compatibility with the older + version of this class (see :class:`bridgedb.test.deprecated.Bridge`). + """ + def getID(): + """Get the binary encoded form of this ``Bridge``'s ``fingerprint``. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + if self.fingerprint: + return fromHex(self.fingerprint) + self.getID = getID + + def setDescriptorDigest(digest): + """Set this ``Bridge``'s server-descriptor digest. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + self.desc_digest = digest # old attribute for backwards compat + self.descriptorDigest = digest # new attribute + self.desc_digest = None + self.setDescriptorDigest = setDescriptorDigest + + def setExtraInfoDigest(digest): + """Set this ``Bridge``'s extrainfo digest. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + self.ei_digest = digest # old attribute for backwards compat + self.extrainfoDigest = digest # new attribute + self.ei_digest = None + self.setExtraInfoDigest = setExtraInfoDigest + + def setStatus(running=None, stable=None): + """Set this ``Bridge``'s "Running" and "Stable" flags. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + if running is not None: + self.running = bool(running) + self.flags.running = bool(running) + if stable is not None: + self.stable = bool(stable) + self.flags.stable = bool(running) + self.running = False + self.stable = False + self.setStatus = setStatus + + def getConfigLine(includeFingerprint=False, addressClass=None, + request=None, transport=None): + """Get a vanilla bridge line for this ``Bridge``. + + This method is provided for backwards compatibility and should not + be relied upon. + + The old ``bridgedb.Bridges.Bridge.getConfigLine()`` method didn't + know about :class:`~bridgedb.bridgerequest.BridgeRequestBase`s, + and so this modified version is backwards compatible by creating a + :class:`~bridgedb.bridgerequest.BridgeRequestBase` for + :meth:`getBridgeLine`. The default parameters are the same as they + were in the old ``bridgedb.Bridges.Bridge`` class. + + :param bool includeFingerprint: If ``True``, include the + ``fingerprint`` of this :class:`Bridge` in the returned bridge + line. + :type addressClass: :class:`ipaddr.IPv4Address` or + :class:`ipaddr.IPv6Address`. + :param addressClass: Type of address to choose. + :param str request: A string unique to this request + e.g. email-address or ``uniformMap(ip)`` or ``'default'``. In + this case, this is not a + :class:`~bridgerequest.BridgeRequestBase` (as might be + expected) but the equivalent of + :data:`bridgerequest.BridgeRequestBase.client`. + :param str transport: A pluggable transport method name. + """ + bridgeRequest = bridgerequest.BridgeRequestBase(addressClass) + bridgeRequest.client = request if request else bridgeRequest.client + bridgeRequest.isValid(True) + + if transport: + bridgeRequest.withPluggableTransportType(transport) + + bridgeRequest.generateFilters() + bridgeLine = self.getBridgeLine(bridgeRequest, includeFingerprint) + return bridgeLine + self.getConfigLine = getConfigLine + + if nickname: + self.nickname = nickname # XXX check nickname spec conformity? + if address: + self.address = address # XXX check validip? + if orPort: + self.orPort = orPort # XXX check validity? + + if idDigest: + if not fingerprint: + if not len(idDigest) == 20: + raise TypeError("Bridge with invalid ID") + self.fingerprint = toHex(idDigest) + elif fingerprint: + if not isValidFingerprint(fingerprint): + raise TypeError("Bridge with invalid fingerprint (%r)" + % fingerprint) + self.fingerprint = fingerprint.lower() + else: + raise TypeError("Bridge with no ID") + + if orAddresses and isinstance(orAddresses, dict): + for ip, portlist in orAddresses.items(): + validAddress = isIPAddress(ip, compressed=False) + if validAddress: + # The old code expected a `bridgedb.parse.addr.PortList`: + if isinstance(portlist, PortList): + for port in portlist.ports: + self.orAddresses.append( + (validAddress, port, validAddress.version,)) + else: + self.orAddresses.append( + (validAddress, port, validAddress.version)) + def _checkServerDescriptor(self, descriptor): # If we're parsing the server-descriptor, require a networkstatus # document:

1 0

[bridgedb/develop] Change BridgeRequestBase.isValid() to allow setting the attribute.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 1cc15e8c0844c704f17502c063b2caf384977e06 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:50:11 2014 +0000 Change BridgeRequestBase.isValid() to allow setting the attribute. The syntax is nicer with: >>> bridgeRequest = bridgedb.bridgerequest.BridgeRequestBase() >>> bridgeRequest.isValid() False >>> bridgeRequest.isValid(True) >>> bridgeRequest.isValid() True than it was with the old implementation: >>> bridgeRequest = bridgedb.bridgerequest.BridgeRequestBase() >>> bridgeRequest.isValid() False >>> bridgeRequest.valid = True >>> bridgeRequest.isValid() True --- lib/bridgedb/bridgerequest.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 7b2bfe9..3ef0dc7 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -82,8 +82,18 @@ class BridgeRequestBase(object): self.notBlockedIn = list() self.valid = False - def isValid(self): - pass + def isValid(self, valid=None): + """Set or determine if this request was valid. + + :type valid: None or bool + :param valid: If ``None``, get the current request validity. If + ``True`` or ``False``, set the request validity accordingly. + :rtype: bool + :returns: Whether or not this request is valid. + """ + if isinstance(valid, bool): + self.valid = valid + return self.valid def withIPv4(self): self.addressClass = ipaddr.IPv4Address

1 0

[bridgedb/develop] Catch ValueErrors while coercing PluggableTransport port numbers.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 83378640b09dc8a6c6d5a58389fd36c25dab37b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 6 00:17:24 2014 +0000 Catch ValueErrors while coercing PluggableTransport port numbers. --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 21d9257..ecbf863 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -240,7 +240,7 @@ class PluggableTransport(object): try: # Coerce the port to be an integer: self.port = int(self.port) - except TypeError: + except (TypeError, ValueError): raise MalformedPluggableTransport( ("Cannot create PluggableTransport with port type: %s.") % type(self.port))

1 0

[bridgedb/develop] Fix a bug in bridgedb.schedule which caused months >= 13.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit d2f9498e6d0cfda6a9452ebe1efcf8b6b8eeb606 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:48:51 2014 +0000 Fix a bug in bridgedb.schedule which caused months >= 13. --- lib/bridgedb/schedule.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/schedule.py b/lib/bridgedb/schedule.py index 930f2e7..71b4254 100644 --- a/lib/bridgedb/schedule.py +++ b/lib/bridgedb/schedule.py @@ -260,8 +260,12 @@ class ScheduledInterval(Unscheduled): if self.intervalPeriod == 'month': date = fromUnixSeconds(seconds) + year = date.year months = date.month + self.intervalCount - return toUnixSeconds((date.year, months, 1, 0, 0, 0)) + if months > 12: + year = date.year + 1 + months = months - 12 + return toUnixSeconds((year, months, 1, 0, 0, 0)) elif self.intervalPeriod == 'day': return seconds + (86400 * self.intervalCount) elif self.intervalPeriod == 'hour':

1 0