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

[bridgedb/develop] Add unittests for bridgedb.parse.nickname.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 35a51c29eafaa6af69abeaacd36f1b90d90e67cd Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 21:59:14 2015 +0000 Add unittests for bridgedb.parse.nickname. --- lib/bridgedb/test/test_parse_nickname.py | 63 ++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/lib/bridgedb/test/test_parse_nickname.py b/lib/bridgedb/test/test_parse_nickname.py new file mode 100644 index 0000000..fea000a --- /dev/null +++ b/lib/bridgedb/test/test_parse_nickname.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2015, The Tor Project, Inc. +# (c) 2007-2015, all entities within the AUTHORS file +# (c) 2013-2015, Isis Lovecruft +# :license: see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.parse.nickname` module.""" + +from twisted.trial import unittest + +from bridgedb.parse.nickname import isValidRouterNickname + + +class IsValidRouterNicknameTests(unittest.TestCase): + """Unittests for :func:`bridgedb.parse.nickname.isValidRouterNickname`.""" + + def test_parse_nickname_isValidRouterNickname_valid(self): + """isValidRouterNickname() should return True for a valid nickname.""" + name = 'Unmentionable' + self.assertTrue(isValidRouterNickname(name)) + + def test_parse_nickname_isValidRouterNickname_valid_1(self): + """isValidRouterNickname() should return True for a valid nickname.""" + name = 'maketotaldestroy' + self.assertTrue(isValidRouterNickname(name)) + + def test_parse_nickname_isValidRouterNickname_invalid_symbols(self): + """isValidRouterNickname() should return False for an invalid nickname + (with symbols in it). + """ + name = 'what_the_bl#@p?!' + self.assertFalse(isValidRouterNickname(name)) + + def test_parse_nickname_isValidRouterNickname_invalid_too_long(self): + """isValidRouterNickname() should return False for an invalid nickname + (too long). + """ + name = 'ThisIsReallyMoreOfANovellaRatherThanAnOnionRouterNickname' + self.assertFalse(isValidRouterNickname(name)) + + def test_parse_nickname_isValidRouterNickname_invalid_too_short(self): + """isValidRouterNickname() should return False for an invalid nickname + (empty string). + """ + name = '' + self.assertFalse(isValidRouterNickname(name)) + + def test_parse_nickname_isValidRouterNickname_invalid_None(self): + """isValidRouterNickname(None) should return False.""" + name = None + self.assertFalse(isValidRouterNickname(name)) + + def test_parse_nickname_isValidRouterNickname_invalid_spaces(self): + """isValidRouterNickname() should return False for an invalid nickname + (contains spaces). + """ + name = 'As you wish' + self.assertFalse(isValidRouterNickname(name))

1 0

[bridgedb/develop] Merge branch 'develop' into fix/9380-stem_r10
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 0a94b05c376aa4f62f97edd6f7cdfa09db797b83 Merge: 273cd76 034a421 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 21:38:57 2015 +0000 Merge branch 'develop' into fix/9380-stem_r10 lib/bridgedb/test/test_https.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[bridgedb/develop] Fix missing logging module import in bridgedb.parse.nickname.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 492662db13d959729400e9791bd44ee73b09cb3e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 22:01:13 2015 +0000 Fix missing logging module import in bridgedb.parse.nickname. --- lib/bridgedb/parse/nickname.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/parse/nickname.py b/lib/bridgedb/parse/nickname.py index 9c3a559..8f4abea 100644 --- a/lib/bridgedb/parse/nickname.py +++ b/lib/bridgedb/parse/nickname.py @@ -23,6 +23,7 @@ bridgedb.parse.nicknames .. """ +import logging import string

1 0

[bridgedb/develop] Merge branch 'fix/9380-stem_r10' into develop
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit e48437a8a246d6a32aae2e00c97af667d99630d6 Merge: 034a421 8dc041b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 23:06:25 2015 +0000 Merge branch 'fix/9380-stem_r10' into develop .test.requirements.txt | 2 +- .travis.requirements.txt | 3 +- lib/bridgedb/Bridges.py | 687 +---------- lib/bridgedb/Filters.py | 89 +- lib/bridgedb/HTTPServer.py | 5 +- lib/bridgedb/Main.py | 238 ++-- lib/bridgedb/Stability.py | 2 +- lib/bridgedb/Storage.py | 5 +- lib/bridgedb/Tests.py | 780 ------------ lib/bridgedb/bridgerequest.py | 54 +- lib/bridgedb/bridges.py | 1586 +++++++++++++++++++++++++ lib/bridgedb/configure.py | 17 +- lib/bridgedb/crypto.py | 41 + lib/bridgedb/parse/descriptors.py | 274 +++++ lib/bridgedb/parse/fingerprint.py | 16 +- lib/bridgedb/parse/networkstatus.py | 280 ----- lib/bridgedb/parse/nickname.py | 58 + lib/bridgedb/schedule.py | 6 +- lib/bridgedb/test/deprecated.py | 520 ++++++++ lib/bridgedb/test/deprecated_networkstatus.py | 275 +++++ lib/bridgedb/test/legacy_Tests.py | 725 +++++++++++ lib/bridgedb/test/test_Bridges.py | 199 ---- lib/bridgedb/test/test_Tests.py | 13 +- lib/bridgedb/test/test_bridges.py | 1345 +++++++++++++++++++++ lib/bridgedb/test/test_crypto.py | 61 + lib/bridgedb/test/test_parse_descriptors.py | 653 ++++++++++ lib/bridgedb/test/test_parse_networkstatus.py | 414 ------- lib/bridgedb/test/test_parse_nickname.py | 63 + setup.py | 2 +- 29 files changed, 5887 insertions(+), 2526 deletions(-)

1 0

[bridgedb/develop] Add unittest for bridgdb.crypto.removePKCS1Padding().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 8dc041bc9efdc1c4c45e3a4aa5d5b579befc1844 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 22:19:17 2015 +0000 Add unittest for bridgdb.crypto.removePKCS1Padding(). --- lib/bridgedb/test/test_crypto.py | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index aca5d2c..2187475 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -14,6 +14,7 @@ from __future__ import print_function from __future__ import unicode_literals +import base64 import gpgme import io import logging @@ -86,6 +87,66 @@ class GetKeyTests(unittest.TestCase): % (key.encode('hex'), SEKRIT_KEY.encode('hex'))) +class RemovePKCS1PaddingTests(unittest.TestCase): + """Unittests for :func:`bridgedb.crypto.removePKCS1Padding`.""" + + def setUp(self): + """This blob *is* actually a correctly formed PKCS#1 padded signature + on the descriptor:: + + @purpose bridge + router ExhalesPeppier 118.16.116.176 35665 0 0 + or-address [eef2:d52a:cf1b:552f:375d:f8d0:a72b:e794]:35664 + platform Tor 0.2.4.5-alpha on Linux + protocols Link 1 2 Circuit 1 + published 2014-11-03 21:21:43 + fingerprint FA04 5CFF AB95 BA20 C994 FE28 9B23 583E F80F 34DA + uptime 10327748 + bandwidth 2247108152 2540209215 1954007088 + extra-info-digest 571BF23D8F24F052483C1333EBAE9B91E4A6F422 + onion-key + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBAK7+a033aUqc97SWFVGFwR3ybQ0jG1HTPtsv2/fUfZPwCaf21ly4zIvH + 9uNhtkcPH2p55X+n5M7OUaQawOzbwL4tSR9SLy9bGuZdWLbhu2GHQWmDkAB7BtHp + UC+uGTN3jvQXEG2xlzpb+lOVUVNXLhL5kFmAXxL+iwN4TeEv/iCnAgMBAAE= + -----END RSA PUBLIC KEY----- + signing-key + -----BEGIN RSA PUBLIC KEY----- + MIGJAoGBANxmgJ6S3rBAGcvQu2tWBaHByJxeJkdGbxID2b8cITPaNmcl72e3Kd44 + GGIkoKhkX0SAO+i2U+Q41u/DPEBWLxhpl9GAFJZ10dcT18lL36yaK6FRDOcF9jx9 + 0A023/kwXd7QQDWqP7Fso+141bzit6ENvNmE1mvEeIoAR+EpJB1tAgMBAAE= + -----END RSA PUBLIC KEY----- + contact Somebody <somebody(a)example.com> + ntor-onion-key 0Mfi/Af7zLmdNdrmJyPbZxPJe7TZU/hV4Z865g3g+k4 + reject *:* + router-signature + -----BEGIN SIGNATURE----- + PsGGIP+V9ZXWIHjK943CMAPem3kFbO9kt9rvrPhd64u0f7ytB/qZGaOg1IEWki1I + f6ZNjrthxicm3vnEUdhpRsyn7MUFiQmqLjBfqdzh0GyfrtU5HHr7CBV3tuhgVhik + uY1kPNo1C8wkmuy31H3V7NXj+etZuzZN66qL3BiQwa8= + -----END SIGNATURE----- + + However, for the blob to be valid it would need to be converted from + base64-decoded bytes to a long, then raised by the power of the public + exponent within the ASN.1 DER decoded signing-key (mod that key's + public modulus), then re-converted back into bytes before attempting + to remove the PKCS#1 padding. (See + :meth:`bridedb.bridges.Bridge._verifyExtraInfoSignature`.) + """ + blob = ('PsGGIP+V9ZXWIHjK943CMAPem3kFbO9kt9rvrPhd64u0f7ytB/qZGaOg1IEWk' + 'i1If6ZNjrthxicm3vnEUdhpRsyn7MUFiQmqLjBfqdzh0GyfrtU5HHr7CBV3tu' + 'hgVhikuY1kPNo1C8wkmuy31H3V7NXj+etZuzZN66qL3BiQwa8=') + self.blob = base64.b64decode(blob) + + def test_crypto_removePKCS1Padding_bad_padding(self): + """removePKCS1Padding() with a blob with a bad PKCS#1 identifier mark + should raise PKCS1PaddingError. + """ + self.assertRaises(crypto.PKCS1PaddingError, + crypto.removePKCS1Padding, + self.blob) + + class LessCrypticGPGMEErrorTests(unittest.TestCase): """Unittests for :class:`bridgedb.crypto.LessCrypticGPGMEError`."""

