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

[bridgedb/master] Catch ValueErrors while coercing PluggableTransport port numbers.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 83378640b09dc8a6c6d5a58389fd36c25dab37b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 6 00:17:24 2014 +0000 Catch ValueErrors while coercing PluggableTransport port numbers. --- 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 21d9257..ecbf863 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -240,7 +240,7 @@ class PluggableTransport(object): try: # Coerce the port to be an integer: self.port = int(self.port) - except TypeError: + except (TypeError, ValueError): raise MalformedPluggableTransport( ("Cannot create PluggableTransport with port type: %s.") % type(self.port))

1 0

[bridgedb/master] Add methods to bridgedb.bridges.Bridge for determining block status.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 444722265ad42617a051c8dd015aabb93a78a2cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 6 01:48:43 2014 +0000 Add methods to bridgedb.bridges.Bridge for determining block status. * ADD new methods: addressIsBlockedIn() transportIsBlockedIn() isBlockedIn() for determining which (if any) of a Bridge's pluggable transports and addresses is blocked in a particular country. --- lib/bridgedb/bridges.py | 158 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 640008f..17486e2 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -177,6 +177,7 @@ class PluggableTransport(object): self.port = port self.methodname = methodname self.arguments = arguments + self._blockedIn = {} # Because we can intitialise this class with the __init__() # parameters, or use the ``updateFromStemTransport()`` method, we'll @@ -432,6 +433,7 @@ class Bridge(object): self.transports = [] self.flags = Flags() self.hibernating = False + self._blockedIn = {} self.bandwidth = None self.bandwidthAverage = None @@ -699,6 +701,25 @@ class Bridge(object): return ' '.join(bridgeLine) + @classmethod + def _getBlockKey(cls, address, port): + """Format an **address**:**port** pair appropriately for use as a key + in the :data:`_blockedIn` dictionary. + + :param address: An IP address of this :class:`Bridge` or one of its + :data:`transports`. + :param port: A port. + :rtype: str + :returns: A string in the form ``"ADDRESS:PORT"`` for IPv4 addresses, + and ``"[ADDRESS]:PORT`` for IPv6. + """ + if isIPv6(str(address)): + key = "[%s]:%s" % (address, port) + else: + key = "%s:%s" % (address, port) + + return key + def _getTransportForRequest(self, bridgeRequest): """If a transport was requested, return the correlated :term:`Bridge Line` based upon the client identifier in the @@ -891,6 +912,143 @@ class Bridge(object): bridgePrefix) return bridgeLine + def _addBlockByKey(self, key, countryCode): + """Create or append to the list of blocked countries for a **key**. + + :param str key: The key to lookup in the :data:`Bridge._blockedIn` + dictionary. This should be in the form returned by + :classmethod:`_getBlockKey`. + :param str countryCode: A two-character country code specifier. + """ + if self._blockedIn.has_key(key): + self._blockedIn[key].append(countryCode.lower()) + else: + self._blockedIn[key] = [countryCode.lower(),] + + def addressIsBlockedIn(self, countryCode, address, port): + """Determine if a specific (address, port) tuple is blocked in + **countryCode**. + + :param str countryCode: A two-character country code specifier. + :param str address: An IP address (presumedly one used by this + bridge). + :param int port: A port. + :rtype: bool + :returns: ``True`` if the **address**:**port** pair is blocked in + **countryCode**, ``False`` otherwise. + """ + key = self._getBlockKey(address, port) + + try: + if countryCode.lower() in self._blockedIn[key]: + logging.info("Vanilla address %s of bridge %s blocked in %s." + % (key, self, countryCode.lower())) + return True + except KeyError: + return False # That address:port pair isn't blocked anywhere + + return False + + def transportIsBlockedIn(self, countryCode, methodname): + """Determine if any of a specific type of pluggable transport which + this bridge might be running is blocked in a specific country. + + :param str countryCode: A two-character country code specifier. + :param str methodname: The type of pluggable transport to check, + i.e. ``'obfs3'``. + :rtype: bool + :returns: ``True`` if any address:port pair which this bridge is + running a :class:`PluggableTransport` on is blocked in + **countryCode**, ``False`` otherwise. + """ + for pt in self.transports: + if pt.methodname.lower() == methodname.lower(): + if self.addressIsBlockedIn(countryCode, pt.address, pt.port): + logging.info("Transport %s of bridge %s is blocked in %s." + % (pt.methodname, self, countryCode)) + return True + return False + + def isBlockedIn(self, countryCode): + """Determine, according to our stored bridge reachability reports, if + any of the address:port pairs used by this :class:`Bridge` or it's + :data:`transports` are blocked in **countryCode**. + + :param str countryCode: A two-character country code specifier. + :rtype: bool + :returns: ``True`` if at least one address:port pair used by this + bridge is blocked in **countryCode**; ``False`` otherwise. + """ + # Check all supported pluggable tranport types: + for methodname in self.supportedTransportTypes: + if self.transportIsBlockedIn(countryCode.lower(), methodname): + return True + + for address, port, version in self.allVanillaAddresses: + if self.addressIsBlockedIn(countryCode.lower(), address, port): + return True + + return False + + def setBlockedIn(self, countryCode, address=None, port=None, methodname=None): + """Mark this :class:`Bridge` as being blocked in **countryCode**. + + By default, if called with no parameters other than a **countryCode**, + we'll mark all this :class:`Bridge`'s :data:`allVanillaAddresses` and + :data:`transports` as being blocked. + + Otherwise, we'll filter on any and all parameters given. + + If only a **methodname** is given, then we assume that all + :data:`transports` with that **methodname** are blocked in + **countryCode**. If the methodname is ``"vanilla"``, then we assume + each address in data:`allVanillaAddresses` is blocked. + + :param str countryCode: A two-character country code specifier. + :param address: An IP address of this Bridge or one of its + :data:`transports`. + :param port: A specific port that is blocked, if available. If the + **port** is ``None``, then any address this :class:`Bridge` or its + :class:`PluggableTransport`s has that matches the given **address** + will be marked as block, regardless of its port. This parameter + is ignored unless an **address** is given. + :param str methodname: A :data:`PluggableTransport.methodname` to + match. Any remaining :class:`PluggableTransport`s from + :data:`transports` which matched the other parameters and now also + match this **methodname** will be marked as being blocked in + **countryCode**. + """ + vanillas = self.allVanillaAddresses + transports = self.transports + + if methodname: + # Don't process the vanilla if we weren't told to do so: + if not (methodname == 'vanilla') and not (address or port): + vanillas = [] + + transports = filter(lambda pt: methodname == pt.methodname, transports) + + if address: + vanillas = filter(lambda ip: str(address) == str(ip[0]), vanillas) + transports = filter(lambda pt: str(address) == str(pt.address), transports) + + if port: + vanillas = filter(lambda ip: int(port) == int(ip[1]), vanillas) + transports = filter(lambda pt: int(port) == int(pt.port), transports) + + for addr, port, _ in vanillas: + key = self._getBlockKey(addr, port) + logging.info("Vanilla address %s for bridge %s is now blocked in %s." + % (key, self, countryCode)) + self._addBlockByKey(key, countryCode) + + for transport in transports: + key = self._getBlockKey(transport.address, transport.port) + logging.info("Transport %s %s for bridge %s is now blocked in %s." + % (transport.methodname, key, self, countryCode)) + self._addBlockByKey(key, countryCode) + transport._blockedIn[key] = self._blockedIn[key] + def getDescriptorLastPublished(self): """Get the timestamp for when this bridge's last known server descriptor was published.

