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

[bridgedb/master] Add better logging to Filters.filterAssignBridgesToRing().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 6015cc35b9f54da04213e7198d2d2e515d7f7a5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:39:40 2014 +0000 Add better logging to Filters.filterAssignBridgesToRing(). --- lib/bridgedb/Filters.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 79d50f8..ab8b74a 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -10,21 +10,31 @@ funcs = {} def filterAssignBridgesToRing(hmac, numRings, assignedRing): #XXX: ruleset should have a key unique to this function # ruleset ensures that the same + logging.debug("Creating a filter for assigning bridges to hashrings...") ruleset = frozenset([hmac, numRings, assignedRing]) + logging.debug("Filter created: %s" % ruleset) + try: return funcs[ruleset] except KeyError: - def f(bridge): - digest = hmac(bridge.getID()) + def _assignBridgesToRing(bridge): + digest = hmac(bridge.fingerprint) pos = long( digest[:8], 16 ) which = pos % numRings - if which == assignedRing: return True - return False - f.__name__ = "filterAssignBridgesToRing(%s, %s, %s)" % (hmac, numRings, - assignedRing) - setattr(f, "description", "ring=%d" % assignedRing) - funcs[ruleset] = f - return f + + if which == assignedRing: + return True + else: + logging.debug(("Bridge %s has calculated assignment %d; not " + "in correct ring %d.") + % (bridge, which, assignedRing)) + return False + + _assignBridgesToRing.__name__ = ("filterAssignBridgesToRing(%s, %s, %s)" + % (hmac, numRings, assignedRing)) + setattr(_assignBridgesToRing, "description", "ring=%d" % assignedRing) + funcs[ruleset] = _assignBridgesToRing + return _assignBridgesToRing def filterBridgesByRules(rules): ruleset = frozenset(rules)

1 0

[bridgedb/master] Use new bridgedb.bridges.Bridge API in bridgedb.Bridges functions.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit af54441978c9c56e0cd2371b765ede53cb8ce93d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Dec 22 03:40:46 2014 +0000 Use new bridgedb.bridges.Bridge API in bridgedb.Bridges functions. --- lib/bridgedb/Bridges.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 1dd8dfa..43edc3d 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -22,6 +22,7 @@ import random import bridgedb.Storage import bridgedb.Bucket +from bridgedb.bridges import Bridge from bridgedb.crypto import getHMACFunc from bridgedb.parse import addr from bridgedb.parse import networkstatus @@ -409,11 +410,11 @@ class BridgeRing(BridgeHolder): """ for tp, val, _, subring in self.subrings: if tp == 'port': - if val == bridge.orport: + if val == bridge.orPort: subring.insert(bridge) else: assert tp == 'flag' and val == 'stable' - if val == 'stable' and bridge.stable: + if val == 'stable' and bridge.flags.stable: subring.insert(bridge) ident = bridge.getID() @@ -423,7 +424,7 @@ class BridgeRing(BridgeHolder): self.isSorted = False self.bridges[pos] = bridge self.bridgesByID[ident] = bridge - logging.debug("Adding %s to %s" % (bridge.ip, self.name)) + logging.debug("Adding %s to %s" % (bridge.address, self.name)) def _sort(self): """Helper: put the keys in sorted order.""" @@ -592,7 +593,7 @@ class UnallocatedHolder(BridgeHolder): self.fingerprints = [] def insert(self, bridge): - logging.debug("Leaving %s unallocated", bridge.getConfigLine(True)) + logging.debug("Leaving %s unallocated", bridge.fingerprint) if not bridge.fingerprint in self.fingerprints: self.fingerprints.append(bridge.fingerprint) @@ -670,10 +671,12 @@ class BridgeSplitter(BridgeHolder): for s in self.statsHolders: s.insert(bridge) - if not bridge.running: + + # The bridge must be running to insert it: + if not bridge.flags.running: return - bridgeID = bridge.getID() + bridgeID = bridge.fingerprint # Determine which ring to put this bridge in if we haven't seen it # before. @@ -753,7 +756,8 @@ class FilteredBridgeSplitter(BridgeHolder): :type bridge: :class:`~bridgedb.Bridges.Bridge` :param bridge: The bridge to add. """ - if not bridge.running: + # The bridge must be running to insert it: + if not bridge.flags.running: logging.warn( "Skipping hashring insertion for non-running bridge: '%s'" % logSafely(bridge.fingerprint)) @@ -879,8 +883,7 @@ class FilteredBridgeSplitter(BridgeHolder): desc.append(g.description) # add transports - logging.debug("%s supports %d transports" % (toHex(b.getID()), - len(b.transports))) + logging.debug("%s supports %d transports" % (b, len(b.transports))) for transport in b.transports: desc.append("transport=%s"%(transport.methodname))

1 0

[bridgedb/master] Change Filters.filterBridgeByIPv[46]() to use bridge.allVanillaAddresses.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Use new bridgedb.bridges.Bridge API in bridgedb.Stability.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Move fingerprint and address properties to new BridgeAddressBase class.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Decrease log noisiness of bridgedb.bridges.Flags.update().
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Use PluggableTransports._runChecks() only if initialised with params.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4cba2a52d777f4a1e330fcd6940d495d049b4df0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:53:38 2014 +0000 Use PluggableTransports._runChecks() only if initialised with params. --- lib/bridgedb/bridges.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 61ea860..4968988 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -285,8 +285,7 @@ class PluggableTransport(BridgeAddressBase): # parameters, or use the ``updateFromStemTransport()`` method, we'll # only use the ``_runChecks()`` method now if we were initialised with # parameters: - if (self.fingerprint or self.address or self.port or - self.methodname or self.arguments): + if (fingerprint or address or port or methodname or arguments): self._runChecks() def _parseArgumentsIntoDict(self, argumentList):

1 0

[bridgedb/master] Only parse PT args if there is an arg present.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Fix legacy_Tests.py to use uppercased bridge.fingerprints.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] PEP8 whitespace fix in Bridges.py.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 61aa46585bfef18dfb20a817b94f779f4c5e56f0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 09:11:06 2014 +0000 PEP8 whitespace fix in Bridges.py. --- lib/bridgedb/Bridges.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index b6c51d4..a5d142f 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -706,6 +706,7 @@ class BridgeSplitter(BridgeHolder): for name,ring in self.ringsByName.iteritems(): ring.dumpAssignments(f, "%s %s" % (description, name)) + class FilteredBridgeSplitter(BridgeHolder): """A configurable BridgeHolder that filters bridges into subrings.

1 0