1 0

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

19 Feb '15

commit 0e8200f0352865ea3eb3ce235bf431677a835598 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 01:29:04 2015 +0000 Remove Bridges.getExtraInfoDigests(). This functionality is now built into the bridgedb.bridges.Bridge class, and the retrieval of the digest values is done per-descriptor. * REMOVE bridgedb.Bridges.getExtraInfoDigests() function. --- lib/bridgedb/Bridges.py | 31 ------------------------------- lib/bridgedb/test/test_bridges.py | 24 ------------------------ 2 files changed, 55 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a8b0a4f..e92e23e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -42,37 +42,6 @@ DIGEST_LEN = 20 PORTSPEC_LEN = 16 -def getExtraInfoDigests(doc): - """Return the SHA-1 hash hexdigests of all extra-info documents - - :param File doc: A string containing the contents of one - or more bridge extra-info documents concatenated - together. - :returns: A dict indexed by the SHA-1 hexdigest of the bridge - extra-info doc, equivalent to that which was published - on the 'extra-info-digest' line of the bridge's - descriptor. The value is the bridge's extra-info document - digest, or None, if not provided. - """ - if not doc: return None - - documents = {} - sha1hash = hashlib.sha1() - document_content = '' - - for line in doc: - if line != '-----BEGIN SIGNATURE-----\n': - sha1hash.update(line) - document_content += line - else: - digest = sha1hash.hexdigest().lower() - documents[digest] = StringIO(document_content) - while line != '-----END SIGNATURE-----\n': - line = next(doc) - sha1hash = hashlib.sha1() - document_content = '' - return documents - def parseDescFile(f, bridge_purpose='bridge'): """Generator. Parses a cached-descriptors file 'f' and yeilds a Bridge object for every entry whose purpose matches bridge_purpose. diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index aff6e65..8ff0557 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_getExtraInfoDigests test_integration_getExtraInfoDigests test_splitterBridgeInsertion test_integration_splitterBridgeInsertion ============================================== ======================== .. @@ -286,29 +285,6 @@ class BridgeIntegrationTests(unittest.TestCase): % (self.fingerprint, ptArgsList), bridgeLine) - def test_integration_getExtraInfoDigests(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() - - test = "Many words and line all together\n" - test += "extra info is nothing like weather\n" - test += "it's certain to come, like the key in a hum\n" - test += "but sometimes without a transport and rum\n" - content = test - sha1hash.update(test) - digest = sha1hash.hexdigest() - test += "-----BEGIN SIGNATURE-----\n" - test += "But the rum can't save the world like you\n" - test += "-----END SIGNATURE-----\n" - digests = bridges.getExtraInfoDigests(io.StringIO(test)) - self.failUnlessIn(digest, digests) - self.failUnlessEqual(content, digests[digest].read()) - def test_integration_splitterBridgeInsertion(self): key = "Testing-Bridges-To-Rings" splitter = FilteredBridgeSplitter(key)

1 0

[bridgedb/develop] Deprecate the bridgedb.parse.networkstatus module.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 399552ae06b56c7f703303e9d0c638253657d1bb Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 21:58:51 2015 +0000 Deprecate the bridgedb.parse.networkstatus module. * MOVE bridgedb.parse.networkstatus to bridgedb.test.deprecated_networkstatus and wrap all callables within with @twisted.python.deprecate.deprecated. * REMOVE the import of bridgedb.parse.networkstatus in bridgedb.Bridges module. * CHANGE legacy_Tests.py to import deprecated_networkstatus to continue to check for regressions in other parts of the codebase. * REMOVE bridgedb.test.test_parse_networkstatus.py. --- lib/bridgedb/Bridges.py | 1 - lib/bridgedb/parse/networkstatus.py | 263 ---------------- lib/bridgedb/test/deprecated_networkstatus.py | 275 ++++++++++++++++ lib/bridgedb/test/legacy_Tests.py | 2 +- lib/bridgedb/test/test_parse_networkstatus.py | 414 ------------------------- 5 files changed, 276 insertions(+), 679 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 31b7cf6..bdb911a 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -25,7 +25,6 @@ import bridgedb.Bucket from bridgedb.bridges import Bridge from bridgedb.crypto import getHMACFunc from bridgedb.parse import addr -from bridgedb.parse import networkstatus from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex from bridgedb.parse.fingerprint import isValidFingerprint diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py deleted file mode 100644 index 8140fe0..0000000 --- a/lib/bridgedb/parse/networkstatus.py +++ /dev/null @@ -1,263 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2013 Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file -# :license: 3-clause BSD, see included LICENSE for information - -"""Parsers for bridge networkstatus descriptors. - -.. py:module:: bridgedb.parse.networkstatus - :synopsis: Parsers for ``@type bridge-network-status`` descriptors_. -.. _descriptors: https://metrics.torproject.org/formats.html#descriptortypes - - -bridgedb.parse.networkstatus -============================ -:: - - networkstatus - |_ isValidRouterNickname - Determine if a nickname is according to spec - |_ parseRLine - Parse an 'r'-line from a networkstatus document - |_ parseALine - Parse an 'a'-line from a networkstatus document - \_ parseSLine - Parse an 's'-line from a networkstatus document -.. -""" - -import binascii -import logging -import string -import time -import warnings - -from twisted.python.log import showwarning - -from bridgedb.parse import addr -from bridgedb.parse import parseUnpaddedBase64 -from bridgedb.parse import InvalidBase64 -from bridgedb.parse.nickname import InvalidRouterNickname -from bridgedb.parse.nickname import isValidRouterNickname - - -class NetworkstatusParsingError(Exception): - """Unable to parse networkstatus document line.""" - -class InvalidNetworkstatusRouterIdentity(ValueError): - """The ID field of a networkstatus document 'r'-line is invalid.""" - - -def parseRLine(line): - """Parse an 'r'-line from a networkstatus document. - - From torspec.git/dir-spec.txt, commit 36761c7d553d L1499-1512: - | "r" SP nickname SP identity SP digest SP publication SP IP SP ORPort - | SP DirPort NL - | - | [At start, exactly once.] - | - | "Nickname" is the OR's nickname. "Identity" is a hash of its - | identity key, encoded in base64, with trailing equals sign(s) - | removed. "Digest" is a hash of its most recent descriptor as - | signed (that is, not including the signature), encoded in base64. - | "Publication" is the - | publication time of its most recent descriptor, in the form - | YYYY-MM-DD HH:MM:SS, in UTC. "IP" is its current IP address; - | ORPort is its current OR port, "DirPort" is its current directory - | port, or "0" for "none". - - :param string line: An 'r'-line from an bridge-network-status descriptor. - :returns: - A 7-tuple of:: - (nickname, identityDigest, descriptorDigest, timestamp, - orAddress, orPort, dirport) - where each value is set according to the data parsed from the - **line**, or ``None`` if nothing suitable could be parsed. - """ - (nickname, ID, descDigest, timestamp, - ORaddr, ORport, dirport) = (None for x in xrange(7)) - - try: - if not line.startswith('r '): - raise NetworkstatusParsingError( - "Networkstatus parser received non 'r'-line: %r" % line) - - line = line[2:] # Chop off the 'r ' - fields = line.split() - - if len(fields) != 8: - raise NetworkstatusParsingError( - "Wrong number of fields in networkstatus 'r'-line: %r" % line) - - nickname, ID = fields[:2] - - try: - ID = parseUnpaddedBase64(ID) - except InvalidBase64 as error: - raise InvalidNetworkstatusRouterIdentity(error) - - # Check the nickname validity after parsing the ID, otherwise, if the - # nickname is invalid, we end up with the nickname being ``None`` and - # the ID being unparsed, unpadded (meaning it is technically invalid) - # base64. - isValidRouterNickname(nickname) - - except NetworkstatusParsingError as error: - logging.error(error) - nickname, ID = None, None - except InvalidRouterNickname as error: - logging.error(error) - # Assume that we mostly care about obtaining the OR's ID, then it - # should be okay to set the nickname to ``None``, if it was invalid. - nickname = None - except InvalidNetworkstatusRouterIdentity as error: - logging.error(error) - ID = None - else: - try: - descDigest = parseUnpaddedBase64(fields[2]) - timestamp = time.mktime(time.strptime(" ".join(fields[3:5]), - "%Y-%m-%d %H:%M:%S")) - ORaddr = fields[5] - ORport = int(fields[6]) - dirport = fields[7] - except InvalidBase64 as error: - logging.error(error) - descDigest = None - except (AttributeError, ValueError, IndexError) as error: - logging.error(error) - timestamp = None - finally: - return (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport) - -def parseALine(line, fingerprint=None): - """Parse an 'a'-line of a bridge networkstatus document. - - From torspec.git/dir-spec.txt, commit 36761c7d553d L1499-1512: - | - | "a" SP address ":" port NL - | - | [Any number.] - | - | Present only if the OR has at least one IPv6 address. - | - | Address and portlist are as for "or-address" as specified in - | 2.1. - | - | (Only included when the vote or consensus is generated with - | consensus-method 14 or later.) - - :param string line: An 'a'-line from an bridge-network-status descriptor. - :type fingerprint: string or None - :param fingerprint: A string which identifies which OR the descriptor - we're parsing came from (since the 'a'-line doesn't tell us, this can - help make the log messages clearer). - :raises: :exc:`NetworkstatusParsingError` - :rtype: tuple - :returns: A 2-tuple of a string respresenting the IP address and a - :class:`bridgedb.parse.addr.PortList`. - """ - ip = None - portlist = None - - if line.startswith('a '): - line = line[2:] # Chop off the 'a ' - else: - logging.warn("Networkstatus parser received non 'a'-line for %r:"\ - " %r" % (fingerprint or 'Unknown', line)) - - try: - ip, portlist = line.rsplit(':', 1) - except ValueError as error: - logging.error("Bad separator in networkstatus 'a'-line: %r" % line) - return (None, None) - - if ip.startswith('[') and ip.endswith(']'): - ip = ip.strip('[]') - - try: - if not addr.isIPAddress(ip): - raise NetworkstatusParsingError( - "Got invalid IP Address in networkstatus 'a'-line for %r: %r" - % (fingerprint or 'Unknown', line)) - - if addr.isIPv4(ip): - warnings.warn(FutureWarning( - "Got IPv4 address in networkstatus 'a'-line! "\ - "Networkstatus document format may have changed!")) - except NetworkstatusParsingError as error: - logging.error(error) - ip, portlist = None, None - - try: - portlist = addr.PortList(portlist) - if not portlist: - raise NetworkstatusParsingError( - "Got invalid portlist in 'a'-line for %r!\n Line: %r" - % (fingerprint or 'Unknown', line)) - except (addr.InvalidPort, NetworkstatusParsingError) as error: - logging.error(error) - portlist = None - else: - logging.debug("Parsed networkstatus ORAddress line for %r:"\ - "\n Address: %s \tPorts: %s" - % (fingerprint or 'Unknown', ip, portlist)) - finally: - return (ip, portlist) - -def parseSLine(line): - """Parse an 's'-line from a bridge networkstatus document. - - The 's'-line contains all flags assigned to a bridge. The flags which may - be assigned to a bridge are as follows: - - From torspec.git/dir-spec.txt, commit 36761c7d553d L1526-1554: - | - | "s" SP Flags NL - | - | [Exactly once.] - | - | A series of space-separated status flags, in lexical order (as ASCII - | byte strings). Currently documented flags are: - | - | "BadDirectory" if the router is believed to be useless as a - | directory cache (because its directory port isn't working, - | its bandwidth is always throttled, or for some similar - | reason). - | "Fast" if the router is suitable for high-bandwidth circuits. - | "Guard" if the router is suitable for use as an entry guard. - | "HSDir" if the router is considered a v2 hidden service directory. - | "Named" if the router's identity-nickname mapping is canonical, - | and this authority binds names. - | "Stable" if the router is suitable for long-lived circuits. - | "Running" if the router is currently usable. - | "Valid" if the router has been 'validated'. - | "V2Dir" if the router implements the v2 directory protocol. - - :param string line: An 's'-line from an bridge-network-status descriptor. - :rtype: tuple - :returns: A 2-tuple of booleans, the first is True if the bridge has the - "Running" flag, and the second is True if it has the "Stable" flag. - """ - line = line[2:] - - flags = [x.capitalize() for x in line.split()] - fast = 'Fast' in flags - running = 'Running' in flags - stable = 'Stable' in flags - guard = 'Guard' in flags - valid = 'Valid' in flags - - if (fast or running or stable or guard or valid): - logging.debug("Parsed Flags: %s%s%s%s%s" - % ('Fast ' if fast else '', - 'Running ' if running else '', - 'Stable ' if stable else '', - 'Guard ' if guard else '', - 'Valid ' if valid else '')) - - # Right now, we only care about 'Running' and 'Stable' - return running, stable diff --git a/lib/bridgedb/test/deprecated_networkstatus.py b/lib/bridgedb/test/deprecated_networkstatus.py new file mode 100644 index 0000000..7e3b0a4 --- /dev/null +++ b/lib/bridgedb/test/deprecated_networkstatus.py @@ -0,0 +1,275 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013 Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + +"""Parsers for bridge networkstatus descriptors. + +THIS ENTIRE MODULE WAS DEPRECATED (AS PART OF #9380_) AND WAS REPLACED WITH +THE CORRESPONDING FUNCTIONS IN :mod:`bridgedb.parse.descriptors`. + +.. #9380: https://bugs.torproject.org/9380 + +.. py:module:: bridgedb.parse.networkstatus + :synopsis: Parsers for ``@type bridge-network-status`` descriptors_. +.. _descriptors: https://metrics.torproject.org/formats.html#descriptortypes + + +bridgedb.parse.networkstatus +============================ +:: + + networkstatus + |_ isValidRouterNickname - Determine if a nickname is according to spec + |_ parseRLine - Parse an 'r'-line from a networkstatus document + |_ parseALine - Parse an 'a'-line from a networkstatus document + \_ parseSLine - Parse an 's'-line from a networkstatus document +.. +""" + +import binascii +import logging +import string +import time +import warnings + +from twisted.python import deprecate +from twisted.python.log import showwarning +from twisted.python.versions import Version + +from bridgedb.parse import addr +from bridgedb.parse import parseUnpaddedBase64 +from bridgedb.parse import InvalidBase64 +from bridgedb.parse.nickname import InvalidRouterNickname +from bridgedb.parse.nickname import isValidRouterNickname + + +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 5)) +class NetworkstatusParsingError(Exception): + """Unable to parse networkstatus document line.""" + +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 5)) +class InvalidNetworkstatusRouterIdentity(ValueError): + """The ID field of a networkstatus document 'r'-line is invalid.""" + + +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 5)) +def parseRLine(line): + """Parse an 'r'-line from a networkstatus document. + + From torspec.git/dir-spec.txt, commit 36761c7d553d L1499-1512: + | "r" SP nickname SP identity SP digest SP publication SP IP SP ORPort + | SP DirPort NL + | + | [At start, exactly once.] + | + | "Nickname" is the OR's nickname. "Identity" is a hash of its + | identity key, encoded in base64, with trailing equals sign(s) + | removed. "Digest" is a hash of its most recent descriptor as + | signed (that is, not including the signature), encoded in base64. + | "Publication" is the + | publication time of its most recent descriptor, in the form + | YYYY-MM-DD HH:MM:SS, in UTC. "IP" is its current IP address; + | ORPort is its current OR port, "DirPort" is its current directory + | port, or "0" for "none". + + :param string line: An 'r'-line from an bridge-network-status descriptor. + :returns: + A 7-tuple of:: + (nickname, identityDigest, descriptorDigest, timestamp, + orAddress, orPort, dirport) + where each value is set according to the data parsed from the + **line**, or ``None`` if nothing suitable could be parsed. + """ + (nickname, ID, descDigest, timestamp, + ORaddr, ORport, dirport) = (None for x in xrange(7)) + + try: + if not line.startswith('r '): + raise NetworkstatusParsingError( + "Networkstatus parser received non 'r'-line: %r" % line) + + line = line[2:] # Chop off the 'r ' + fields = line.split() + + if len(fields) != 8: + raise NetworkstatusParsingError( + "Wrong number of fields in networkstatus 'r'-line: %r" % line) + + nickname, ID = fields[:2] + + try: + ID = parseUnpaddedBase64(ID) + except InvalidBase64 as error: + raise InvalidNetworkstatusRouterIdentity(error) + + # Check the nickname validity after parsing the ID, otherwise, if the + # nickname is invalid, we end up with the nickname being ``None`` and + # the ID being unparsed, unpadded (meaning it is technically invalid) + # base64. + isValidRouterNickname(nickname) + + except NetworkstatusParsingError as error: + logging.error(error) + nickname, ID = None, None + except InvalidRouterNickname as error: + logging.error(error) + # Assume that we mostly care about obtaining the OR's ID, then it + # should be okay to set the nickname to ``None``, if it was invalid. + nickname = None + except InvalidNetworkstatusRouterIdentity as error: + logging.error(error) + ID = None + else: + try: + descDigest = parseUnpaddedBase64(fields[2]) + timestamp = time.mktime(time.strptime(" ".join(fields[3:5]), + "%Y-%m-%d %H:%M:%S")) + ORaddr = fields[5] + ORport = int(fields[6]) + dirport = fields[7] + except InvalidBase64 as error: + logging.error(error) + descDigest = None + except (AttributeError, ValueError, IndexError) as error: + logging.error(error) + timestamp = None + finally: + return (nickname, ID, descDigest, timestamp, ORaddr, ORport, dirport) + +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 5)) +def parseALine(line, fingerprint=None): + """Parse an 'a'-line of a bridge networkstatus document. + + From torspec.git/dir-spec.txt, commit 36761c7d553d L1499-1512: + | + | "a" SP address ":" port NL + | + | [Any number.] + | + | Present only if the OR has at least one IPv6 address. + | + | Address and portlist are as for "or-address" as specified in + | 2.1. + | + | (Only included when the vote or consensus is generated with + | consensus-method 14 or later.) + + :param string line: An 'a'-line from an bridge-network-status descriptor. + :type fingerprint: string or None + :param fingerprint: A string which identifies which OR the descriptor + we're parsing came from (since the 'a'-line doesn't tell us, this can + help make the log messages clearer). + :raises: :exc:`NetworkstatusParsingError` + :rtype: tuple + :returns: A 2-tuple of a string respresenting the IP address and a + :class:`bridgedb.parse.addr.PortList`. + """ + ip = None + portlist = None + + if line.startswith('a '): + line = line[2:] # Chop off the 'a ' + else: + logging.warn("Networkstatus parser received non 'a'-line for %r:"\ + " %r" % (fingerprint or 'Unknown', line)) + + try: + ip, portlist = line.rsplit(':', 1) + except ValueError as error: + logging.error("Bad separator in networkstatus 'a'-line: %r" % line) + return (None, None) + + if ip.startswith('[') and ip.endswith(']'): + ip = ip.strip('[]') + + try: + if not addr.isIPAddress(ip): + raise NetworkstatusParsingError( + "Got invalid IP Address in networkstatus 'a'-line for %r: %r" + % (fingerprint or 'Unknown', line)) + + if addr.isIPv4(ip): + warnings.warn(FutureWarning( + "Got IPv4 address in networkstatus 'a'-line! "\ + "Networkstatus document format may have changed!")) + except NetworkstatusParsingError as error: + logging.error(error) + ip, portlist = None, None + + try: + portlist = addr.PortList(portlist) + if not portlist: + raise NetworkstatusParsingError( + "Got invalid portlist in 'a'-line for %r!\n Line: %r" + % (fingerprint or 'Unknown', line)) + except (addr.InvalidPort, NetworkstatusParsingError) as error: + logging.error(error) + portlist = None + else: + logging.debug("Parsed networkstatus ORAddress line for %r:"\ + "\n Address: %s \tPorts: %s" + % (fingerprint or 'Unknown', ip, portlist)) + finally: + return (ip, portlist) + +(a)deprecate.deprecated(Version('bridgedb', 0, 2, 5)) +def parseSLine(line): + """Parse an 's'-line from a bridge networkstatus document. + + The 's'-line contains all flags assigned to a bridge. The flags which may + be assigned to a bridge are as follows: + + From torspec.git/dir-spec.txt, commit 36761c7d553d L1526-1554: + | + | "s" SP Flags NL + | + | [Exactly once.] + | + | A series of space-separated status flags, in lexical order (as ASCII + | byte strings). Currently documented flags are: + | + | "BadDirectory" if the router is believed to be useless as a + | directory cache (because its directory port isn't working, + | its bandwidth is always throttled, or for some similar + | reason). + | "Fast" if the router is suitable for high-bandwidth circuits. + | "Guard" if the router is suitable for use as an entry guard. + | "HSDir" if the router is considered a v2 hidden service directory. + | "Named" if the router's identity-nickname mapping is canonical, + | and this authority binds names. + | "Stable" if the router is suitable for long-lived circuits. + | "Running" if the router is currently usable. + | "Valid" if the router has been 'validated'. + | "V2Dir" if the router implements the v2 directory protocol. + + :param string line: An 's'-line from an bridge-network-status descriptor. + :rtype: tuple + :returns: A 2-tuple of booleans, the first is True if the bridge has the + "Running" flag, and the second is True if it has the "Stable" flag. + """ + line = line[2:] + + flags = [x.capitalize() for x in line.split()] + fast = 'Fast' in flags + running = 'Running' in flags + stable = 'Stable' in flags + guard = 'Guard' in flags + valid = 'Valid' in flags + + if (fast or running or stable or guard or valid): + logging.debug("Parsed Flags: %s%s%s%s%s" + % ('Fast ' if fast else '', + 'Running ' if running else '', + 'Stable ' if stable else '', + 'Guard ' if guard else '', + 'Valid ' if valid else '')) + + # Right now, we only care about 'Running' and 'Stable' + return running, stable diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 7be5270..d416d22 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -35,7 +35,7 @@ from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.Stability import BridgeHistory from bridgedb.parse import addr -from bridgedb.parse import networkstatus +from bridgedb.test import deprecated_networkstatus as networkstatus from math import log diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py deleted file mode 100644 index 6a89c25..0000000 --- a/lib/bridgedb/test/test_parse_networkstatus.py +++ /dev/null @@ -1,414 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# :copyright: (c) 2013-2014, Isis Lovecruft -# (c) 2007-2014, The Tor Project, Inc. -# :license: 3-Clause BSD, see LICENSE for licensing information - -"""Unittests for the :mod:`bridgedb.parse.networkstatus` module. - -These tests are meant to ensure that the :mod:`bridgedb.parse.networkstatus` -module is functioning correctly. -""" - -from __future__ import print_function -from __future__ import unicode_literals - -import binascii - -from twisted.python import log -from twisted.trial import unittest -from bridgedb.parse import networkstatus - -import sure -from sure import this, these, those, the, it - - -logFormat = "%(created)d [%(levelname)s] %(module)s.%(funcName)s(): " -logFormat += "%(message)s" -networkstatus.logging.basicConfig( - filename='test_parse_networkstatus.log', - level=networkstatus.logging.DEBUG, - flags='w', format=logFormat) - - -class ParseNetworkStatusRLineTests(unittest.TestCase): - """Tests for :func:`bridgedb.parse.networkstatus.parseRLine`. - - The documentation for all class variables, e.g. 'pre' or 'ident', refers - to what said value should be in a *valid* descriptor. - """ - rawIdent = 'identdigestidentdig' - rawDesc = 'descdigestdescdiges' - - #: The prefix for the 'r'-line. Should be an 'r', unless testing that - #: lines with unknown prefixes are dropped. - pre = 'r ' - #: An OR nickname string. To be valid, it should be 1-19 alphanumeric - #: upper or lower cased characters. - nick = 'Testing' - #: A base64-encoded, SHA-1 digest of the DER-formatted, ASN.1-encoded, - #: public portion of an OR identity key, with any trailing base64 padding - #: (any '=' characters) removed. - ident = binascii.b2a_base64(rawIdent).strip().rstrip('==') - #: A base64-encoded, SHA-1 digest of the OR - #: `@type-[bridge-]server-descriptor` document (the whole thing, up until - #: the 'router signature' line, but not including the signature thereafter), - #: with any trailing base64 padding (any '=' characters) removed. - desc = binascii.b2a_base64(rawDesc).strip().rstrip('==') - #: An ISO-8661 formatted timestamp, with a space separator (rather than a - #: 'T' character). - ts = '2013-10-31 15:15:15' - #: An IPv4 address. - ip = '221.251.0.42' - #: An ORPort number. - port = '9001' - #: A DirPort number. - dirp = '0' - - def makeRLine(self, *args, **kwargs): - """Concatenate parameters into an 'r'-line and store the result as - ``self.line``. - - :keywords: The keyword arguments may be any of the class variables, - i.e. 'nick' or 'ident', and the variables should be similar - to the defaults in the class variables. If not given as - parameters, the class variables will be used. - """ - line = [] - for kw in ('pre', 'nick', 'ident', 'desc', 'ts', 'ip', 'port', 'dirp'): - if kw in kwargs.keys(): - if kwargs[kw]: - line.append(kwargs[kw]) - elif kwargs[kw] is False: - pass - else: - line.append(getattr(self, kw, '')) - - self.line = ' '.join([l for l in line]).strip() - log.msg("\n Testing networkstatusline:\n %r..." % self.line) - self.assertTrue(self.line != '') - - def tearDown(self): - self.line = '' - - def assertAllFieldsAreNone(self, fields): - """Assert that every field in the iterable ``fields`` is None.""" - for field in fields: - self.assertTrue(field is None) - - def test_missingPrefix(self): - """Test a networkstatus 'r'-line that is missing the 'r ' prefix.""" - self.makeRLine(pre=False) - fields = networkstatus.parseRLine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_wrongNumberOfFields(self): - """Test a line missing digest, ORPort, and DirPort fields.""" - self.makeRLine(desc=False, port=False, dirp=False) - fields = networkstatus.parseRLine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_wrongFieldOrder(self): - """Test a line with the identity and descriptor digests switched.""" - self.makeRLine(desc=self.ident, ident=self.desc) - fields = networkstatus.parseRLine(self.line) - nick, others = fields[0], fields[1:] - - this(nick).should.be.ok - this(nick).should.be.a(basestring) - this(nick).should.equal(self.nick) - - the(others).should.be.a(tuple) - the(others).should.have.length_of(6) - for other in others: - the(other).should.be(None) - - def test_invalidNicknameNonAlphanumeric(self): - """Test a line with a non-alphanumeric router nickname.""" - self.makeRLine(nick='abcdef/*comment*/') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc = fields[:3] - this(nick).should.be(None) - the(ident).should.be.a(basestring) - the(desc).should.be(None) - - def test_invalidNicknameTooLong(self): - """Test a line with a router nickname which is way too long.""" - self.makeRLine(nick='ThisIsAReallyReallyLongRouterNickname') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc = fields[:3] - this(nick).should.be(None) - the(ident).should.be.a(basestring) - the(desc).should.be(None) - - def test_invalidIdentBase64(self): - """Test line with '%$>@,<' for an identity digest.""" - self.makeRLine(ident='%$>#@,<') - (nick, ident, desc, ts, - ip, port, dirp) = networkstatus.parseRLine(self.line) - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.equal(self.nick) - the(ident).should.be(None) - the(desc).should.be(None) - - def test_invalidIdentSingleQuoteChar(self): - """Test a line with a single quote character for the identity digest.""" - self.makeRLine(ident=chr(0x27)) - fields = networkstatus.parseRLine(self.line) - nick, ident, desc = fields[:3] - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.be.equal(self.nick) - the(ident).should.be.equal(None) - the(desc).should.be.equal(None) - - def test_invalidIdent_withBase64padding(self): - """Test a line with invalid base64 (no padding) identity digest.""" - self.makeRLine(ident=self.ident + '==') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc = fields[:3] - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.be.equal(self.nick) - the(ident).should.be.equal(None) - the(desc).should.be.equal(None) - - def test_invalidDescriptorDigest(self): - """Test an 'r'-line with invalid base64 descriptor digest.""" - self.makeRLine(desc='敃噸襶') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc, ts, ip = fields[:5] - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.be.equal(self.nick) - - the(ident).should.be.a(basestring) - the(ident).should.be.equal(self.rawIdent) - - the(desc).should.be.equal(None) - the(ts).should.be.equal(None) - the(ip).should.be.equal(None) - - def test_invalidDescriptorDigest_invalidBase64(self): - """Test line with '%$>@,<' for an identity digest.""" - self.makeRLine(desc='%$>#@,<') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc, ts, ip = fields[:5] - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.equal(self.nick) - the(ident).should.be(None) - the(desc).should.be(None) - - def test_invalidDescriptorDigest_withBase64padding(self): - """Test a line with invalid base64 (no padding) descriptor digest.""" - self.makeRLine(desc=self.desc + '==') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc, ts, ip = fields[:5] - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.be.equal(self.nick) - - the(ident).should.be.a(basestring) - the(ident).should.be.equal(self.rawIdent) - - the(desc).should.be.equal(None) - the(ts).should.be.equal(None) - the(ip).should.be.equal(None) - - def test_invalidDescriptorDigest_singleQuoteChar(self): - """Test with a single quote character for the descriptor digest.""" - self.makeRLine(desc=chr(0x27)) - fields = networkstatus.parseRLine(self.line) - nick, ident, desc = fields[:3] - - the(nick).should.be.ok - the(nick).should.be.a(basestring) - the(nick).should.be.equal(self.nick) - the(ident).should.be.equal(self.rawIdent) - the(desc).should.be.equal(None) - - def test_missingAfterDesc(self): - """Test a line that has a valid descriptor digest, and is missing - everything after the descriptor digest, i.e. the timestamp, IP address, - and DirPort. - """ - self.makeRLine(nick='missingAfterDesc', ts=False, ip=False, dirp=False) - fields = networkstatus.parseRLine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_missingAfterIdent(self): - """Test a line that and is missing the descriptor digest and - everything after it, i.e. the timestamp, IP address, and DirPort. - """ - self.makeRLine(nick='noDesc', desc=False, ts=False, - ip=False, dirp=False) - fields = networkstatus.parseRLine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_invalidTimestamp(self): - """Test line with two large integers for the timestamp.""" - self.makeRLine(ts='123456789 987654321') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc, ts, ip, port = fields[:6] - - the(nick).should.be.equal(self.nick) - the(ident).should.be.equal(self.rawIdent) - - # descDigest is set to `None` if there is an error while parsing: - the(desc).should.be(None) - the(ts).should.be(None) - the(ip).should.be(None) - - def test_invalidTimestampMissingDate(self): - """Test a line where the timestamp is missing the date portion.""" - self.makeRLine(ts='15:15:15') - fields = networkstatus.parseRLine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_invalidIPAddress(self): - """Test a line with an invalid IP address.""" - self.makeRLine(ip='0.0.0.0') - fields = networkstatus.parseRLine(self.line) - nick, ident, desc, ts, ip, port = fields[:6] - - the(nick).should.be.equal(self.nick) - the(ident).should.be.equal(self.rawIdent) - - # descDigest is set to `None` if there is an error while parsing: - the(desc).should.be(None) - the(ts).should.be(None) - the(ip).should.be(None) - - def test_valid(self): - """Test a valid 'r'-line.""" - self.makeRLine() - fields = networkstatus.parseRLine(self.line) - nick, ident, desc, ts, ip, port = fields[:6] - the(nick).should.be.equal(self.nick) - the(ident).should.be.equal(self.rawIdent) - the(desc).should.be.equal(self.rawDesc) - the(ts).should.be.ok - the(ip).should.be.ok - - -class ParseNetworkStatusALineTests(unittest.TestCase): - """Tests for :func:`bridgedb.parse.networkstatus.parseALine`. - - The documentation for all class variables, e.g. 'pre' or 'oraddr', refers - to what said value should be in a *valid* descriptor. - """ - #: The prefix for the 'a'-line. Should be an 'a', unless testing that - #: lines with unknown prefixes are dropped. - pre = 'a ' - #: An ORAddress. As of tor-0.2.5.1-alpha, there is only one and it is an - #: IPv6 address. - oraddr = '[b8d:48ae:5185:dad:5c2a:4e75:8394:f5f8]' - - def tearDown(self): - self.line = '' - - def assertAllFieldsAreNone(self, fields): - """Assert that every field in the iterable ``fields`` is None.""" - for field in fields: - self.assertTrue(field is None) - - def test_missingPrefix(self): - """Changed to allow a missing 'a' prefix in branch - ``hotfix/9462B-netstatus-returns-None``. - """ - self.line = '%s:1234' % self.oraddr - ip, port = networkstatus.parseALine(self.line) - this(ip).should.be.a(basestring) - this(port).should.be(None) - - def test_IPv4(self): - self.line = 'a 48.32.199.45:9001' - ip, port = networkstatus.parseALine(self.line) - ip, port = self.assertWarns( - FutureWarning, - "Got IPv4 address in networkstatus 'a'-line! "\ - "Networkstatus document format may have changed!", - networkstatus.__file__, - networkstatus.parseALine, - self.line) - this(ip).should.be.a(basestring) - this(port).should.be.ok - this(port).should.be.a(networkstatus.addr.PortList) - - def test_IPv4BadPortSeparator(self): - self.line = 'a 1.1.1.1 9001' - fields = networkstatus.parseALine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_IPv6BadPortlist(self): - self.line = 'a 23.23.23.23:1111,2222,badportlist' - ip, port = networkstatus.parseALine(self.line) - this(ip).should.be.a(basestring) - this(port).should.be(None) - - def test_IPv4MissingPort(self): - self.line = 'a 1.1.1.1' - fields = networkstatus.parseALine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_IPv4InvalidAddress(self): - self.line = 'a 127.0.0.1:5555' - fields = networkstatus.parseALine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_IPv6BadPortSeparator(self): - self.line = 'a %s missingcolon' % self.oraddr - fields = networkstatus.parseALine(self.line) - self.assertAllFieldsAreNone(fields) - - def test_IPv6BadPortlist(self): - self.line = 'a %s:1111,2222,badportlist' % self.oraddr - ip, port = networkstatus.parseALine(self.line) - this(ip).should.be.a(basestring) - this(port).should.be(None) - - def test_IPv6(self): - self.line = 'a %s:6004' % self.oraddr - ip, port = networkstatus.parseALine(self.line) - this(ip).should.be.a(basestring) - this(port).should.be.ok - this(port).should.be.a(networkstatus.addr.PortList) - - -class ParseNetworkStatusSLineTests(unittest.TestCase): - """Tests for :func:`bridgedb.parse.networkstatus.parseSLine`.""" - - def tearDown(self): - """Automatically called after each test_* method to run cleanups.""" - self.line = '' - - def test_missingPrefix(self): - self.line = 'Stable' - running, stable = networkstatus.parseSLine(self.line) - self.assertFalse(running) - self.assertFalse(stable) - - def test_makeBelieveFlag(self): - """Test that 's'-parser should ignore a 'MakeBelieve' flag.""" - self.line = 's Stable Running MakeBelieve BadExit' - running, stable = networkstatus.parseSLine(self.line) - self.assertTrue(running) - self.assertTrue(stable) - - def test_noFlags(self): - """Test that an 's'-line with no flags returns False for everything.""" - self.line = '' - running, stable = networkstatus.parseSLine(self.line) - self.assertFalse(running) - self.assertFalse(stable)

