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

[bridgedb/develop] Move fingerprint and address properties to new BridgeAddressBase class.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 6ae93e5a0f5ef422f68ecf3e67aa83669f63b947 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:51:09 2014 +0000 Move fingerprint and address properties to new BridgeAddressBase class. This class is now the base for both the PluggableTransport class and the BridgeBase class, since both Bridges and PluggableTransports have addresses and fingerprints which should be checked for spec conformity. * ADD new bridgedb.bridges.BridgesAddressBase class. --- lib/bridgedb/bridges.py | 217 +++++++++++++++++++++++++++++++---------------- 1 file changed, 146 insertions(+), 71 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 52abc35..61ea860 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -124,7 +124,82 @@ class Flags(object): logging.debug("Bridge doesn't have the Stable flag.") -class PluggableTransport(object): +class BridgeAddressBase(object): + """A base class for describing one of a :class:`Bridge`'s or a + :class:`PluggableTransport`'s location, including its identity key + fingerprint and IP address. + + :type fingerprint: str + :ivar fingerprint: The uppercased, hexadecimal fingerprint of the identity + key of the parent bridge running this pluggable transport instance, + i.e. the main ORPort bridge whose ``@type bridge-server-descriptor`` + contains a hash digest for a ``@type bridge-extrainfo-document``, the + latter of which contains the parameter of this pluggable transport in + its ``transport`` line. + + :type address: ``ipaddr.IPv4Address`` or ``ipaddr.IPv6Address`` + :ivar address: The IP address of :class:`Bridge` or one of its + :class:`PluggableTransport`s. + """ + + def __init__(self): + self._fingerprint = None + self._address = None + + @property + def fingerprint(self): + """Get this Bridge's fingerprint. + + :rtype: str + :returns: A 40-character hexadecimal formatted string representation + of the SHA-1 hash digest of the public half of this Bridge's + identity key. + """ + return self._fingerprint + + @fingerprint.setter + def fingerprint(self, value): + """Set this Bridge's fingerprint to **value**. + + .. info: The purported fingerprint will be checked for specification + conformity with + :func:`~bridgedb.parse.fingerprint.isValidFingerprint`. + + :param str value: The fingerprint for this Bridge. + """ + if value and isValidFingerprint(value): + self._fingerprint = value.upper() + + @fingerprint.deleter + def fingerprint(self): + """Reset this Bridge's fingerprint.""" + self._fingerprint = None + + @property + def address(self): + """Get this bridge's address. + + :rtype: :class:`~ipaddr.IPv4Address` or :class:`~ipaddr.IPv6Address` + :returns: The bridge's address. + """ + return self._address + + @address.setter + def address(self, value): + """Set this Bridge's address. + + :param value: The main ORPort IP address of this bridge. + """ + if value and isValidIP(value): # XXX only conditionally set _address? + self._address = isIPAddress(value, compressed=False) + + @address.deleter + def address(self): + """Reset this Bridge's address to ``None``.""" + self._address = None + + +class PluggableTransport(BridgeAddressBase): """A single instance of a Pluggable Transport (PT) offered by a :class:`Bridge`. @@ -194,6 +269,11 @@ class PluggableTransport(object): which must be distributed to the client out-of-band. See :data:`arguments`. """ + super(PluggableTransport, self).__init__() + self._port = None + self._methodname = None + self._arguments = None + self.fingerprint = fingerprint self.address = address self.port = port @@ -248,49 +328,58 @@ class PluggableTransport(object): We currently check that: - 1. The :data:`fingerprint` is valid, according to - :func:`~bridgedb.parse.fingerprint.isValidFingerprint`. - - 2. The :data:`address` is valid, according to - :func:`~bridgedb.parse.addr.isValidIP`. - - 3. The :data:`port` is an integer, and that it is between the values + 1. The :data:`port` is an integer, and that it is between the values of ``0`` and ``65535`` (inclusive). - 4. The :data:`arguments` is a dictionary. + 2. The :data:`arguments` is a dictionary. :raises MalformedPluggableTransport: if any of the above checks fails. """ - if not isValidFingerprint(self.fingerprint): + if not self.fingerprint: raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with bad Bridge " - "fingerprint: %r.") % self.fingerprint) + ("Cannot create %s without owning Bridge fingerprint!") + % self.__class__.__name__) - valid = isValidIP(self.address) - if not valid: + if not self.address: raise InvalidPluggableTransportIP( ("Cannot create PluggableTransport with address '%s'. " "type(address)=%s.") % (self.address, type(self.address))) - self.address = ipaddr.IPAddress(self.address) - try: - # Coerce the port to be an integer: - self.port = int(self.port) - except (TypeError, ValueError): + if not self.port: raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with port type: %s.") - % type(self.port)) - else: - if not (0 <= self.port <= 65535): - raise MalformedPluggableTransport( - ("Cannot create PluggableTransport with out-of-range port:" - " %r.") % self.port) + ("Cannot create PluggableTransport without a valid port.")) if not isinstance(self.arguments, dict): raise MalformedPluggableTransport( ("Cannot create PluggableTransport with arguments type: %s") % type(self.arguments)) + @property + def port(self): + """Get the port number which this ``PluggableTransport`` is listening + for incoming client connections on. + + :rtype: int or None + :returns: The port (as an int), if it is known and valid; otherwise, + returns ``None``. + """ + return self._port + + @port.setter + def port(self, value): + """Store the port number which this ``PluggableTransport`` is listening + for incoming client connections on. + + :param int value: The transport's port. + """ + if isinstance(value, int) and (0 <= value <= 65535): + self._port = value + + @port.deleter + def port(self): + """Reset this ``PluggableTransport``'s port to ``None``.""" + self._port = None + def getTransportLine(self, includeFingerprint=True, bridgePrefix=False): """Get a Bridge Line for this :class:`PluggableTransport`. @@ -376,22 +465,20 @@ class PluggableTransport(object): ``transport`` line in the bridge's extrainfo descriptor, which Stem puts into the 3-tuples shown in the example above. """ - self.fingerprint = fingerprint - self.methodname = methodname + self.fingerprint = str(fingerprint) + self.methodname = str(methodname) self.address = kitchenSink[0] - self.port = kitchenSink[1] + self.port = int(kitchenSink[1]) self.arguments = self._parseArgumentsIntoDict(kitchenSink[2]) self._runChecks() -class BridgeBase(object): +class BridgeBase(BridgeAddressBase): """The base class for all bridge implementations.""" def __init__(self): - self._fingerprint = None self._nickname = None - self.address = None - self.orPort = None + self._orPort = None self.socksPort = 0 # Bridges should always have ``SOCKSPort`` and self.dirPort = 0 # ``DirPort`` set to ``0`` self.orAddresses = [] @@ -399,35 +486,6 @@ class BridgeBase(object): self.flags = Flags() @property - def fingerprint(self): - """Get this Bridge's fingerprint. - - :rtype: str - :returns: A 40-character hexadecimal formatted string representation - of the SHA-1 hash digest of the public half of this Bridge's - identity key. - """ - return self._fingerprint - - @fingerprint.setter - def fingerprint(self, value): - """Set this Bridge's fingerprint to **value**. - - .. info: The purported fingerprint will be checked for specification - conformity with - :func:`~bridgedb.parse.fingerprint.isValidFingerprint`. - - :param str value: The fingerprint for this Bridge. - """ - if isValidFingerprint(value): - self._fingerprint = value - - @fingerprint.deleter - def fingerprint(self): - """Reset this Bridge's fingerprint.""" - self._fingerprint = None - - @property def nickname(self): """Get this Bridge's nickname. @@ -450,6 +508,29 @@ class BridgeBase(object): """Reset this Bridge's nickname.""" self._nickname = None + @property + def orPort(self): + """Get this bridge's ORPort. + + :rtype: int + :returns: This Bridge's default ORPort. + """ + return self._orPort + + @orPort.setter + def orPort(self, value): + """Set this Bridge's ORPort. + + :param int value: The Bridge's ORPort. + """ + if isinstance(value, int) and (0 <= value <= 65535): + self._orPort = value + + @orPort.deleter + def orPort(self): + """Reset this Bridge's ORPort.""" + self._orPort = None + class BridgeBackwardsCompatibility(BridgeBase): """Backwards compatibility methods for the old Bridge class.""" @@ -487,12 +568,10 @@ class BridgeBackwardsCompatibility(BridgeBase): """Functionality for maintaining backwards compatibility with the older version of this class (see :class:`bridgedb.test.deprecated.Bridge`). """ - if nickname: - self.nickname = nickname # XXX check nickname spec conformity? + self.nickname = nickname + self.orPort = orPort if address: - self.address = address # XXX check validip? - if orPort: - self.orPort = orPort # XXX check validity? + self.address = address if idDigest: if not fingerprint: @@ -662,10 +741,6 @@ class Bridge(BridgeBackwardsCompatibility): """ super(Bridge, self).__init__(*args, **kwargs) - self.fingerprint = None - self.nickname = None - self.address = None - self.orPort = None self.socksPort = 0 # Bridges should always have ``SOCKSPort`` and self.dirPort = 0 # ``DirPort`` set to ``0`` self.orAddresses = []

1 0

[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