1 0

[bridgedb/master] Add a bridgedb.bridges.Bridge.__str__ method.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit fe405ac660ad1258fbc31d32f80aae550c31099b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 6 01:10:10 2014 +0000 Add a bridgedb.bridges.Bridge.__str__ method. --- lib/bridgedb/bridges.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 100dd12..cb81dff 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -11,6 +11,7 @@ from __future__ import print_function +import hashlib import ipaddr import logging import os @@ -465,6 +466,36 @@ class Bridge(object): idDigest=id_digest, orAddresses=or_addresses) + def __str__(self): + """Return a pretty string representation that identifies this Bridge. + + .. warning:: With safelogging disabled, the returned string contains + the bridge's fingerprint, which should be handled with care. + + If safelogging is enabled, the returned string will have the SHA-1 + hash of the bridge's fingerprint (a.k.a. a hashed fingerprint). + + Hashed fingerprints will be prefixed with ``'$$'``, and the real + fingerprints are prefixed with ``'$'``. + + :rtype: str + :returns: A string in the form: + :data:`nickname```.$``:data:`fingerprint`. + """ + nickname = self.nickname if self.nickname else 'Unnamed' + separator = '.$' + fingerprint = self.fingerprint + + if safelog.safe_logging: + separator = '.$$' + if fingerprint: + fingerprint = hashlib.sha1(fingerprint).hexdigest() + + if not fingerprint: + fingerprint = '0' * 40 + + return nickname + separator + fingerprint + def _backwardsCompatible(self, nickname=None, address=None, orPort=None, fingerprint=None, idDigest=None, orAddresses=None):

1 0

