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

[bridgedb/develop] Change Filter.filterBridgesByIPv[46]() to use bridge.address.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit f49a243bb2208ec371b01341d8ad1ecc1669ad48 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:40:37 2014 +0000 Change Filter.filterBridgesByIPv[46]() to use bridge.address. Using bridge.ip is deprecated. --- lib/bridgedb/Filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index ab8b74a..f22fcc7 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -51,7 +51,7 @@ def filterBridgesByRules(rules): def filterBridgesByIP4(bridge): try: - if IPv4Address(bridge.ip): return True + if IPv4Address(bridge.address): return True except ValueError: pass @@ -63,7 +63,7 @@ setattr(filterBridgesByIP4, "description", "ip=4") def filterBridgesByIP6(bridge): try: - if IPv6Address(bridge.ip): return True + if IPv6Address(bridge.address): return True except ValueError: pass

1 0

[bridgedb/develop] Stem apparently sets port 0 to 'anyport'.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit b476afe9422903207ceed4ac358351fdb9382712 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:55:40 2014 +0000 Stem apparently sets port 0 to 'anyport'. --- lib/bridgedb/bridges.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 735c603..f612565 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -468,7 +468,12 @@ class PluggableTransport(BridgeAddressBase): self.fingerprint = str(fingerprint) self.methodname = str(methodname) self.address = kitchenSink[0] - self.port = int(kitchenSink[1]) + + port = kitchenSink[1] + if port == 'anyport': # IDK. Stem, WTF? + port = 0 + + self.port = int(port) self.arguments = self._parseArgumentsIntoDict(kitchenSink[2]) self._runChecks()

1 0

[bridgedb/develop] Remove filterBridgesByOnlyIP4() and filterBridgesByOnlyIP6().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 264d8fc91ae1b7de149bf155e37a6b38e52ad240 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:43:39 2014 +0000 Remove filterBridgesByOnlyIP4() and filterBridgesByOnlyIP6(). These were only used in lib/bridgedb/test/legacy_Tests.py. --- lib/bridgedb/Filters.py | 16 ---------------- lib/bridgedb/test/legacy_Tests.py | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 1a8a8d8..4580c87 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -73,22 +73,6 @@ def filterBridgesByIP6(bridge): return False setattr(filterBridgesByIP6, "description", "ip=6") -def filterBridgesByOnlyIP4(bridge): - for k in bridge.or_addresses.keys(): - if type(k) is IPv6Address: - return False - if type(k) is IPv4Address: - return True - return False - -def filterBridgesByOnlyIP6(bridge): - for k in bridge.or_addresses.keys(): - if type(k) is IPv4Address: - return False - if type(k) is IPv6Address: - return True - return False - def filterBridgesByTransport(methodname, addressClass=None): if addressClass is None: addressClass = IPv4Address assert (addressClass) in (IPv4Address, IPv6Address) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index fa7a13c..70196b8 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -29,8 +29,6 @@ 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 @@ -376,7 +374,7 @@ class IPBridgeDistTests(unittest.TestCase): for i in xrange(5): b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ - filterBridgesByOnlyIP4, filterBridgesByOnlyIP6]) + filterBridgesByIP4, filterBridgesByIP6]) assert len(b) == 0 def testDistWithFilterBlockedCountries(self):

1 0

[bridgedb/develop] Fix legacy_Tests.py to use uppercased bridge.fingerprints.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 5bd0cfa8a4dfe5dee69f4fc06f7fbf59ea969897 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:54:35 2014 +0000 Fix legacy_Tests.py to use uppercased bridge.fingerprints. --- lib/bridgedb/test/legacy_Tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 70196b8..6d55fce 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -460,9 +460,9 @@ class SQLStorageTests(unittest.TestCase): t = time.time() cur = self.cur - k1 = "aaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbb" - k2 = "abababababababababababababababababababab" - k3 = "cccccccccccccccccccccccccccccccccccccccc" + 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)

1 0

