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

[bridgedb/master] Add missing super() call in BridgeBase.__init__().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit e81580aa7abd5dd4ba246860489c957ccc903027 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:07:56 2015 +0000 Add missing super() call in BridgeBase.__init__(). --- lib/bridgedb/bridges.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 54ffbe8..901baf5 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -482,6 +482,8 @@ class BridgeBase(BridgeAddressBase): """The base class for all bridge implementations.""" def __init__(self): + super(BridgeBase, self).__init__() + self._nickname = None self._orPort = None self.socksPort = 0 # Bridges should always have ``SOCKSPort`` and

1 0

[bridgedb/master] Add test for b.p.d.parseNetworkStatusFile() with IPv6 primary ORAddress.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4a4d2ec746ef277e3a915eeb895a5ae104098cce Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:14:58 2015 +0000 Add test for b.p.d.parseNetworkStatusFile() with IPv6 primary ORAddress. --- lib/bridgedb/test/test_parse_descriptors.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 6395fdb..6a04861 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -286,6 +286,18 @@ class ParseDescriptorsTests(unittest.TestCase): descriptors.parseNetworkStatusFile, descFile) + def test_parse_descriptors_parseNetworkStatusFile_IPv6_ORAddress(self): + """A Bridge can't have its primary ORAddress be IPv6 without raising + a ValueError. + """ + unparseable = BRIDGE_NETWORKSTATUS_0.replace( + '2.215.61.223', '[2837:fcd2:387b:e376:34c:1ec7:11ff:1686]') + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + unparseable) + self.assertRaises(ValueError, + descriptors.parseNetworkStatusFile, + descFile) + def test_parse_descriptors_parseNetworkStatusFile_with_annotations(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with some document headers before the first 'r'-line.

1 0

[bridgedb/master] Add several tests for Bridge.getBridgeLine() with many request types.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4600b58f0a1fa4b6e8aa490d2eb80802af658587 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:14:21 2015 +0000 Add several tests for Bridge.getBridgeLine() with many request types. --- lib/bridgedb/test/test_bridges.py | 157 +++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 7368b8d..c305c10 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -1080,3 +1080,160 @@ class BridgeTests(unittest.TestCase): # All values are bad (even though IPv5 is a thing): self.bridge.orAddresses.append(('999.999.999.999', -1, 5)) self.assertRaises(bridges.MalformedBridgeInfo, self.bridge.assertOK) + + def test_Bridge_getBridgeLine_request_valid(self): + """Calling getBridgeLine with a valid request should return a bridge + line. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getBridgeLine_request_invalid(self): + """Calling getBridgeLine with an invalid request should return None.""" + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(False) + + self.assertIsNone(self.bridge.getBridgeLine(request)) + + def test_Bridge_getBridgeLine_no_vanilla_addresses(self): + """Calling getBridgeLine() on a Bridge without any vanilla addresses + should return None. + """ + request = BridgeRequestBase() + request.isValid(True) + + self.assertIsNone(self.bridge.getBridgeLine(request)) + + def test_Bridge_getBridgeLine_request_without_block_in_IR(self): + """Calling getBridgeLine() with a valid request for bridges not blocked + in Iran should return a bridge line. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withoutBlockInCountry('IR') + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getBridgeLine_IPv6(self): + """Calling getBridgeLine() with a valid request for IPv6 bridges + should return a bridge line. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withIPv6() + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertTrue( + line.startswith('[6bf3:806b:78cd:d4b4:f6a7:4ced:cfad:dad4]:36488')) + self.assertNotIn('179.178.155.140:36493', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getBridgeLine_obfs4(self): + """ """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withPluggableTransportType('obfs4') + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36493', line) + self.assertTrue(line.startswith('obfs4')) + self.assertIn('iat-mode', line) + self.assertIn('public-key', line) + self.assertIn('node-id', line) + + def test_Bridge_getBridgeLine_obfs3_IPv6(self): + """Calling getBridgeLine() with a request for IPv6 obfs3 bridges (when + the Bridge doesn't have any) should raise a + PluggableTransportUnavailable exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withIPv6() + request.withPluggableTransportType('obfs3') + + self.assertRaises(bridges.PluggableTransportUnavailable, + self.bridge.getBridgeLine, + request) + + def test_Bridge_getBridgeLine_googlygooglybegone(self): + """Calling getBridgeLine() with a request for an unknown PT should + raise a PluggableTransportUnavailable exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withPluggableTransportType('googlygooglybegone') + + self.assertRaises(bridges.PluggableTransportUnavailable, + self.bridge.getBridgeLine, + request) + + def test_Bridge_getBridgeLine_bridge_prefix(self): + """Calling getBridgeLine() with bridgePrefix=True should prefix the + returned bridge line with 'Bridge '. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + line = self.bridge.getBridgeLine(request, bridgePrefix=True) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + self.assertTrue(line.startswith('Bridge')) + + def test_Bridge_getBridgeLine_no_include_fingerprint(self): + """Calling getBridgeLine() with includeFingerprint=False should return + a bridge line without a fingerprint. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + line = self.bridge.getBridgeLine(request, includeFingerprint=False) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertNotIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line)

1 0

[bridgedb/master] Add MissingServerDescriptorDigest exception class.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 2d5d42dbcd04498435eae99f9682295ac354d706 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:43:44 2014 +0000 Add MissingServerDescriptorDigest exception class. --- lib/bridgedb/bridges.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 6268f6d..459e86a 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -52,6 +52,12 @@ class MalformedPluggableTransport(MalformedBridgeInfo): class InvalidPluggableTransportIP(MalformedBridgeInfo): """Raised when a :class:`PluggableTransport` has an invalid address.""" +class MissingServerDescriptorDigest(MalformedBridgeInfo): + """Raised when the hash digest for an ``@type bridge-server-descriptor`` + (which should be in the corresponding ``@type bridge-networkstatus`` + document), was missing. + """ + class ServerDescriptorDigestMismatch(MalformedBridgeInfo): """Raised when the digest in an ``@type bridge-networkstatus`` document doesn't match the hash digest of the ``@type bridge-server-descriptor``'s

1 0

[bridgedb/master] Change usage of Bridge.allVanillaAddresses to use new 3-tuple form.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 0680b5e89aa421778b7659497243a2e788b7a97e Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:50:39 2014 +0000 Change usage of Bridge.allVanillaAddresses to use new 3-tuple form. --- lib/bridgedb/bridges.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 899a091..48dc33a 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -28,6 +28,7 @@ from bridgedb import safelog from bridgedb import bridgerequest from bridgedb.crypto import removePKCS1Padding from bridgedb.parse.addr import isIPAddress +from bridgedb.parse.addr import isIPv4 from bridgedb.parse.addr import isIPv6 from bridgedb.parse.addr import isValidIP from bridgedb.parse.addr import PortList @@ -887,7 +888,10 @@ class Bridge(BridgeBackwardsCompatibility): """ addresses = self.orAddresses # Add the default ORPort address: - addresses.append((self.address, self.orPort,)) + if isIPv4(self.address): + addresses.append((self.address, self.orPort, 4)) + elif isIPv6(self.address): + addresses.append((self.address, self.orPort, 6)) return addresses def assertOK(self): @@ -916,11 +920,13 @@ class Bridge(BridgeBackwardsCompatibility): malformed.append("Invalid ORPort address: '%s'" % self.address) if not (1 <= self.orPort <= 65535): malformed.append("Invalid ORPort port: '%d'" % self.orPort) - for (address, port) in self.orAddresses: + for (address, port, version) in self.orAddresses: if not isValidIP(address): malformed.append("Invalid ORAddress address: '%s'" % address) if not (1 <= port <= 65535): malformed.append("Invalid ORAddress port: '%d'" % port) + if not version in (4, 6): + malformed.append("Invalid ORAddress IP version: %r" % version) if malformed: raise MalformedBridgeInfo('\n'.join(malformed))

1 0

[bridgedb/master] Move Bridge backwards compat code into new base classes.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit c031cafea281f0b46d68657f3d194785b788562b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:45:08 2014 +0000 Move Bridge backwards compat code into new base classes. This changes the behaviour, such that if BridgeBackwardsCompatibility is inherited from, then the compatibility methods and attributes are always available, no matter how the class was instantiated (i.e. the old method, Bridge.getID() is always available). However, the assertions and errors raised in the BridgeBackwardsCompatiblity._backwardsCompatible method are only run *if* the inherited class is instantiated *with* arguments (as was the legacy manner of doing things). * ADD bridges.BridgeBase and bridges.BridgeBackwardsCompatibility classes. --- lib/bridgedb/bridges.py | 310 ++++++++++++++++++++++++++--------------------- 1 file changed, 170 insertions(+), 140 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 459e86a..fae5d19 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -380,7 +380,173 @@ class PluggableTransport(object): self._runChecks() -class Bridge(object): +class BridgeBase(object): + """The base class for all bridge implementations.""" + + def __init__(self): + 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 = [] + self.transports = [] + self.flags = Flags() + + +class BridgeBackwardsCompatibility(BridgeBase): + """Backwards compatibility methods for the old Bridge class.""" + + def __init__(self, nickname=None, ip=None, orport=None, + fingerprint=None, id_digest=None, or_addresses=None): + """Create a Bridge which is backwards compatible with the old Bridge class + implementation. + + .. info: For backwards compatibility, `nickname`, `ip`, and `orport` + must be the first, second, and third arguments, respectively. The + `fingerprint` and `id_digest` were previously kwargs, and are also + provided for backwards compatibility. New calls to + :meth:`__init__` *should* avoid using these kwargs, and instead + use the methods :meth:`updateFromNetworkStatus`, + :meth:`updateFromServerDescriptor`, and + :meth:`updateFromExtraInfoDescriptor`. + """ + super(BridgeBackwardsCompatibility, self).__init__() + + self.desc_digest = None + self.ei_digest = None + self.running = False + self.stable = False + + if nickname or ip or orport or fingerprint or id_digest: + self._backwardsCompatible(nickname=nickname, address=ip, + orPort=orport, fingerprint=fingerprint, + idDigest=id_digest, + orAddresses=or_addresses) + + def _backwardsCompatible(self, nickname=None, address=None, orPort=None, + fingerprint=None, idDigest=None, + orAddresses=None): + """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? + if address: + self.address = address # XXX check validip? + if orPort: + self.orPort = orPort # XXX check validity? + + if idDigest: + if not fingerprint: + if not len(idDigest) == 20: + raise TypeError("Bridge with invalid ID") + self.fingerprint = toHex(idDigest) + elif fingerprint: + if not isValidFingerprint(fingerprint): + raise TypeError("Bridge with invalid fingerprint (%r)" + % fingerprint) + self.fingerprint = fingerprint.lower() + else: + raise TypeError("Bridge with no ID") + + if orAddresses and isinstance(orAddresses, dict): + for ip, portlist in orAddresses.items(): + validAddress = isIPAddress(ip, compressed=False) + if validAddress: + # The old code expected a `bridgedb.parse.addr.PortList`: + if isinstance(portlist, PortList): + for port in portlist.ports: + self.orAddresses.append( + (validAddress, port, validAddress.version,)) + elif isinstance(portlist, int): + self.orAddresses.append( + (validAddress, portlist, validAddress.version,)) + else: + logging.warn("Can't parse port for ORAddress %r: %r" + % (ip, portlist)) + + def getID(self): + """Get the binary encoded form of this ``Bridge``'s ``fingerprint``. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + if self.fingerprint: + return fromHex(self.fingerprint) + + def setDescriptorDigest(self, digest): + """Set this ``Bridge``'s server-descriptor digest. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + self.desc_digest = digest # old attribute for backwards compat + self.descriptorDigest = digest # new attribute + + def setExtraInfoDigest(self, digest): + """Set this ``Bridge``'s extrainfo digest. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + self.ei_digest = digest # old attribute for backwards compat + self.extrainfoDigest = digest # new attribute + + def setStatus(self, running=None, stable=None): + """Set this ``Bridge``'s "Running" and "Stable" flags. + + This method is provided for backwards compatibility and should not + be relied upon. + """ + if running is not None: + self.running = bool(running) + self.flags.running = bool(running) + if stable is not None: + self.stable = bool(stable) + self.flags.stable = bool(running) + + def getConfigLine(self, includeFingerprint=False, addressClass=None, + request=None, transport=None): + """Get a vanilla bridge line for this ``Bridge``. + + This method is provided for backwards compatibility and should not + be relied upon. + + The old ``bridgedb.Bridges.Bridge.getConfigLine()`` method didn't know + about :class:`~bridgedb.bridgerequest.BridgeRequestBase`s, and so this + modified version is backwards compatible by creating a + :class:`~bridgedb.bridgerequest.BridgeRequestBase` for + :meth:`getBridgeLine`. The default parameters are the same as they + were in the old ``bridgedb.Bridges.Bridge`` class. + + :param bool includeFingerprint: If ``True``, include the + ``fingerprint`` of this :class:`Bridge` in the returned bridge + line. + :type addressClass: :class:`ipaddr.IPv4Address` or + :class:`ipaddr.IPv6Address`. + :param addressClass: Type of address to choose. + :param str request: A string unique to this request e.g. email-address + or ``uniformMap(ip)`` or ``'default'``. In this case, this is not + a :class:`~bridgerequest.BridgeRequestBase` (as might be expected) + but the equivalent of + :data:`bridgerequest.BridgeRequestBase.client`. + :param str transport: A pluggable transport method name. + """ + bridgeRequest = bridgerequest.BridgeRequestBase(addressClass) + bridgeRequest.client = request if request else bridgeRequest.client + bridgeRequest.isValid(True) + + if transport: + bridgeRequest.withPluggableTransportType(transport) + + bridgeRequest.generateFilters() + bridgeLine = self.getBridgeLine(bridgeRequest, includeFingerprint) + return bridgeLine + + +class Bridge(BridgeBackwardsCompatibility): """A single bridge, and all the information we have for it. :type fingerprint: str or None @@ -426,10 +592,7 @@ class Bridge(object): #: created with the ``signing-key`` contained in that descriptor. _checkServerDescriptorSignature = True - def __init__(self, - # for backwards compatibility: - nickname=None, ip=None, orport=None, - fingerprint=None, id_digest=None, or_addresses=None): + def __init__(self, *args, **kwargs): """Create a and store information for a new ``Bridge``. .. info: For backwards compatibility, `nickname`, `ip`, and `orport` @@ -441,6 +604,8 @@ class Bridge(object): :meth:`updateFromServerDescriptor`, and :meth:`updateFromExtraInfoDescriptor`. """ + super(Bridge, self).__init__(*args, **kwargs) + self.fingerprint = None self.nickname = None self.address = None @@ -481,14 +646,6 @@ class Bridge(object): self.descriptorDigest = None self.extrainfoDigest = None - # For backwards compatibility with the old, deprecated version of this - # class: - if nickname or ip or orport or fingerprint or id_digest: - self._backwardsCompatible(nickname=nickname, address=ip, - orPort=orport, fingerprint=fingerprint, - idDigest=id_digest, - orAddresses=or_addresses) - def __str__(self): """Return a pretty string representation that identifies this Bridge. @@ -519,133 +676,6 @@ class Bridge(object): return nickname + separator + fingerprint - def _backwardsCompatible(self, nickname=None, address=None, orPort=None, - fingerprint=None, idDigest=None, - orAddresses=None): - """Functionality for maintaining backwards compatibility with the older - version of this class (see :class:`bridgedb.test.deprecated.Bridge`). - """ - def getID(): - """Get the binary encoded form of this ``Bridge``'s ``fingerprint``. - - This method is provided for backwards compatibility and should not - be relied upon. - """ - if self.fingerprint: - return fromHex(self.fingerprint) - self.getID = getID - - def setDescriptorDigest(digest): - """Set this ``Bridge``'s server-descriptor digest. - - This method is provided for backwards compatibility and should not - be relied upon. - """ - self.desc_digest = digest # old attribute for backwards compat - self.descriptorDigest = digest # new attribute - self.desc_digest = None - self.setDescriptorDigest = setDescriptorDigest - - def setExtraInfoDigest(digest): - """Set this ``Bridge``'s extrainfo digest. - - This method is provided for backwards compatibility and should not - be relied upon. - """ - self.ei_digest = digest # old attribute for backwards compat - self.extrainfoDigest = digest # new attribute - self.ei_digest = None - self.setExtraInfoDigest = setExtraInfoDigest - - def setStatus(running=None, stable=None): - """Set this ``Bridge``'s "Running" and "Stable" flags. - - This method is provided for backwards compatibility and should not - be relied upon. - """ - if running is not None: - self.running = bool(running) - self.flags.running = bool(running) - if stable is not None: - self.stable = bool(stable) - self.flags.stable = bool(running) - self.running = False - self.stable = False - self.setStatus = setStatus - - def getConfigLine(includeFingerprint=False, addressClass=None, - request=None, transport=None): - """Get a vanilla bridge line for this ``Bridge``. - - This method is provided for backwards compatibility and should not - be relied upon. - - The old ``bridgedb.Bridges.Bridge.getConfigLine()`` method didn't - know about :class:`~bridgedb.bridgerequest.BridgeRequestBase`s, - and so this modified version is backwards compatible by creating a - :class:`~bridgedb.bridgerequest.BridgeRequestBase` for - :meth:`getBridgeLine`. The default parameters are the same as they - were in the old ``bridgedb.Bridges.Bridge`` class. - - :param bool includeFingerprint: If ``True``, include the - ``fingerprint`` of this :class:`Bridge` in the returned bridge - line. - :type addressClass: :class:`ipaddr.IPv4Address` or - :class:`ipaddr.IPv6Address`. - :param addressClass: Type of address to choose. - :param str request: A string unique to this request - e.g. email-address or ``uniformMap(ip)`` or ``'default'``. In - this case, this is not a - :class:`~bridgerequest.BridgeRequestBase` (as might be - expected) but the equivalent of - :data:`bridgerequest.BridgeRequestBase.client`. - :param str transport: A pluggable transport method name. - """ - bridgeRequest = bridgerequest.BridgeRequestBase(addressClass) - bridgeRequest.client = request if request else bridgeRequest.client - bridgeRequest.isValid(True) - - if transport: - bridgeRequest.withPluggableTransportType(transport) - - bridgeRequest.generateFilters() - bridgeLine = self.getBridgeLine(bridgeRequest, includeFingerprint) - return bridgeLine - self.getConfigLine = getConfigLine - - if nickname: - self.nickname = nickname # XXX check nickname spec conformity? - if address: - self.address = address # XXX check validip? - if orPort: - self.orPort = orPort # XXX check validity? - - if idDigest: - if not fingerprint: - if not len(idDigest) == 20: - raise TypeError("Bridge with invalid ID") - self.fingerprint = toHex(idDigest) - elif fingerprint: - if not isValidFingerprint(fingerprint): - raise TypeError("Bridge with invalid fingerprint (%r)" - % fingerprint) - self.fingerprint = fingerprint.lower() - else: - raise TypeError("Bridge with no ID") - - if orAddresses and isinstance(orAddresses, dict): - for ip, portlist in orAddresses.items(): - validAddress = isIPAddress(ip, compressed=False) - if validAddress: - # The old code expected a `bridgedb.parse.addr.PortList`: - if isinstance(portlist, PortList): - for port in portlist.ports: - self.orAddresses.append( - (validAddress, port, validAddress.version,)) - else: - self.orAddresses.append( - (validAddress, port, validAddress.version)) - def _checkServerDescriptor(self, descriptor): # If we're parsing the server-descriptor, require a networkstatus # document:

1 0

[bridgedb/master] Fix typo in Bridge.bandwidthObserved attribute name.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit abf0d2397220d93510a862396693f5afeb5c7262 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:49:06 2014 +0000 Fix typo in Bridge.bandwidthObserved attribute name. --- 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 fae5d19..899a091 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -621,7 +621,7 @@ class Bridge(BridgeBackwardsCompatibility): self.bandwidth = None self.bandwidthAverage = None self.bandwidthBurst = None - self.bandwidthObserverd = None + self.bandwidthObserved = None self.contact = None self.family = None

1 0

[bridgedb/master] Change Bridge.fingerprint into a @property.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit e07d97ad594a59522f29291fbfbd5c915ed76b4c Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:52:02 2014 +0000 Change Bridge.fingerprint into a @property. --- lib/bridgedb/bridges.py | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 48dc33a..892872f 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -385,7 +385,7 @@ class BridgeBase(object): """The base class for all bridge implementations.""" def __init__(self): - self.fingerprint = None + self._fingerprint = None self.nickname = None self.address = None self.orPort = None @@ -394,6 +394,35 @@ class BridgeBase(object): self.orAddresses = [] self.transports = [] 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 class BridgeBackwardsCompatibility(BridgeBase):

1 0

[bridgedb/master] Fix the names of five unittests in test_parse_descriptors.py.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit f3d08e3aec1cf85a688d8d023bbca31213380db5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 10 23:27:44 2014 +0000 Fix the names of five unittests in test_parse_descriptors.py. The function is called `parseNetworkStatusFile()`, not `parseBridgeNetworkStatusFile()`. * CHANGE test_parse_descriptors_parseBridgeNetworkStatusFile_*() to test_parse_descriptors_parseNetworkStatusFile_*() in lib/bridgedb/test/test_parse_descriptors.py. --- lib/bridgedb/test/test_parse_descriptors.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 38bbf99..738360f 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -218,7 +218,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.address, self.expectedIPBridge0) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) - def test_parse_descriptors_parseBridgeNetworkStatusFile_return_type(self): + def test_parse_descriptors_parseNetworkStatusFile_return_type(self): """``b.p.descriptors.parseNetworkStatusFile`` should return a dict.""" # Write the descriptor to a file for testing. This is necessary # because the function opens the networkstatus file to read it. @@ -227,7 +227,7 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseNetworkStatusFile(descFile) self.assertIsInstance(routers, list) - def test_parse_descriptors_parseBridgeNetworkStatusFile_has_RouterStatusEntryV2(self): + def test_parse_descriptors_parseNetworkStatusFile_has_RouterStatusEntryV2(self): """The items in the dict returned from ``b.p.descriptors.parseNetworkStatusFile`` should be ``RouterStatusEntryV2``s. @@ -240,7 +240,7 @@ class ParseDescriptorsTests(unittest.TestCase): bridge = routers[0] self.assertIsInstance(bridge, RouterStatusEntryV3) - def test_parse_descriptors_parseBridgeNetworkStatusFile_one_file(self): + def test_parse_descriptors_parseNetworkStatusFile_one_file(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with one bridge networkstatus descriptor. """ @@ -253,7 +253,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.address, self.expectedIPBridge0) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) - def test_parse_descriptors_parseBridgeNetworkStatusFile_two_files(self): + def test_parse_descriptors_parseNetworkStatusFile_two_files(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with two bridge networkstatus descriptors. """ @@ -270,7 +270,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn(bridge.address, expectedIPs) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) - def test_parse_descriptors_parseBridgeNetworkStatusFile_with_annotations(self): + def test_parse_descriptors_parseNetworkStatusFile_with_annotations(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with some document headers before the first 'r'-line. """ @@ -289,7 +289,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn(bridge.address, expectedIPs) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) - def test_parse_descriptors_parseBridgeNetworkStatusFile_with_annotations_no_skipping(self): + def test_parse_descriptors_parseNetworkStatusFile_with_annotations_no_skipping(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with some document headers before the first 'r'-line, but without skipping said annotations.

1 0

[bridgedb/master] Fix two typos in attribute names of Stem's descriptors.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 6205c5b62775899dfefd36861d01a7ca982209ed Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:52:26 2014 +0000 Fix two typos in attribute names of Stem's descriptors. --- lib/bridgedb/bridges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 892872f..5498758 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1192,7 +1192,7 @@ class Bridge(BridgeBackwardsCompatibility): # These fields are *only* found in the networkstatus document: self.descriptorDigest = descriptor.digest self.flags.update(descriptor.flags) - self.bandwidth = descriptor.bandwith + self.bandwidth = descriptor.bandwidth # These fields are also found in the server-descriptor. We will prefer # to use the information taken later from the server-descriptor @@ -1246,7 +1246,7 @@ class Bridge(BridgeBackwardsCompatibility): self.bandwidthAverage = descriptor.average_bandwidth self.bandwidthBurst = descriptor.burst_bandwidth - self.bandwidthObserved = descriptor.bandwidth_observed + self.bandwidthObserved = descriptor.observed_bandwidth self.contact = descriptor.contact self.family = descriptor.family

1 0