[bridgedb/master] Add methods to bridgedb.bridges.Bridge for constructing bridge lines.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 50a01e2d6fc22603f305f3c44acda67b259f5ced Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Dec 6 01:42:02 2014 +0000 Add methods to bridgedb.bridges.Bridge for constructing bridge lines. * ADD new methods and properties: _constructBridgeLine() _getTransportForRequest() _getVanillaForRequest() allVanillaAddresses() getBridgeLine() supportedTransportTypes() * CHANGE _updateORAddresses() to take a three-tuple. * ADD new PluggableTransportUnavailable exception class for when a pluggable transport has been requested which the Bridge doesn't know about. --- lib/bridgedb/bridges.py | 218 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 212 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index cb81dff..640008f 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -27,11 +27,14 @@ from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex +class PluggableTransportUnavailable(Exception): + """Raised when a :class:`Bridge` doesn't have the requested + :class:`PluggableTransport`. + """ class MalformedBridgeInfo(ValueError): """Raised when some information about a bridge appears malformed.""" - class MalformedPluggableTransport(MalformedBridgeInfo): """Raised when information used to initialise a :class:`PluggableTransport` appears malformed. @@ -653,14 +656,170 @@ class Bridge(object): "Actual descriptor digest: %s\n") % (descriptor.fingerprint, self.descriptorDigest, digested)) + def _constructBridgeLine(self, addrport, includeFingerprint=True, + bridgePrefix=False): + """Construct a :term:`Bridge Line` from an (address, port) tuple. + + :param tuple addrport: A 3-tuple of ``(address, port, ipversion)`` + where ``address`` is a string, ``port`` is an integer, and + ``ipversion`` is a integer (``4`` or ``6``). + :param bool includeFingerprint: If ``True``, include the + ``fingerprint`` of this :class:`Bridge` in the returned bridge + line. + :param bool bridgePrefix: if ``True``, prefix the :term:`Bridge Line` + with ``'Bridge '``. + :raises MalformedBridgeInfo: if the **addrport** didn't turn out to be + a 2-tuple containing ``(ipaddress, port)``. + :rtype: string + :returns: A bridge line suitable for adding into a ``torrc`` file or + Tor Launcher. + """ + if not addrport: + return + + try: + address, port, version = addrport + except (TypeError, ValueError): + raise MalformedBridgeInfo("Can't process addrport: %r" % addrport) + + bridgeLine = [] + + if bridgePrefix: + bridgeLine.append('Bridge') + + if version == 4: + bridgeLine.append("%s:%d" % (str(address), port)) + elif version == 6: + bridgeLine.append("[%s]:%d" % (str(address), port)) + else: + raise MalformedBridgeInfo("IP version must be 4 or 6") + + if includeFingerprint: + bridgeLine.append("%s" % self.fingerprint) + + return ' '.join(bridgeLine) + + def _getTransportForRequest(self, bridgeRequest): + """If a transport was requested, return the correlated + :term:`Bridge Line` based upon the client identifier in the + **bridgeRequest**. + + :type bridgeRequest: :class:`bridgedb.bridgerequest.BridgeRequestBase` + :param bridgeRequest: A ``BridgeRequest`` which stores all of the + client-specified options for which type of bridge they want to + receive. + :raises PluggableTransportUnavailable: if this bridge doesn't have any + of the requested pluggable transport type. This shouldn't happen + because the bridges are filtered into the client's hashring based + on the **bridgeRequest** options, however, this is useful in the + unlikely event that it does happen, so that the calling function + can fetch an additional bridge from the hashring as recompense for + what would've otherwise been a missing :term:`Bridge Line`. + :rtype: str or ``None`` + :returns: If no transports were requested, return ``None``, otherwise + return a :term:`Bridge Line` for the requested pluggable transport + type. + """ + addressClass = bridgeRequest.addressClass + desiredTransport = bridgeRequest.justOnePTType() + hashringPosition = bridgeRequest.getHashringPlacement(bridgeRequest.client, + 'Order-Or-Addresses') + + logging.info("Bridge %s answering request for %s transport..." % + (safelog.logSafely(self.fingerprint), desiredTransport)) + # Filter all this Bridge's ``transports`` according to whether or not + # their ``methodname`` matches the requested transport, i.e. only + # 'obfs3' transports, or only 'scramblesuit' transports: + transports = filter(lambda pt: desiredTransport == pt.methodname, + self.transports) + # Filter again for whichever of IPv4 or IPv6 was requested: + transports = filter(lambda pt: isinstance(pt.address, addressClass), + transports) + + if transports: + return transports[hashringPosition % len(transports)] + else: + raise PluggableTransportUnavailable( + ("Client requested transport %s from bridge %s, but this " + "bridge doesn't have any of that transport!") % + (desiredTransport, self.fingerprint)) + + def _getVanillaForRequest(self, bridgeRequest): + """If vanilla bridges were requested, return the assigned + :term:`Bridge Line` based upon the client identifier in the + **bridgeRequest**. + + :type bridgeRequest: :class:`bridgedb.bridgerequest.BridgeRequestBase` + :param bridgeRequest: A ``BridgeRequest`` which stores all of the + client-specified options for which type of bridge they want to + receive. + :rtype: str or ``None`` + :returns: If no transports were requested, return ``None``, otherwise + return a :term:`Bridge Line` for the requested pluggable transport + type. + """ + logging.info("Bridge %s answering request for vanilla address..." % self) + + if not bridgeRequest.filters: + logging.debug(("Request %s didn't have any filters; " + "generating them now...") % bridgeRequest) + bridgeRequest.generateFilters() + + addresses = self.allVanillaAddresses + + # Filter ``allVanillaAddresses`` by whether IPv4 or IPv6 was requested: + addresses = filter( + # ``address`` here is a 3-tuple: + # ``(ipaddr.IPAddress, int(port), int(ipaddr.IPAddress.version))`` + lambda address: isinstance(address[0], bridgeRequest.addressClass), + self.allVanillaAddresses) + + if addresses: + # Use the client's unique data to HMAC them into their position in + # the hashring of filtered bridges addresses: + position = bridgeRequest.getHashringPlacement('Order-Or-Addresses', + bridgeRequest.client) + logging.debug("Client's hashring position is %r" % position) + vanilla = addresses[position % len(addresses)] + logging.info("Got vanilla bridge for client.") + + return vanilla + def _updateORAddresses(self, orAddresses): + """Update this :class:`Bridge`'s :data:`orAddresses` attribute from a + 3-tuple (i.e. as Stem creates when parsing descriptors). + + :param tuple orAddresses: A 3-tuple of: an IP address, a port number, + and a boolean (``False`` if IPv4, ``True`` if IPv6). + :raises FutureWarning: if any IPv4 addresses are found. As of + tor-0.2.5, only IPv6 addresses should be found in a descriptor's + `ORAddress` line. + """ for (address, port, ipVersion) in orAddresses: + version = 6 if not ipVersion: # `False` means IPv4; `True` means IPv6. # See https://bugs.torproject.org/9380#comment:27 - warnings.warn(FutureWarning( - ("Got IPv4 address in 'a'/'or-address' line! " - "Desriptor format may have changed!"))) - self.orAddresses.append(tuple([address, port])) + warnings.warn(FutureWarning(( + "Got IPv4 address in 'a'/'or-address' line! Descriptor " + "format may have changed!"))) + version = 4 + + validatedAddress = isIPAddress(address, compressed=False) + if validatedAddress: + self.orAddresses.append( (validatedAddress, port, version,) ) + + @property + def allVanillaAddresses(self): + """Get all valid, non-PT address:port pairs for this bridge. + + :rtype: list + :returns: All of this bridge's ORAddresses, as well as its ORPort IP + address and port. + """ + addresses = self.orAddresses + # Add the default ORPort address: + addresses.append((self.address, self.orPort,)) + return addresses def assertOK(self): """Perform some additional validation on this bridge's info. @@ -697,6 +856,41 @@ class Bridge(object): if malformed: raise MalformedBridgeInfo('\n'.join(malformed)) + def getBridgeLine(self, bridgeRequest, includeFingerprint=True, + bridgePrefix=False): + """Return a valid :term:`Bridge Line` for a client to give to Tor + Launcher or paste directly into their ``torrc``. + + This is a helper method to call either :meth:`_getTransportForRequest` + or :meth:`_getVanillaForRequest` depending on whether or not any + :class:`PluggableTransport`s were requested in the + :class:`bridgeRequest <bridgedb bridgerequest.BridgeRequestBase>`, and + then construct the :term:`Bridge Line` accordingly. + + :type bridgeRequest: :class:`bridgedb.bridgerequest.BridgeRequestBase` + :param bridgeRequest: A ``BridgeRequest`` which stores all of the + client-specified options for which type of bridge they want to + receive. + :param bool includeFingerprint: If ``True``, include the + ``fingerprint`` of this :class:`Bridge` in the returned bridge + line. + :param bool bridgePrefix: if ``True``, prefix the :term:`Bridge Line` + with ``'Bridge '``. + """ + if not bridgeRequest.isValid(): + logging.info("Bridge request was not valid. Dropping request.") + return # XXX raise error perhaps? + + if bridgeRequest.transports: + pt = self._getTransportForRequest(bridgeRequest) + bridgeLine = pt.getTransportLine(includeFingerprint, bridgePrefix) + else: + addrport = self._getVanillaForRequest(bridgeRequest) + bridgeLine = self._constructBridgeLine(addrport, + includeFingerprint, + bridgePrefix) + return bridgeLine + def getDescriptorLastPublished(self): """Get the timestamp for when this bridge's last known server descriptor was published. @@ -733,7 +927,19 @@ class Bridge(object): """ return getattr(self.descriptors['networkstatus'], 'published', None) - def updateFromNetworkstatus(self, descriptor): + @property + def supportedTransportTypes(self): + """A deduplicated list of all the :data:`PluggableTranport.methodname`s + which this bridge supports. + """ + supported = [] + + for transport in self.transports: + supported.append(transport.methodname) + + return list(set(supported)) + + def updateFromNetworkStatus(self, descriptor): """Update this bridge's attributes from a parsed networkstatus descriptor.

