tor-commits May 2015

tor-commits@lists.torproject.org

22 participants
990 discussions

[bridgedb/master] Move N_IP_CLUSTERS into the HTTPS distributor-specific settings.
by isis＠torproject.org 01 May '15

01 May '15

commit 70009a726f6076036f29909fc5476ae4cc94fd2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 01:32:45 2015 +0000 Move N_IP_CLUSTERS into the HTTPS distributor-specific settings. --- bridgedb.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 2a1c367..cbdead0 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -217,12 +217,6 @@ NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] # will treat them specially. PROXY_LIST_FILES = [] -# How many clusters do we group IPs in when distributing bridges based on IP? -# Note that if PROXY_LIST_FILES is set (below), what we actually do here -# is use one higher than the number here, and the extra cluster is used -# for answering requests made by IP addresses in the PROXY_LIST_FILES file. -N_IP_CLUSTERS = 4 - # If possible, always give a certain number of answers with a given ORPort. # This is a list of ``(port, minimum)`` tuples. FORCE_PORTS = [(443, 1)] @@ -300,6 +294,12 @@ HTTPS_INCLUDE_FINGERPRINTS = True # the *last* entry from its X-Forwarded-For header as the client's IP. HTTPS_USE_IP_FROM_FORWARDED_HEADER = False +# How many clusters do we group IPs in when distributing bridges based on IP? +# Note that if PROXY_LIST_FILES is set (below), what we actually do here +# is use one higher than the number here, and the extra cluster is used +# for answering requests made by IP addresses in the PROXY_LIST_FILES file. +N_IP_CLUSTERS = 4 + # (string or None) The period at which the available bridges rotates to a # separate set of bridges. This setting can be used in the form #

1 0

[bridgedb/master] Decrease insane ammounts of logging for adding proxies to ProxySet.
by isis＠torproject.org 01 May '15

01 May '15

commit 5d8f47943c78f87821d6102a72fe321a3fce8b39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 05:07:58 2015 +0000 Decrease insane ammounts of logging for adding proxies to ProxySet. --- lib/bridgedb/proxy.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index 3940ed6..7fab5af 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -92,7 +92,6 @@ def loadProxiesFromFile(filename, proxySet=None, removeStale=False): if isinstance(proxySet, ProxySet): # ProxySet.add() will validate the IP address if proxySet.add(line, tag=filename): - logging.info("Added %s to the proxy list." % line) addresses.append(line) else: ip = isIPAddress(line) @@ -170,7 +169,7 @@ class ProxySet(MutableSet): ip = isIPAddress(ip) if ip: if self._proxies.isdisjoint(set(ip)): - logging.debug("Adding %s to proxy list %r..." % (ip, self)) + logging.debug("Adding %s to proxy list..." % ip) self._proxies.add(ip) self._proxydict[ip] = tag if tag else time.time() return True

1 0

[bridgedb/master] Improve documentation for b.bridgerequest.BridgeRequestBase attributes.
by isis＠torproject.org 01 May '15

01 May '15