1 0

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

19 Feb '15

commit e1ad705670de064d22ababc78f4f38393a8dbf97 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 07:34:08 2015 +0000 Remove bridgedb.Bridges.is_valid_ip(). --- lib/bridgedb/Bridges.py | 34 ---------------------------------- lib/bridgedb/HTTPServer.py | 5 +++-- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index a5d142f..9e7c292 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -42,40 +42,6 @@ DIGEST_LEN = 20 PORTSPEC_LEN = 16 -def is_valid_ip(ip): - """Return True if ip is the string encoding of a valid IPv4 address, - and False otherwise. - - XXX this should probably be deprecated in favour of - :func:`bridgedb.parse.addr.isValid`. - - >>> from bridgedb import Bridges - >>> Bridges.is_valid_ip('1.2.3.4') - True - >>> Bridges.is_valid_ip('1.2.3.255') - True - >>> Bridges.is_valid_ip('1.2.3.256') - False - >>> Bridges.is_valid_ip('1') - False - >>> Bridges.is_valid_ip('1.2.3') - False - >>> Bridges.is_valid_ip('xyzzy') - False - - :param str ip: A string representing an IPv4 or IPv6 address. - """ - logging.warn(PendingDeprecationWarning( - "Bridges.is_valid_ip() is replaced with parse.isIPAddress()")) - # ipaddr does not treat "1.2" as a synonym for "0.0.1.2" - try: - ipaddr.IPAddress(ip) - except ValueError: - # not a valid IPv4 or IPv6 address - return False - return True - - def getDescriptorDigests(desc): """Return the SHA-1 hash hexdigests of all descriptor descs diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index b073542..389d5a4 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -49,6 +49,7 @@ from bridgedb.Filters import filterBridgesByIP6 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.parse import headers +from bridgedb.parse.addr import isIPAddress from bridgedb.qrcodes import generateQR from bridgedb.safelog import logSafely @@ -158,7 +159,7 @@ class CaptchaProtectedResource(resource.Resource): h = request.getHeader("X-Forwarded-For") if h: ip = h.split(",")[-1].strip() - if not bridgedb.Bridges.is_valid_ip(ip): + if not isIPAddress(ip): logging.warn("Got weird X-Forwarded-For value %r" % h) ip = None else: @@ -684,7 +685,7 @@ class WebResourceBridges(resource.Resource): h = request.getHeader("X-Forwarded-For") if h: ip = h.split(",")[-1].strip() - if not bridgedb.Bridges.is_valid_ip(ip): + if not isIPAddress(ip): logging.warn("Got weird forwarded-for value %r",h) ip = None else:

1 0

[bridgedb/develop] Remove duplicate Bridge.assertOK() spec conformity checks.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 22e78da568bc608b0487d2fe18b5b3879980fc45 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 31 13:11:18 2014 +0000 Remove duplicate Bridge.assertOK() spec conformity checks. * REMOVE sanity checks for spec conformity in Bridge.assertOK() for fingerprint, address, and port, since these are now @properties of the Bridge class (and the conformity checks are done in those methods). --- lib/bridgedb/bridges.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index f1bf6dc..33741a8 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1038,31 +1038,21 @@ class Bridge(BridgeBackwardsCompatibility): We require that: - 1. This bridge's :data:`fingerprint` is valid, accoring to - :func:`~bridgedb.parse.fingerprint.isValidFingerprint`. + 1. Any IP addresses contained in :data:`orAddresses` are valid, + according to :func:`~bridgedb.parse.addr.isValidIP`. - 2. This bridge's :data:`address` and any IP addresses contained in - :data:`orAddresses` are valid, according to - :func:`~bridgedb.parse.addr.isValidIP`. - - 3. The :data:`orPort` and any ports in :data:`orAddresses` are - between ``1`` and ``65535`` (inclusive). + 3. Any ports in :data:`orAddresses` are between ``1`` and ``65535`` + (inclusive). :raises MalformedBridgeInfo: if something was found to be malformed or invalid. """ malformed = [] - if not isValidFingerprint(self.fingerprint): - malformed.append("Invalid fingerprint: '%s'" % self.fingerprint) - if not isValidIP(self.address): - 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, version) in self.orAddresses: if not isValidIP(address): malformed.append("Invalid ORAddress address: '%s'" % address) - if not (1 <= port <= 65535): + if not (0 <= port <= 65535): malformed.append("Invalid ORAddress port: '%d'" % port) if not version in (4, 6): malformed.append("Invalid ORAddress IP version: %r" % version)

1 0

[bridgedb/develop] Add more unittests for Bridge.updateFromExtraInfoDescriptor().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 0c956389589976308580ab82690c0bc00c945a96 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 13 07:42:48 2015 +0000 Add more unittests for Bridge.updateFromExtraInfoDescriptor(). * ADD test_Bridge_updateFromExtraInfoDescriptor_pt_changed_args() which checks that updateFromExtraInfoDescriptor() updates known PTs with their new args from a newer parsed extrainfo descriptor. * ADD test_Bridge_updateFromExtraInfoDescriptor_pt_died() that updateFromExtraInfoDescriptor() removes previously known PTs which are no longer listed in a Bridge's extrainfo descriptor. --- lib/bridgedb/test/test_bridges.py | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index e87ff8a..11a9d64 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -867,6 +867,57 @@ class BridgeTests(unittest.TestCase): self.assertEqual(self.bridge.bandwidthObserved, 1623207134) self.assertEqual(len(self.bridge.transports), 4) + def test_Bridge_updateFromExtraInfoDescriptor_pt_changed_args(self): + """Calling updateFromExtraInfoDescriptor() with a descriptor which + includes different PT args for a known bridge with a known pluggable + transport should update that transport. + + scramblesuit 179.178.155.140:36492 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567 + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 4) + + for pt in self.bridge.transports: + if pt.methodname == 'scramblesuit': + self.assertEqual(pt.address, ipaddr.IPv4Address('179.178.155.140')) + self.assertEqual(pt.port, 36492) + + # Change the args of scramblesuit transport in the extrainfo descriptor: + transportline = self.extrainfo.transport['scramblesuit'] + self.extrainfo.transport['scramblesuit'] = (transportline[0], + transportline[1], + ['password=PASSWORD']) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + for pt in self.bridge.transports: + if pt.methodname == 'scramblesuit': + self.assertEqual(pt.address, ipaddr.IPv4Address('179.178.155.140')) + self.assertEqual(pt.port, 36492) + self.assertEqual(pt.arguments['password'], 'PASSWORD') + + def test_Bridge_updateFromExtraInfoDescriptor_pt_died(self): + """Calling updateFromExtraInfoDescriptor() with a descriptor which + doesn't include a previously-known transport should remove that + transport. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 4) + + # Remove the obfs3 transport from the extrainfo descriptor: + self.extrainfo.transport.pop('obfs3') + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 3) + + for pt in self.bridge.transports: + self.failIfEqual(pt.methodname, 'obfs3') + def test_Bridge_descriptorDigest(self): """Parsing a networkstatus descriptor should result in Bridge.descriptorDigest being set.

1 0