1 0

[bridgedb/master] Update the Bridge's transports in updateFromExtraInfoDescriptor().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 122ad409aa0dd84563d580e5002cecb1cc20d25f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 18:55:14 2014 -0800 Update the Bridge's transports in updateFromExtraInfoDescriptor(). --- lib/bridgedb/bridges.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index d2e528d..fede979 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1295,3 +1295,34 @@ class Bridge(object): return self.descriptors['extrainfo'] = descriptor + + updatedTransports = [] + + for transport in self.transports: + for methodname, kitchenSink in descriptor.transport: + if transport.methodname == methodname: + if transport.address == kitchenSink[0]: + logging.info( + "Updating %s pluggable transport for bridge %s." % + (methodname, safelog.logSafely(self.fingerprint))) + updatedTransports.append(transport) + transport.updateFromStemTransport(self.fingerprint, + methodname, + kitchenSink) + else: + logging.info( + ("Received new %s pluggable transport for bridge " + "%s.") % + (methodname, safelog.logSafely(self.fingerprint))) + pt = PluggableTransport() + pt.updateFromStemTransport(self.fingerprint, + methodname, + kitchenSink) + updatedTransports.append(pt) + self.transports.append(pt) + + dead = set(self.transports).difference(set(updatedTransports)) + logging.info("The following transports for bridge %s died: %s" + % (self, ' '.join(dead))) + for died in dead: + self.transports.remove(died)

1 0

[bridgedb/master] Include bridge stability properties from #5482.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 1fcb3c022ba05ba4830464af83e1e066ba55c41d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 18:55:59 2014 -0800 Include bridge stability properties from #5482. These have not been changed. --- lib/bridgedb/bridges.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index fede979..dec5e16 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -22,6 +22,8 @@ from Crypto.Util import asn1 from Crypto.Util.number import bytes_to_long from Crypto.Util.number import long_to_bytes +import bridgedb.Storage + from bridgedb import safelog from bridgedb import bridgerequest from bridgedb.crypto import removePKCS1Padding @@ -1326,3 +1328,43 @@ class Bridge(object): % (self, ' '.join(dead))) for died in dead: self.transports.remove(died) + + # Bridge Stability (`#5482 <https://bugs.torproject.org>`_) properties. + @property + def familiar(self): + """A bridge is "familiar" if 1/8 of all active bridges have appeared + more recently than it, or if it has been around for a Weighted Time of + eight days. + """ + with bridgedb.Storage.getDB() as db: + return db.getBridgeHistory(self.fingerprint).familiar + + @property + def wfu(self): + """Weighted Fractional Uptime""" + with bridgedb.Storage.getDB() as db: + return db.getBridgeHistory(self.fingerprint).weightedFractionalUptime + + @property + def weightedTime(self): + """Weighted Time""" + with bridgedb.Storage.getDB() as db: + return db.getBridgeHistory(self.fingerprint).weightedTime + + @property + def wmtbac(self): + """Weighted Mean Time Between Address Change""" + with bridgedb.Storage.getDB() as db: + return db.getBridgeHistory(self.fingerprint).wmtbac + + @property + def tosa(self): + """The Time On Same Address (TOSA)""" + with bridgedb.Storage.getDB() as db: + return db.getBridgeHistory(self.fingerprint).tosa + + @property + def weightedUptime(self): + """Weighted Uptime""" + with bridgedb.Storage.getDB() as db: + return db.getBridgeHistory(self.fingerprint).weightedUptime

