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

[bridgedb/develop] Change two log calls in bridgedb.bridges.Bridge to use Bridge.__str__().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 07288fb57ba855ee6821142a111db1c2e43c875d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 13 07:34:24 2015 +0000 Change two log calls in bridgedb.bridges.Bridge to use Bridge.__str__(). --- 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 9a0a0ff..54ffbe8 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1522,7 +1522,7 @@ class Bridge(… [View More]

1 0

[bridgedb/develop] Add unittest for Bridge._verifyExtraInfoSignature with a valid sig.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 38446439f0424a544412ac9a15b878eccd282206 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:34:15 2015 +0000 Add unittest for Bridge._verifyExtraInfoSignature with a valid sig. --- lib/bridgedb/test/test_bridges.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 11a9d64..9353d1c 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -… [View More]

1 0

[bridgedb/develop] Remove Bridges.getDescriptorDigests().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 016815deee25cfb27e474bb8f5be24af68ce0058 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 01:22:33 2015 +0000 Remove Bridges.getDescriptorDigests(). The functionality for checking the server-descriptor digest is now in bridgedb.bridges.Bridge.updateFromServerDescriptor(), which calls bridgedb.bridges.Bridge._checkServerDescriptor(). The digests are retrieved per-descriptor, during bridgedb.bridges.updateFromNetworkStatus(). * … [View More]REMOVE bridgedb.Bridges.getDescriptorDigests() function. --- lib/bridgedb/Bridges.py | 34 ---------------------------------- lib/bridgedb/test/test_bridges.py | 22 ---------------------- 2 files changed, 56 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 9e7c292..a8b0a4f 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -42,40 +42,6 @@ DIGEST_LEN = 20 PORTSPEC_LEN = 16 -def getDescriptorDigests(desc): - """Return the SHA-1 hash hexdigests of all descriptor descs - - :param File desc: A string containing the contents of one - or more bridge descriptors concatenated - together. - :returns: A dict indexed by the SHA-1 hexdigest of the bridge - descriptor, equivalent to that which was published - on the 'r' line of the networkstatus for this bridge. - The value is the bridge's extra-info document digest, - or None, if not provided. - """ - if not desc: return None - - descriptors = {} - sha1hash = hashlib.sha1() - ei_digest = None - - for line in desc: - if line != '-----BEGIN SIGNATURE-----\n': - sha1hash.update(line) - if line.startswith('extra-info-digest'): - parts = line.split() - if len(parts) == 2: - ei_digest = parts[1].lower() - else: - digest = sha1hash.hexdigest().lower() - descriptors[digest] = ei_digest - while line != '-----END SIGNATURE-----\n': - line = next(desc) - sha1hash = hashlib.sha1() - ei_digest = None - return descriptors - def getExtraInfoDigests(doc): """Return the SHA-1 hash hexdigests of all extra-info documents diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index c481578..aff6e65 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -134,7 +134,6 @@ class BridgeIntegrationTests(unittest.TestCase): test_getConfigLine_vanilla_withoutFingerprint test_integration_getConfigLine_vanilla_withoutFingerprint test_getConfigLine_vanilla_withFingerprint test_integration_getConfigLine_vanilla_withFingerprint test_getConfigLine_scramblesuit_withFingeprint test_integration_getConfigLine_scramblesuit_withFingerprint - test_getDescriptorDigests test_integration_getDescriptorDigests test_getExtraInfoDigests test_integration_getExtraInfoDigests test_splitterBridgeInsertion test_integration_splitterBridgeInsertion ============================================== ======================== @@ -287,27 +286,6 @@ class BridgeIntegrationTests(unittest.TestCase): % (self.fingerprint, ptArgsList), bridgeLine) - def test_integration_getDescriptorDigests(self): - raise unittest.SkipTest( - ("The functions getDescriptorDigests() and getExtraInfoDigests() " - "have not been refactored into the new bridgedb.bridges module " - "because it's not clear yet if they're necessary. Skip these " - "tests for now.")) - - sha1hash = hashlib.sha1() - ei_digest = 'abcdefghijklmno' - - test = "this is a test line\nFollowed by another\n" - test += "extra-info-digest %s\n" % ei_digest - sha1hash.update(test) - digest = sha1hash.hexdigest() - test += "-----BEGIN SIGNATURE-----\n" - test += "This is a test line that should be skipped\n" - test += "-----END SIGNATURE-----\n" - digests = bridges.getDescriptorDigests(io.StringIO(test)) - self.failUnlessIn(digest, digests) - self.failUnlessEqual(ei_digest, digests[digest]) - def test_integration_getExtraInfoDigests(self): raise unittest.SkipTest( ("The functions getDescriptorDigests() and getExtraInfoDigests() " [View Less]

1 0

[bridgedb/develop] Add unittest for parseNetworkStatusFile() with a bad router nickname.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit fe5a4a64db3a73127a2a6cba474b6f5a7a753962 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:41:00 2015 +0000 Add unittest for parseNetworkStatusFile() with a bad router nickname. --- lib/bridgedb/test/test_parse_descriptors.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 738360f..d67ff88 100644 --- a/lib/bridgedb/test/… [View More]

1 0

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

19 Feb '15

commit b7d70cde5c0fddd27551e8768d4503266455d0eb Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Dec 22 03:42:14 2014 +0000 Use new bridgedb.bridges.Bridge API in bridgedb.Storage. --- lib/bridgedb/Storage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index ab0bf74..1efb139 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -175,14 +175,15 @@ class Database(object): … [View More]

1 0

[bridgedb/develop] Monkeypatch old Bridge class into one run of the legacy regression tests.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit b9be34e53447a522fb83bf66fa492d4f324aab37 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Dec 22 03:44:04 2014 +0000 Monkeypatch old Bridge class into one run of the legacy regression tests. --- lib/bridgedb/test/test_Tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index 53d0e81..e78a4c4 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -97,6 +97,8 … [View More]

1 0

[bridgedb/develop] Add better logging to Filters.filterAssignBridgesToRing().
by isis＠torproject.org 19 Feb '15

19 Feb '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 =… [View More]

1 0

[bridgedb/develop] Use PluggableTransports._runChecks() only if initialised with params.
by isis＠torproject.org 19 Feb '15

19 Feb '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 … [View More]

1 0

[bridgedb/develop] Refactor Filters.filterBridgesByTransport().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit adb67e64ab65bee8cca6ff0638ab97772c474bc9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:59:53 2014 +0000 Refactor Filters.filterBridgesByTransport(). --- lib/bridgedb/Filters.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 4580c87..b7bac87 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -74,23 +74,34 @@ def … [View More]filterBridgesByIP6(bridge): setattr(filterBridgesByIP6, "description", "ip=6") def filterBridgesByTransport(methodname, addressClass=None): - if addressClass is None: addressClass = IPv4Address - assert (addressClass) in (IPv4Address, IPv6Address) + if not isinstance(addressClass, (IPv6Address, IPv4Address)): + addressClass = IPv4Address + ruleset = frozenset([methodname, addressClass]) try: return funcs[ruleset] except KeyError: - def f(bridge): + + def _filterByTransport(bridge): for transport in bridge.transports: - # ignore method name case - if isinstance(transport.address, addressClass) and \ - transport.methodname.lower() == methodname.lower(): return True + if isinstance(transport.address, addressClass): + # ignore method name case + if transport.methodname.lower() == methodname.lower(): + return True + else: + logging.debug(("Transport methodname '%s' doesn't match " + "requested methodname: '%s'.") + % (transport.methodname, methodname)) + else: + logging.debug(("Transport %s has incorrect address version " + "(%s).") % (transport, addressClass)) return False - f.__name__ = "filterBridgesByTransport(%s,%s)" % (methodname, - addressClass) - setattr(f, "description", "transport=%s"%methodname) - funcs[ruleset] = f - return f + + _filterByTransport.__name__ = ("filterBridgesByTransport(%s,%s)" + % (methodname, addressClass)) + setattr(_filterByTransport, "description", "transport=%s" % methodname) + funcs[ruleset] = _filterByTransport + return _filterByTransport def filterBridgesByNotBlockedIn(countryCode, addressClass=None, methodname=None): """ if at least one address:port of the selected addressClass and [View Less]

1 0

[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.… [View More]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 = [] [View Less]

1 0