commit 33656cd687eb74874eb52ed28a65b7704fd78262 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 05:51:17 2015 +0000 Improve documentation for b.bridgerequest.BridgeRequestBase attributes. --- lib/bridgedb/bridgerequest.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index ff8e289..f653450 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -33,8 +33,8 @@ class IRequestBridges(Interface): transports = Attribute( "A list of strings of Pluggable Transport types requested.") notBlockedIn = Attribute( - "A list of 2-4 letter country codes. The distributed bridges should " - "not be blocked in these countries.") + "A list of two-character country codes. The distributed bridges " + "should not be blocked in these countries.") valid = Attribute( "A boolean. Should be ``True`` if the client's request was valid.") client = Attribute( @@ -87,12 +87,18 @@ class BridgeRequestBase(object): implements(IRequestBridges) def __init__(self, addressClass=None): + #: (:class:`ipaddr.IPv4Address` or :class:`ipaddr.IPv6Address`) The IP + #: version of bridge addresses to distribute to the client. self.addressClass = addressClass if not ((self.addressClass is ipaddr.IPv4Address) or (self.addressClass is ipaddr.IPv6Address)): self.addressClass = ipaddr.IPv4Address + #: (list) A list of callables used to filter bridges from a hashring. self.filters = list() + #: (list) A list of strings of Pluggable Transport types requested. self.transports = list() + #: (list) A list of two-character country codes. The distributed bridges + #: should not be blocked in these countries. 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 @@ -100,6 +106,7 @@ class BridgeRequestBase(object): #: bridge addresses they get in the request response). It defaults to #: the string ``'default'``. self.client = 'default' + #: (bool) Should be ``True`` if the client's request was valid. self.valid = False def getHashringPlacement(self, key, client=None):

1 0

[bridgedb/master] Merge branch 'fix/12505-5418-remove-old-block-code' into develop
by isis＠torproject.org 01 May '15

01 May '15

commit 91f4cf9c084765748fed80f8f8d00eae80c5e68e Merge: 7a1a54f 5e032ef Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 06:13:21 2015 +0000 Merge branch 'fix/12505-5418-remove-old-block-code' into develop lib/bridgedb/Bridges.py | 72 ------------------------------------- lib/bridgedb/Bucket.py | 8 ----- lib/bridgedb/Main.py | 20 ----------- lib/bridgedb/Storage.py | 46 ------------------------ lib/bridgedb/test/legacy_Tests.py | 40 +-------------------- 5 files changed, 1 insertion(+), 185 deletions(-)

1 0

[bridgedb/master] Merge branch 'fix/15522-ipv6-enumeration' into develop
by isis＠torproject.org 01 May '15

01 May '15

commit 0341b7253eb76feb7f9fccd4b73572b270902fed Merge: 83e84d1 c91def0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 31 23:23:21 2015 +0000 Merge branch 'fix/15522-ipv6-enumeration' into develop lib/bridgedb/Dist.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[bridgedb/master] Move unittest utility functions for generating random IP addresses.
by isis＠torproject.org 01 May '15

01 May '15

commit 7620d5e511a9e48f1423d4b3bda335529ba9562b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 00:48:21 2015 +0000 Move unittest utility functions for generating random IP addresses. * MOVE several functions for generating random IP addresses from bridgedb.test.legacy_Tests to bridgedb.test.util. --- lib/bridgedb/test/legacy_Tests.py | 57 +++++++++++++------------------------ lib/bridgedb/test/util.py | 26 +++++++++++++++++ 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index d416d22..cd0c6de 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -36,38 +36,20 @@ from bridgedb.Stability import BridgeHistory from bridgedb.parse import addr from bridgedb.test import deprecated_networkstatus as networkstatus +from bridgedb.test.util import bracketIPv6 +from bridgedb.test.util import randomIP +from bridgedb.test.util import randomIPv4 +from bridgedb.test.util import randomIPv6 +from bridgedb.test.util import randomIPString +from bridgedb.test.util import randomIPv4String +from bridgedb.test.util import randomIPv6String from 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)]) @@ -111,7 +93,7 @@ def randomCountrySpec(): def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, transports=False): nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP4()) + ip = ipaddr.IPAddress(randomIPv4()) fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) @@ -121,7 +103,7 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, 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() + address = randomIPv4String() portlist = addr.PortList(randomPortSpec()) if addr.isValidIP(address): oraddrs.append((address, portlist,)) @@ -145,7 +127,7 @@ def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, transports=False): nn = "bridge-%s"%random.randrange(0,1000000) - ip = ipaddr.IPAddress(randomIP6()) + ip = ipaddr.IPAddress(randomIPv6()) fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) b.setStatus(running, stable) @@ -155,10 +137,10 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, 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() + address = randomIPv6() portlist = addr.PortList(randomPortSpec()) if addr.isValidIP(address): - address = bracketIP6(address) + address = bracketIPv6(address) oraddrs.append((address, portlist,)) for address, portlist in oraddrs: @@ -317,7 +299,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - bridges = d.getBridgesForIP(randomIP4String(), + bridges = d.getBridgesForIP(randomIPv4String(), "faketimestamp", bridgeFilterRules=[filterBridgesByIP6]) bridge = random.choice(bridges) @@ -333,7 +315,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(500): - bridges = d.getBridgesForIP(randomIP4String(), + bridges = d.getBridgesForIP(randomIPv4String(), "faketimestamp", bridgeFilterRules=[filterBridgesByIP4]) bridge = random.choice(bridges) @@ -349,7 +331,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(50): - bridges = d.getBridgesForIP(randomIP4String(), + bridges = d.getBridgesForIP(randomIPv4String(), "faketimestamp", 1, bridgeFilterRules=[ filterBridgesByIP4, @@ -373,7 +355,7 @@ class IPBridgeDistTests(unittest.TestCase): d.insert(fakeBridge(or_addresses=True)) for i in xrange(5): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIPv4String(), "x", 1, bridgeFilterRules=[ filterBridgesByIP4, filterBridgesByIP6]) assert len(b) == 0 @@ -396,10 +378,10 @@ class IPBridgeDistTests(unittest.TestCase): b.blockingCountries[key] = set(['cn']) for i in xrange(5): - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIPv4String(), "x", 1, bridgeFilterRules=[ filterBridgesByNotBlockedIn("cn")]) assert len(b) == 0 - b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ + b = d.getBridgesForIP(randomIPv4String(), "x", 1, bridgeFilterRules=[ filterBridgesByNotBlockedIn("us")]) assert len(b) > 0 @@ -722,4 +704,3 @@ def main(): suppressWarnings() unittest.TextTestRunner(verbosity=1).run(testSuite()) - diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index bec590d..2949eca 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -111,6 +111,32 @@ def getBridgeDBPID(pidfile="bridgedb.pid"): return pid +def bracketIPv6(ip): + """Put brackets around an IPv6 address, just as tor does.""" + return "[%s]" % ip + +def randomIPv4(): + return ipaddr.IPv4Address(random.getrandbits(32)) + +def randomIPv6(): + return ipaddr.IPv6Address(random.getrandbits(128)) + +def randomIP(): + if random.choice(xrange(2)): + return randomIPv4() + return randomIPv6() + +def randomIPv4String(): + return randomIPv4().compressed + +def randomIPv6String(): + return bracketIPv6(randomIPv6().compressed) + +def randomIPString(): + if random.choice(xrange(2)): + return randomIPv4String() + return randomIPv6String() + #: Mixin class for use with :api:`~twisted.trial.unittest.TestCase`. A #: ``TestCaseMixin`` can be used to add additional methods, which should be

1 0

[bridgedb/master] Remove all remnants of #5027/#5418 bridge block parser code.
by isis＠torproject.org 01 May '15

01 May '15

commit 5e032efa39a4c00f00ca2f86460f952bf2c081a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 01:04:33 2015 +0000 Remove all remnants of #5027/#5418 bridge block parser code. * REMOVES bridgedb.Bridges.re_ipv4. * REMOVES bridgedb.Bridges.re_ipv6. * REMOVES bridgedb.Bridges.parseCountryBlockFile(). * REMOVES bridgedb.Bridges.BridgeBlock. * REMOVES bridgedb.Bridges.CountryBlock. * REMOVES bridgedb.Storage.Database.addBridgeBlock(). * REMOVES bridgedb.Storage.Database.delBridgeBlock(). * REMOVES bridgedb.Storage.Database.cleanBridgeBlocks(). * REMOVES bridgedb.Storage.Database.getBlockingCountries(). * REMOVES bridgedb.Storage.Database.getBlockedBridges(). * REMOVES bridgedb.Storage.Database.isBlocked(). * REMOVES several asserts for the above b.Storage.Database methods from bridgedb.test.legacy_Tests.SQLStorageTests. * REMOVES bridgedb.test.legacy_Tests.ParseCountryBlockFileTests. * FIXES #5418: https://bugs.torproject.org/5418 * SEEALSO #5027: https://bugs.torproject.org/5027 * FIXES part of #12505: https://bugs.torproject.org/12505 --- lib/bridgedb/Bridges.py | 72 ------------------------------------- lib/bridgedb/Bucket.py | 8 ----- lib/bridgedb/Main.py | 20 ----------- lib/bridgedb/Storage.py | 46 ------------------------ lib/bridgedb/test/legacy_Tests.py | 40 +-------------------- 5 files changed, 1 insertion(+), 185 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 078cfff..0239730 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -40,41 +40,6 @@ ID_LEN = 20 # XXX Only used in commented out line in Storage.py DIGEST_LEN = 20 PORTSPEC_LEN = 16 -re_ipv6 = re.compile("\[([a-fA-F0-9:]+)\]:(.*$)") -re_ipv4 = re.compile("((?:\d{1,3}\.?){4}):(.*$)") - - -def parseCountryBlockFile(f): - """Generator. Parses a blocked-bridges file 'f', and yields - a fingerprint (ID), address, a list of ports, and a list of country - codes where the bridge is blocked for each valid line: - address, port [], countrycode []""" - for line in f: - ID = address = fields = portlist = countries = None - line = line.strip() - try: - ID, addrspec, countries = line.split() - if isValidFingerprint(ID): - ID = fromHex(ID) - logging.debug("Parsed ID: %s", ID) - else: - print "failed to parse ID!" - continue # skip this line - - for regex in [re_ipv4, re_ipv6]: - m = regex.match(addrspec) - if m: - address = ipaddr.IPAddress(m.group(1)) - portlist = addr.PortList(m.group(2)) - countries = countries.split(',') - logging.debug("Parsed address: %s", address) - logging.debug("Parsed portlist: %s", portlist) - logging.debug("Parsed countries: %s", countries) - except (IndexError, ValueError): - logging.debug("Skipping line") - continue # skip this line - if ID and address and portlist and countries: - yield ID, address, portlist, countries class BridgeHolder(object): """Abstract base class for all classes that hold bridges.""" @@ -751,40 +716,3 @@ class FilteredBridgeSplitter(BridgeHolder): desc = "%s %s" % (description.strip(), " ".join([v for k,v in grouped.items()]).strip()) f.write("%s %s\n"%( toHex(b.getID()), desc)) - -class BridgeBlock(object): - """Base class that abstracts bridge blocking. - - .. TODO:: This should be a zope.interface specification. - """ - def __init__(self): - pass - - def insert(self, fingerprint, blockingRule): - raise NotImplementedError - - def clear(self): - pass - -class CountryBlock(BridgeBlock): - """Countrywide bridge blocking""" - def __init__(self): - self.db = bridgedb.Storage.getDB() - - def clear(self): - assert self.db - self.db.cleanBridgeBlocks() - self.db.commit() - - def insert(self, fingerprint, blockingRule): - """ insert a country based blocking rule """ - assert self.db - countryCode = blockingRule - self.db.addBridgeBlock(fingerprint, countryCode) - self.db.commit() - - def getBlockingCountries(self, fingerprint): - """ returns a list of country codes where this fingerprint is blocked""" - assert self.db - if fingerprint is not None: - return self.db.getBlockingCountries(fingerprint) diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py index 5e7f61b..1382188 100644 --- a/lib/bridgedb/Bucket.py +++ b/lib/bridgedb/Bucket.py @@ -242,14 +242,6 @@ class BucketManager(object): bridgeHistories.sort(lambda x,y: cmp(x.weightedFractionalUptime, y.weightedFractionalUptime)) - # for a bridge, get the list of countries it might not work in - blocklist = dict() - if getattr(self.cfg, "COUNTRY_BLOCK_FILE", None) is not None: - f = open(self.cfg.COUNTRY_BLOCK_FILE, 'r') - for ID,address,portlist,countries in bridgedb.Bridges.parseCountryBlockFile(f): - blocklist[toHex(ID)] = countries - f.close() - try: f = open(filename, 'w') if self.cfg.COLLECT_TIMESTAMPS: diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 3b018f9..d5f4c24 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -175,26 +175,6 @@ def load(state, splitter, clear=False): "but could not find bridge with that fingerprint.") % router.fingerprint) - # XXX TODO refactor the next block according with new parsers for OONI - # bridge-reachability reports: - if state.COUNTRY_BLOCK_FILE: # pragma: no cover - logging.info("Opening Blocking Countries file %s" - % state.COUNTRY_BLOCK_FILE) - f = open(state.COUNTRY_BLOCK_FILE) - # Identity digest, primary OR address, portlist, country codes - for ID, addr, portlist, cc in Bridges.parseCountryBlockFile(f): - if ID in bridges.keys() and bridges[ID].running: - for port in portlist: - addrport = "{0}:{1}".format(addr, port) - logging.debug(":'( Tears! %s blocked bridge %s at %s" - % (cc, bridges[ID].fingerprint, addrport)) - try: - bridges[ID].blockingCountries[addrport].update(cc) - except KeyError: - bridges[ID].blockingCountries[addrport] = set(cc) - logging.debug("Closing blocking-countries document") - f.close() - inserted = 0 logging.info("Inserting %d bridges into splitter..." % len(bridges)) for fingerprint, bridge in bridges.items(): diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 1efb139..439634f 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -243,52 +243,6 @@ class Database(object): cur.execute("UPDATE Bridges SET distributor = ? WHERE hex_key = ?", (distributor, hex_key)) - def addBridgeBlock(self, fingerprint, countryCode): - cur = self._cur - cur.execute("INSERT OR REPLACE INTO BlockedBridges " - "(hex_key,blocking_country) VALUES (?,?)", - (fingerprint, countryCode)) - - def delBridgeBlock(self, fingerprint, countryCode): - cur = self._cur - cur.execute("DELETE FROM BlockedBridges WHERE hex_key = ? " - "AND blocking_country = ?", (fingerprint, countryCode)) - - def cleanBridgeBlocks(self): - cur = self._cur - cur.execute("DELETE FROM BlockedBridges") - - def getBlockingCountries(self, fingerprint): - cur = self._cur - cur.execute("SELECT hex_key, blocking_country FROM BlockedBridges WHERE hex_key = ? ", - (fingerprint,)) - v = cur.fetchall() - if v is None: - return None - - # return list of country-codes - return [ str(result[1]) for (result) in v ] - - def getBlockedBridges(self, countryCode): - cur = self._cur - cur.execute("SELECT hex_key, blocking_country FROM BlockedBridges WHERE blocking_country = ? ", - (countryCode,)) - v = cur.fetchall() - if v is None: - return None - # return list of fingerprints - return [ str(result[0]) for (result) in v ] - - def isBlocked(self, fingerprint, countryCode): - cur = self._cur - cur.execute("SELECT hex_key, blocking_country FROM BlockedBridges WHERE " - "hex_key = ? AND blocking_country = ?", - (fingerprint, countryCode)) - v = cur.fetchone() - if v is None: - return False - return True - def getWarnedEmail(self, addr): addr = hashlib.sha1(addr).hexdigest() cur = self._cur diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index cd0c6de..4d0c53c 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -501,23 +501,6 @@ class SQLStorageTests(unittest.TestCase): 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) @@ -529,27 +512,6 @@ class SQLStorageTests(unittest.TestCase): db.cleanWarnedEmails(t+200) self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) -class ParseCountryBlockFileTests(unittest.TestCase): - - 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): @@ -689,7 +651,7 @@ def testSuite(): loader = unittest.TestLoader() for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, - ParseCountryBlockFileTests, BridgeStabilityTests]: + BridgeStabilityTests]: suite.addTest(loader.loadTestsFromTestCase(klass)) for module in [ bridgedb.Bridges,

1 0

[bridgedb/master] Don't log special/private attributes when logging changed configuration.
by isis＠torproject.org 01 May '15

01 May '15

commit 584d5911df5318caeabc5b57a0b480dc10d211e9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 05:05:28 2015 +0000 Don't log special/private attributes when logging changed configuration. --- lib/bridgedb/configure.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 8a24d35..2992e1c 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -83,7 +83,8 @@ def loadConfig(configFile=None, configCls=None): if itsSafeToUseLogging: logging.debug("New configuration settings:") logging.debug("\n".join(["{0} = {1}".format(key, value) - for key, value in configuration.items()])) + for key, value in configuration.items() + if not key.startswith('_')])) # Create a :class:`Conf` from the settings stored within the local scope # of the ``configuration`` dictionary:

1 0

[bridgedb/master] Add an extra newline after email footers to avoid looking too busy.
by isis＠torproject.org 01 May '15

01 May '15

commit efc3fdda61544360466a6882f0fb4a86d1e4abdc Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 05:07:12 2015 +0000 Add an extra newline after email footers to avoid looking too busy. --- lib/bridgedb/email/templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py index ae85e8f..a6ff38c 100644 --- a/lib/bridgedb/email/templates.py +++ b/lib/bridgedb/email/templates.py @@ -150,7 +150,7 @@ def addFooter(template, clientAddress=None): % (clientAddr, now.strftime('%A, %d %B, %Y'), now.strftime('%H:%M:%S')) - footer += u'\n' + footer += u'\n\n' return footer

1 0

[bridgedb/master] Fix missing random module import to bridgedb.test.util.
by isis＠torproject.org 01 May '15

01 May '15

commit 4ff20fd52aab80958e3c3f2af0908e003d907761 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 1 06:31:37 2015 +0000 Fix missing random module import to bridgedb.test.util. --- lib/bridgedb/test/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index f276dc4..234a9b6 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals import errno import ipaddr import os +import random from functools import wraps

1 0

← Newer
1
...
92
93
94
95
96
97
98
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2015