1 0

[bridgedb/master] Deprecate Bridges.parseExtraInfoFile() and Bridges.parseStatusFile().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 863c8682ed363a28dca67c2ed2e7be94a5f16b8c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 19:04:02 2014 -0800 Deprecate Bridges.parseExtraInfoFile() and Bridges.parseStatusFile(). * MOVE Bridges.parseExtraInfoFile() to test.deprecated.parseExtraInfoFile(). * MOVE Bridges.parseStatusFile() to test.deprecated.parseStatusFile(). --- lib/bridgedb/Bridges.py | 148 -------------------------------------- lib/bridgedb/test/deprecated.py | 152 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 148 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 36637aa..1dd8dfa 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -199,154 +199,6 @@ re_ipv6 = re.compile("\[([a-fA-F0-9:]+)\]:(.*$)") re_ipv4 = re.compile("((?:\d{1,3}\.?){4}):(.*$)") -def parseExtraInfoFile(f): - """ - parses lines in Bridges extra-info documents. - returns an object whose type corresponds to the - relevant set of extra-info lines. - - presently supported lines and the accompanying type are: - - { 'transport': PluggableTransport, } - - 'transport' lines (torspec.git/proposals/180-pluggable-transport.txt) - - Bridges put the 'transport' lines in their extra-info documents. - the format is: - - transport SP <methodname> SP <address:port> [SP arglist] NL - """ - - ID = None - for line in f: - line = line.strip() - - argdict = {} - - # do we need to skip 'opt' here? - # if line.startswith("opt "): - # line = line[4:] - - # get the bridge ID ? - if line.startswith("extra-info "): #XXX: get the router ID - line = line[11:] - (nickname, ID) = line.split() - logging.debug(" Parsed Nickname: %s", nickname) - if isValidFingerprint(ID): - logging.debug(" Parsed fingerprint: %s", ID) - ID = fromHex(ID) - else: - logging.debug(" Parsed invalid fingerprint: %s", ID) - - # get the transport line - if ID and line.startswith("transport "): - fields = line[10:].split() - - if len(fields) >= 3: - argdict = {} - # PT argumentss are comma-separated in the extrainfo - # descriptors. While there *shouldn't* be anything after them - # that was separated by a space (and hence would wind up being - # in a different `field`), if there was we'll join it to the - # rest of the PT arguments with a comma so that they are - # parsed as if they were PT arguments as well: - allargs = ','.join(fields[2:]) - for arg in allargs.split(','): - try: - k, v = arg.split('=') - except ValueError: - logging.warn(" Couldn't parse K=V from PT arg: %r" % arg) - else: - logging.debug(" Parsed PT Argument: %s: %s" % (k, v)) - argdict[k] = v - - # get the required fields, method name and address - if len(fields) >= 2: - # get the method name - # Method names must be C identifiers - for regex in [re_ipv4, re_ipv6]: - try: - method_name = re.match('[_a-zA-Z][_a-zA-Z0-9]*',fields[0]).group() - m = regex.match(fields[1]) - address = ipaddr.IPAddress(m.group(1)) - port = int(m.group(2)) - logging.debug(" Parsed Transport: %s %s:%d" - % (method_name, address, port)) - yield ID, method_name, address, port, argdict - except (IndexError, ValueError, AttributeError): - # skip this line - continue - - # end of descriptor is defined how? - if ID and line.startswith("router-signature"): - ID = None - -def parseStatusFile(networkstatusFile): - """Parse entries in a bridge networkstatus file. - - :type networkstatusFile: A file-like object. - :param networkstatusFile: A file containing `@type bridge-networkstatus` documents. - """ - (nickname, ID, descDigest, timestamp, - ORaddr, ORport, dirport, addr, portlist) = (None for x in xrange(9)) - running = stable = False - parsedORAddressLines = 0 - or_addresses = {} - - for line in networkstatusFile: - line = line.strip() - if line.startswith("opt "): - line = line[4:] - - if line.startswith("r "): - (nickname, ID, descDigest, timestamp, - ORaddr, ORport, dirport) = networkstatus.parseRLine(line) - hexID = toHex(ID) - logging.debug("Parsed networkstatus line:") - logging.debug(" Nickname: %s" % nickname) - logging.debug(" Identity: %s" % hexID) - if descDigest: - descDigest = toHex(descDigest) - logging.debug(" Descriptor: {0}".format(descDigest)) - logging.debug(" Timestamp: {0}".format(timestamp)) - logging.debug(" ORAddress: {0}".format(ORaddr)) - logging.debug(" ORport: {0}".format(ORport)) - logging.debug(" dirport: {0}".format(dirport)) - - elif ID and line.startswith("a "): - try: - addr, portlist = networkstatus.parseALine(line, toHex(ID)) - except networkstatus.NetworkstatusParsingError as error: - logging.error(error) - else: - if (addr is not None) and (portlist is not None): - try: - or_addresses[addr].add(portlist) - except (KeyError, AttributeError): - or_addresses[addr] = portlist - parsedORAddressLines += 1 - - elif ID and timestamp and line.startswith("s "): - running, stable = networkstatus.parseSLine(line) - logging.debug("Bridges.parseStatusFile(): " - "yielding %s nickname=%s descDigest=%s " - "running=%s stable=%s oraddr=%s orport=%s " - "oraddrs=%s ts=%s" - % (hexID, nickname, descDigest, running, - stable, ORaddr, ORport, or_addresses, - timestamp)) - yield (ID, nickname, descDigest, running, stable, - ipaddr.IPAddress(ORaddr), ORport, - or_addresses, timestamp) - - (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport, - addr, portlist, hexID) = (None for x in xrange(10)) - running = stable = False - or_addresses = {} - - logging.debug("Total ORAddress lines parsed from '%s': %d" - % (networkstatusFile.name, parsedORAddressLines)) - def parseCountryBlockFile(f): """Generator. Parses a blocked-bridges file 'f', and yields a fingerprint (ID), address, a list of ports, and a list of country diff --git a/lib/bridgedb/test/deprecated.py b/lib/bridgedb/test/deprecated.py index d85f6f9..6c7c3f1 100644 --- a/lib/bridgedb/test/deprecated.py +++ b/lib/bridgedb/test/deprecated.py @@ -110,6 +110,158 @@ def is_valid_fingerprint(fp): else: return True +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 4), + replacement='bridgedb.parse.descriptors.parseBridgeExtraInfoFiles') +def parseExtraInfoFile(f): + """ + parses lines in Bridges extra-info documents. + returns an object whose type corresponds to the + relevant set of extra-info lines. + + presently supported lines and the accompanying type are: + + { 'transport': PluggableTransport, } + + 'transport' lines (torspec.git/proposals/180-pluggable-transport.txt) + + Bridges put the 'transport' lines in their extra-info documents. + the format is: + + transport SP <methodname> SP <address:port> [SP arglist] NL + """ + + ID = None + for line in f: + line = line.strip() + + argdict = {} + + # do we need to skip 'opt' here? + # if line.startswith("opt "): + # line = line[4:] + + # get the bridge ID ? + if line.startswith("extra-info "): #XXX: get the router ID + line = line[11:] + (nickname, ID) = line.split() + logging.debug(" Parsed Nickname: %s", nickname) + if isValidFingerprint(ID): + logging.debug(" Parsed fingerprint: %s", ID) + ID = fromHex(ID) + else: + logging.debug(" Parsed invalid fingerprint: %s", ID) + + # get the transport line + if ID and line.startswith("transport "): + fields = line[10:].split() + + if len(fields) >= 3: + argdict = {} + # PT argumentss are comma-separated in the extrainfo + # descriptors. While there *shouldn't* be anything after them + # that was separated by a space (and hence would wind up being + # in a different `field`), if there was we'll join it to the + # rest of the PT arguments with a comma so that they are + # parsed as if they were PT arguments as well: + allargs = ','.join(fields[2:]) + for arg in allargs.split(','): + try: + k, v = arg.split('=') + except ValueError: + logging.warn(" Couldn't parse K=V from PT arg: %r" % arg) + else: + logging.debug(" Parsed PT Argument: %s: %s" % (k, v)) + argdict[k] = v + + # get the required fields, method name and address + if len(fields) >= 2: + # get the method name + # Method names must be C identifiers + for regex in [re_ipv4, re_ipv6]: + try: + method_name = re.match('[_a-zA-Z][_a-zA-Z0-9]*',fields[0]).group() + m = regex.match(fields[1]) + address = ipaddr.IPAddress(m.group(1)) + port = int(m.group(2)) + logging.debug(" Parsed Transport: %s %s:%d" + % (method_name, address, port)) + yield ID, method_name, address, port, argdict + except (IndexError, ValueError, AttributeError): + # skip this line + continue + + # end of descriptor is defined how? + if ID and line.startswith("router-signature"): + ID = None + +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 4), + replacement='bridgedb.parse.descriptors.parseNetworkStatusFile') +def parseStatusFile(networkstatusFile): + """Parse entries in a bridge networkstatus file. + + :type networkstatusFile: A file-like object. + :param networkstatusFile: A file containing `@type bridge-networkstatus` documents. + """ + (nickname, ID, descDigest, timestamp, + ORaddr, ORport, dirport, addr, portlist) = (None for x in xrange(9)) + running = stable = False + parsedORAddressLines = 0 + or_addresses = {} + + for line in networkstatusFile: + line = line.strip() + if line.startswith("opt "): + line = line[4:] + + if line.startswith("r "): + (nickname, ID, descDigest, timestamp, + ORaddr, ORport, dirport) = networkstatus.parseRLine(line) + hexID = toHex(ID) + logging.debug("Parsed networkstatus line:") + logging.debug(" Nickname: %s" % nickname) + logging.debug(" Identity: %s" % hexID) + if descDigest: + descDigest = toHex(descDigest) + logging.debug(" Descriptor: {0}".format(descDigest)) + logging.debug(" Timestamp: {0}".format(timestamp)) + logging.debug(" ORAddress: {0}".format(ORaddr)) + logging.debug(" ORport: {0}".format(ORport)) + logging.debug(" dirport: {0}".format(dirport)) + + elif ID and line.startswith("a "): + try: + addr, portlist = networkstatus.parseALine(line, toHex(ID)) + except networkstatus.NetworkstatusParsingError as error: + logging.error(error) + else: + if (addr is not None) and (portlist is not None): + try: + or_addresses[addr].add(portlist) + except (KeyError, AttributeError): + or_addresses[addr] = portlist + parsedORAddressLines += 1 + + elif ID and timestamp and line.startswith("s "): + running, stable = networkstatus.parseSLine(line) + logging.debug("Bridges.parseStatusFile(): " + "yielding %s nickname=%s descDigest=%s " + "running=%s stable=%s oraddr=%s orport=%s " + "oraddrs=%s ts=%s" + % (hexID, nickname, descDigest, running, + stable, ORaddr, ORport, or_addresses, + timestamp)) + yield (ID, nickname, descDigest, running, stable, + ipaddr.IPAddress(ORaddr), ORport, + or_addresses, timestamp) + + (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport, + addr, portlist, hexID) = (None for x in xrange(10)) + running = stable = False + or_addresses = {} + + logging.debug("Total ORAddress lines parsed from '%s': %d" + % (networkstatusFile.name, parsedORAddressLines)) + @deprecate.deprecated( Version('bridgedb', 0, 0, 1),