[bridgedb/develop] Decrease log noisiness of bridgedb.bridges.Flags.update().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 3a098fcb6e623e5b0492f9727cb31204fc17a48d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:46:16 2014 +0000 Decrease log noisiness of bridgedb.bridges.Flags.update(). --- lib/bridgedb/bridges.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 5c92898..52abc35 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -118,8 +118,10 @@ class Flags(object): self.stable = 'Stable' in flags self.valid = 'Valid' in flags - if self.fast or self.guard or self.running or self.stable or self.valid: - logging.debug("Parsed Flags: %s" % ' '.join(flags)) + if not self.running: + logging.debug("Bridge doesn't have the Running flag.") + if not self.stable: + logging.debug("Bridge doesn't have the Stable flag.") class PluggableTransport(object):

1 0

[bridgedb/develop] Change Bridge.__str__() to identify bridges as the ControlPort does.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 928ca525105146657c0f6addadd56332fefad85d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:56:09 2014 +0000 Change Bridge.__str__() to identify bridges as the ControlPort does. --- lib/bridgedb/bridges.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index f612565..71afe3b 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -799,18 +799,19 @@ class Bridge(BridgeBackwardsCompatibility): :data:`nickname```.$``:data:`fingerprint`. """ nickname = self.nickname if self.nickname else 'Unnamed' - separator = '.$' + prefix = '$' + separator = "~" fingerprint = self.fingerprint if safelog.safe_logging: - separator = '.$$' + prefix = '$$' if fingerprint: - fingerprint = hashlib.sha1(fingerprint).hexdigest() + fingerprint = hashlib.sha1(fingerprint).hexdigest().upper() if not fingerprint: fingerprint = '0' * 40 - return nickname + separator + fingerprint + return prefix + fingerprint + separator + nickname def _checkServerDescriptor(self, descriptor): # If we're parsing the server-descriptor, require a networkstatus

1 0

[bridgedb/develop] Change Filters.filterBridgeByIPv[46]() to use bridge.allVanillaAddresses.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 1ffd43fe9f14d03cf3ca49286b3b5570bc361b5d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:41:42 2014 +0000 Change Filters.filterBridgeByIPv[46]() to use bridge.allVanillaAddresses. Using bridge.or_addresses is deprecated. --- lib/bridgedb/Filters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index f22fcc7..1a8a8d8 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -55,8 +55,8 @@ def filterBridgesByIP4(bridge): except ValueError: pass - for k in bridge.or_addresses.keys(): - if type(k) is IPv4Address: + for address, port, version in bridge.allVanillaAddresses: + if version == 4: return True return False setattr(filterBridgesByIP4, "description", "ip=4") @@ -67,8 +67,8 @@ def filterBridgesByIP6(bridge): except ValueError: pass - for k in bridge.or_addresses.keys(): - if type(k) is IPv6Address: + for address, port, version in bridge.allVanillaAddresses: + if version == 6: return True return False setattr(filterBridgesByIP6, "description", "ip=6")

1 0

[bridgedb/develop] Only parse PT args if there is an arg present.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit a7da6a642290d1ce2c9eb2d8545dc6a30b1d170c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:55:15 2014 +0000 Only parse PT args if there is an arg present. --- lib/bridgedb/bridges.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 4968988..735c603 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -312,13 +312,14 @@ class PluggableTransport(BridgeAddressBase): allArguments = ','.join(argumentList) for arg in allArguments.split(','): - try: - key, value = arg.split('=') - except ValueError: - logging.warn(" Couldn't parse K=V from PT arg: %r" % arg) - else: - logging.debug(" Parsed PT Argument: %s: %s" % (key, value)) - argDict[key] = value + if arg: # It might be an empty string + try: + key, value = arg.split('=') + except ValueError: + logging.warn(" Couldn't parse K=V from PT arg: %r" % arg) + else: + logging.debug(" Parsed PT Argument: %s: %s" % (key, value)) + argDict[key] = value return argDict

1 0

[bridgedb/develop] Use new bridgedb.bridges.Bridge API in bridgedb.Stability.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit d3629539b38764a785b5027091fa8a1536eeaf06 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:45:20 2014 +0000 Use new bridgedb.bridges.Bridge API in bridgedb.Stability. --- lib/bridgedb/Stability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Stability.py b/lib/bridgedb/Stability.py index 4c3777d..981e005 100644 --- a/lib/bridgedb/Stability.py +++ b/lib/bridgedb/Stability.py @@ -143,7 +143,7 @@ def addOrUpdateBridgeHistory(bridge, timestamp): lastSeenWithThisAddressAndPort = timestamp * long(1000) bhe = BridgeHistory( - bridge.fingerprint, bridge.ip, bridge.orport, + bridge.fingerprint, bridge.address, bridge.orPort, 0,#weightedUptime 0,#weightedTime 0,#weightedRunLength

1 0

[bridgedb/develop] Refactor Bridge.updateFromExtraInfoDescriptor() transport handling code.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit ff1349df3b04225ce62358b39ad2f94cce039f27 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:58:54 2014 +0000 Refactor Bridge.updateFromExtraInfoDescriptor() transport handling code. --- lib/bridgedb/bridges.py | 91 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 71afe3b..4327f28 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1449,6 +1449,21 @@ class Bridge(BridgeBackwardsCompatibility): def updateFromExtraInfoDescriptor(self, descriptor, verify=True): """Update this bridge's information from an extrainfo descriptor. + Stem's + :api:`stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` + parses extrainfo ``transport`` lines into a dictionary with the + following structure:: + + {u'obfs2': (u'34.230.223.87', 37339, []), + u'obfs3': (u'34.230.223.87', 37338, []), + u'obfs4': (u'34.230.223.87', 37341, [ + (u'iat-mode=0,' + u'node-id=2a79f14120945873482b7823caabe2fcde848722,' + u'public-key=0a5b046d07f6f971b7776de682f57c5b9cdc8fa060db7ef59de82e721c8098f4')]), + u'scramblesuit': (u'34.230.223.87', 37340, [ + u'password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567'])} + + .. todo:: The ``transport`` attribute of Stem's ``BridgeExtraInfoDescriptor`` class is a dictionary that uses the Pluggable Transport's eype as the keys. Meaning that if a bridge @@ -1473,36 +1488,54 @@ class Bridge(BridgeBackwardsCompatibility): self.descriptors['extrainfo'] = descriptor - updatedTransports = [] + oldTransports = self.transports[:] + + for methodname, (address, port, args) in descriptor.transport.items(): + updated = False + # See if we already know about this transport. If so, update its + # info; otherwise, add a new transport below. + for pt in self.transports: + if pt.methodname == methodname: + + logging.info("Found old %s transport for %s... Updating..." + % (methodname, self)) + + if not (address == str(pt.address)) and (port == pt.port): + logging.info(("Address/port for %s transport for " + "%s changed: old=%s:%s new=%s:%s") + % (methodname, self, pt.address, pt.port, + address, port)) + + oldTransports.remove(pt) + pt.updateFromStemTransport(str(self.fingerprint), + methodname, + (address, port, args,)) + updated = True + break + + if updated: + continue + else: + # We didn't update it. It must be a new transport for this + # bridges that we're hearing about for the first time, so add + # it: + logging.info( + "Received new %s pluggable transport for bridge %s." + % (methodname, safelog.logSafely(self.fingerprint))) + transport = PluggableTransport() + transport.updateFromStemTransport(str(self.fingerprint), + methodname, + (address, port, args,)) + self.transports.append(transport) + + # These are the pluggable transports which we knew about before, which + # however were not updated in this descriptor, ergo the bridge must + # not have them any more: + for pt in oldTransports: + logging.info("Removing dead transport for bridge %s: %s %s:%s %s" % + (self, pt.methodname, pt.address, pt.port, pt.arguments)) + self.transports.remove(pt) - for transport in self.transports: - for methodname, kitchenSink in descriptor.transport: - if transport.methodname == methodname: - if transport.address == kitchenSink[0]: - logging.info( - "Updating %s pluggable transport for bridge %s." % - (methodname, safelog.logSafely(self.fingerprint))) - updatedTransports.append(transport) - transport.updateFromStemTransport(self.fingerprint, - methodname, - kitchenSink) - else: - logging.info( - ("Received new %s pluggable transport for bridge " - "%s.") % - (methodname, safelog.logSafely(self.fingerprint))) - pt = PluggableTransport() - pt.updateFromStemTransport(self.fingerprint, - methodname, - kitchenSink) - updatedTransports.append(pt) - self.transports.append(pt) - - dead = set(self.transports).difference(set(updatedTransports)) - logging.info("The following transports for bridge %s died: %s" - % (self, ' '.join(dead))) - for died in dead: - self.transports.remove(died) # Bridge Stability (`#5482 <https://bugs.torproject.org>`_) properties. @property

1 0