1 0

[bridgedb/master] Fix the name of a unittest in test_parse_descriptors.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit cfc24e94335c27d6e9fb936510ab6cb9bbc1cd41 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 10 23:25:14 2014 +0000 Fix the name of a unittest in test_parse_descriptors. It tests the `parseServerDescriptorsFile()` function, not `parseBridgeDescriptorsFile()`. * CHANGE test_parse_descriptors_parseBridgeDescriptorsFile() to test_parse_descriptors_parseServerDescriptorsFile() in lib/bridgedb/test/test_parse_descriptors.py. --- lib/bridgedb/test/test_parse_descriptors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 47685af..38bbf99 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -208,8 +208,8 @@ class ParseDescriptorsTests(unittest.TestCase): fh.flush() return descFilename - def test_parse_descriptors_parseBridgeDescriptorsFile(self): - """Test for ``b.p.descriptors.parseBridgeDescriptorsFile``.""" + def test_parse_descriptors_parseServerDescriptorsFile(self): + """Test for ``b.p.descriptors.parseServerDescriptorsFile``.""" descFile = io.BytesIO(BRIDGE_SERVER_DESCRIPTOR) routers = descriptors.parseServerDescriptorsFile(descFile) self.assertIsInstance(routers, list)

1 0

[bridgedb/master] Rename b.p.d.parseBridgeExtraInfoFiles() → b.p.d.parseExtraInfoFiles().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 165ebecd83e33f0cdaa7adb645c2596e74cff092 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 10 23:22:26 2014 +0000 Rename b.p.d.parseBridgeExtraInfoFiles() → b.p.d.parseExtraInfoFiles(). --- lib/bridgedb/parse/descriptors.py | 2 +- lib/bridgedb/test/deprecated.py | 2 +- lib/bridgedb/test/test_parse_descriptors.py | 76 +++++++++++++-------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 66a34b9..ee0cea8 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -204,7 +204,7 @@ def deduplicate(descriptors): return nonDuplicates -def parseBridgeExtraInfoFiles(*filenames, **kwargs): +def parseExtraInfoFiles(*filenames, **kwargs): """Parse files which contain ``@type bridge-extrainfo-descriptor``s. .. warning:: This function will *not* check that the ``router-signature`` diff --git a/lib/bridgedb/test/deprecated.py b/lib/bridgedb/test/deprecated.py index 6c7c3f1..0cf01fb 100644 --- a/lib/bridgedb/test/deprecated.py +++ b/lib/bridgedb/test/deprecated.py @@ -111,7 +111,7 @@ def is_valid_fingerprint(fp): return True @deprecate.deprecated(Version('bridgedb', 0, 2, 4), - replacement='bridgedb.parse.descriptors.parseBridgeExtraInfoFiles') + replacement='bridgedb.parse.descriptors.parseExtraInfoFiles') def parseExtraInfoFile(f): """ parses lines in Bridges extra-info documents. diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index d867768..47685af 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -308,29 +308,29 @@ class ParseDescriptorsTests(unittest.TestCase): descriptors.parseNetworkStatusFile, descFile, skipAnnotations=False) - def test_parse_descriptors_parseBridgeExtraInfoFiles_return_type(self): - """The return type of ``b.p.descriptors.parseBridgeExtraInfoFiles`` + def test_parse_descriptors_parseExtraInfoFiles_return_type(self): + """The return type of ``b.p.descriptors.parseExtraInfoFiles`` should be a dictionary (after deduplication). """ descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseBridgeExtraInfoFiles(descFile) + routers = descriptors.parseExtraInfoFiles(descFile) self.assertIsInstance(routers, dict) - def test_parse_descriptors_parseBridgeExtraInfoFiles_has_BridgeExtraInfoDescriptor(self): - """The return of ``b.p.descriptors.parseBridgeExtraInfoFiles`` should + def test_parse_descriptors_parseExtraInfoFiles_has_BridgeExtraInfoDescriptor(self): + """The return of ``b.p.descriptors.parseExtraInfoFiles`` should contain ``BridgeExtraInfoDescriptor``s. """ descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseBridgeExtraInfoFiles(descFile) + routers = descriptors.parseExtraInfoFiles(descFile) bridge = routers.values()[0] self.assertIsInstance(bridge, RelayExtraInfoDescriptor) - def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): - """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one + def test_parse_descriptors_parseExtraInfoFiles_one_file(self): + """Test for ``b.p.descriptors.parseExtraInfoFiles`` with only one bridge extrainfo file. """ descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseBridgeExtraInfoFiles(descFile) + routers = descriptors.parseExtraInfoFiles(descFile) bridge = routers.values()[0] # The number of transports we parsed should be equal to the number of @@ -347,17 +347,17 @@ class ParseDescriptorsTests(unittest.TestCase): descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) self.assertRaises(descriptors.DescriptorWarning, - descriptors.parseBridgeExtraInfoFiles, + descriptors.parseExtraInfoFiles, descFileOne, descFileTwo) - def test_parse_descriptors_parseBridgeExtraInfoFiles_two_files(self): - """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with two + def test_parse_descriptors_parseExtraInfoFiles_two_files(self): + """Test for ``b.p.descriptors.parseExtraInfoFiles`` with two bridge extrainfo files, and check that only the newest extrainfo descriptor is used. """ descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) - routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) + routers = descriptors.parseExtraInfoFiles(descFileOne, descFileTwo) # We shouldn't have duplicates: self.assertEqual(len(routers), 1, @@ -370,15 +370,15 @@ class ParseDescriptorsTests(unittest.TestCase): datetime.datetime.strptime("2014-11-04 08:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") - def test_parse_descriptors_parseBridgeExtraInfoFiles_two_files_reverse(self): - """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with two bridge + def test_parse_descriptors_parseExtraInfoFiles_two_files_reverse(self): + """Test for ``b.p.descriptors.parseExtraInfoFiles`` with two bridge extrainfo files. This time, they are processed in reverse to ensure that we only keep the newer duplicates of descriptors, no matter what order they appeared in the files. """ descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) + routers = descriptors.parseExtraInfoFiles(descFileOne, descFileTwo) self.assertEqual(len(routers), 1, "We shouldn't have any duplicate descriptors.") @@ -389,17 +389,17 @@ class ParseDescriptorsTests(unittest.TestCase): datetime.datetime.strptime("2014-11-04 08:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") - def test_parse_descriptors_parseBridgeExtraInfoFiles_three_files(self): - """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with three + def test_parse_descriptors_parseExtraInfoFiles_three_files(self): + """Test for ``b.p.descriptors.parseExtraInfoFiles`` with three bridge extrainfo files, and check that only the newest extrainfo descriptor is used. """ descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileThree = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) - routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, - descFileTwo, - descFileThree) + routers = descriptors.parseExtraInfoFiles(descFileOne, + descFileTwo, + descFileThree) # We shouldn't have duplicates: self.assertEqual(len(routers), 1, @@ -412,16 +412,16 @@ class ParseDescriptorsTests(unittest.TestCase): datetime.datetime.strptime("2014-12-04 03:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") - def test_parse_descriptors_parseBridgeExtraInfoFiles_no_validate(self): - """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with + def test_parse_descriptors_parseExtraInfoFiles_no_validate(self): + """Test for ``b.p.descriptors.parseExtraInfoFiles`` with descriptor validation disabled. """ descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, - validate=False) + routers = descriptors.parseExtraInfoFiles(descFileOne, + validate=False) self.assertGreaterEqual(len(routers), 1) - def test_parse_descriptosrs_parseBridgeExtraInfoFiles_unparseable(self): + def test_parse_descriptors_parseExtraInfoFiles_unparseable(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, one is an older duplicate, and one is unparseable (it has a bad geoip-db-digest line). There should be only one descriptor returned @@ -441,9 +441,9 @@ class ParseDescriptorsTests(unittest.TestCase): # '_io.BytesIO' object has no attribute 'rpartition'" descFileThree = self.writeTestDescriptorsToFile( "unparseable-descriptor", unparseable) - routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, - descFileTwo, - descFileThree) + routers = descriptors.parseExtraInfoFiles(descFileOne, + descFileTwo, + descFileThree) self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 1, ( "There were three extrainfo descriptors: one was a duplicate, " @@ -461,7 +461,7 @@ class ParseDescriptorsTests(unittest.TestCase): datetime.datetime.strptime("2014-12-04 03:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") - def test_parse_descriptosrs_parseBridgeExtraInfoFiles_unparseable_and_parseable(self): + def test_parse_descriptors_parseExtraInfoFiles_unparseable_and_parseable(self): """Test parsing four extrainfo descriptors: two are valid descriptors, one is an older duplicate of one of the valid descriptors, and one is unparseable (it has a line we shouldn't recognise). There should be @@ -486,10 +486,10 @@ class ParseDescriptorsTests(unittest.TestCase): descFileThree = self.writeTestDescriptorsToFile( "unparseable-descriptor.new", unparseable) descFileFour = io.BytesIO(parseable) - routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, - descFileTwo, - descFileThree, - descFileFour) + routers = descriptors.parseExtraInfoFiles(descFileOne, + descFileTwo, + descFileThree, + descFileFour) self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 2, ( "There were four extrainfo descriptors: one was a duplicate, " @@ -510,7 +510,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn("2B5DA67FBA13A6449DE625673B7AE9E3AA7DF75F", routers.keys(), "The 'parseable' descriptor wasn't returned by the parser.") - def test_parse_descriptosrs_parseBridgeExtraInfoFiles_unparseable_BytesIO(self): + def test_parse_descriptors_parseExtraInfoFiles_unparseable_BytesIO(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, one is an older duplicate, and one is unparseable (it has a bad geoip-db-digest line). The parsing should raise an unhandled @@ -528,12 +528,12 @@ class ParseDescriptorsTests(unittest.TestCase): descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) descFileThree = io.BytesIO(unparseable) self.assertRaises(AttributeError, - descriptors.parseBridgeExtraInfoFiles, + descriptors.parseExtraInfoFiles, descFileOne, descFileTwo, descFileThree) - def test_parse_descriptosrs_parseBridgeExtraInfoFiles_empty_file(self): + def test_parse_descriptors_parseExtraInfoFiles_empty_file(self): """Test parsing an empty extrainfo descriptors file.""" - routers = descriptors.parseBridgeExtraInfoFiles(io.BytesIO('')) + routers = descriptors.parseExtraInfoFiles(io.BytesIO('')) self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 0)

1 0

[bridgedb/master] PEP8 whitespace fix for bridgedb.bridges module.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit dd3192c2279c2e0226fa6c94e38cb90e72e1afa9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 18:57:58 2014 -0800 PEP8 whitespace fix for bridgedb.bridges module. --- lib/bridgedb/bridges.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index dec5e16..6268f6d 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -52,7 +52,6 @@ class MalformedPluggableTransport(MalformedBridgeInfo): class InvalidPluggableTransportIP(MalformedBridgeInfo): """Raised when a :class:`PluggableTransport` has an invalid address.""" - 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