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

[bridgedb/develop] Follow Damian's advice to use list(document) to get Stem `RelayDescriptor`s.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit ca1af74eab7dc1670beb1287a7795d99c92d08fe Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 00:46:40 2014 +0000 Follow Damian's advice to use list(document) to get Stem `RelayDescriptor`s. See https://bugs.torproject.org/9380#comment:16. --- lib/bridgedb/parse/descriptors.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index bedc0b1..cfb895e 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -82,8 +82,7 @@ def parseServerDescriptorsFile(filename, validate=False): logging.info("Parsing server descriptors with Stem: %s" % filename) descriptorType = 'server-descriptor 1.0' document = parse_file(filename, descriptorType, validate=validate) - - routers = [router for router in document] + routers = list(document) return routers def deduplicate(descriptors):

1 0

[bridgedb/develop] Initial unittests for bridgedb.parse.descriptors module.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 8901a25bc1414bd655f296a7c38144178ad2363f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:49:43 2014 +0000 Initial unittests for bridgedb.parse.descriptors module. * ADD unittests for `bridgedb.parse.descriptors module` in bridgedb.test.test_parse_descriptors. --- lib/bridgedb/test/test_parse_descriptors.py | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py new file mode 100644 index 0000000..a606e5b --- /dev/null +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -0,0 +1,74 @@ + +"""Unittests for :class:`bridgedb.parse.descriptors` module.""" + +from __future__ import print_function + +import io +import textwrap + +from twisted.trial import unittest + +HAS_STEM = False + +try: + from stem.descriptor.server_descriptor import RelayDescriptor +except (ImportError, NameError), error: + print("There was an error importing stem: %s" % error) +else: + HAS_STEM = True + + +BRIDGE_SERVER_DESCRIPTOR = '''\ +router OutwitsPlod 152.78.9.20 17810 0 0 +or-address [bfbd:7a90:2347:cc4:e854:64b3:2c31:124f]:17810 +platform Tor 0.2.4.16-rc on Linux +protocols Link 1 2 Circuit 1 +published 2014-03-12 16:07:08 +fingerprint 6FA9 216C F3A0 6E89 A031 21AC C31F 70F8 DFD7 DDCC +uptime 57032961 +bandwidth 2240117028 2532306205 1947927850 +extra-info-digest 069EBB610CD8B02BF1BB0CAB17B99DDA73CCC91A +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGkAgEAMA0GCSqGSIb3DQEBAQUABIGPMIGMAgEAAoGBANI67YIwW8xF2v310PZt +Qc8jm0ptwLHmgBdhAzHAIGagqknjvukX5GTL0zie5covhxrQhZqjJm/gQ8inwkol +kZCue1ZQ9PHaTWjz58ESMQo41h+9Whfd8Egm2ev1+MwqlPy1Kr3rcPNIEetsmtil +DFNocpEfq1MC0tDG6qVO6/FNAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGkAgEAMA0GCSqGSIb3DQEBAQUABIGPMIGMAgEAAoGBALk0Ws5qPlgwKO6IQ1b/ +aamtEdXEPj2DrZTF3aGYR5zoZgw9gwmkbRHjrMQ/Wj+QHg0cTFY2DsYt81QXwiv+ +m1P9sshMZSZZz2P8Ld8WqUNuN7YIIJx/fj9Vy6LRFySzoyQ4FF/1Dio+JD0rvtyc +ZyRJl2aV5iYA9/TQY2zs2cxFAgMBAAE= +-----END RSA PUBLIC KEY----- +hidden-service-dir +contact Somebody <somebody(a)example.com> +reject *:* +router-signature +-----BEGIN SIGNATURE----- +i/nkrD4VxqWcnAlBS48hIilrE7C4DvRJhN4XWep7TXNbEC48IqFG+49xpKV6qkts +yKaUDBfD9Y1tMM0mrRjEWK0xYWX/4Ug9Xbbv2q1so4EuS35AF11d69Yf/2ppnCu7 +r+qtX7csROF4KyFJYFNJUKf/hroPHKWuTGCcqzb+D68= +-----END SIGNATURE-----''' + + +class ParseDescriptorsTests(unittest.TestCase): + """Unittests for :class:`bridgedb.parse.descriptors` module.""" + + def test_parse_descriptors_parseBridgeDescriptorsFile(self): + """Test for ``b.p.descriptors.parseBridgeDescriptorsFile``.""" + if not HAS_STEM: + self.skip = True + raise unittest.SkipTest("Couldn't import Stem.") + + from bridgedb.parse import descriptors + + descFile = io.BytesIO(BRIDGE_SERVER_DESCRIPTOR) + routers = descriptors.parseServerDescriptorsFile(descFile) + self.assertIsInstance(routers, list) + bridge = routers[0] + self.assertIsInstance(bridge, RelayDescriptor) + self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(bridge.fingerprint, + u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/develop] Add additional mocked bridge descriptors to test_parse_descriptors.py.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 005cddf11638c2c69e37405277c3ca5df358b306 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 19:18:02 2014 +0000 Add additional mocked bridge descriptors to test_parse_descriptors.py. --- lib/bridgedb/test/test_parse_descriptors.py | 71 ++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 94d5108..84129d9 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -20,12 +20,22 @@ HAS_STEM = False try: from stem.descriptor.server_descriptor import RelayDescriptor + from stem.descriptor.extrainfo_descriptor import BridgeExtraInfoDescriptor + from bridgedb.parse import descriptors except (ImportError, NameError), error: print("There was an error importing stem: %s" % error) else: HAS_STEM = True +BRIDGE_NETWORKSTATUS = '''\ +r OutwitsPlod b6khbPOgbomgMSGswx9w+N/X3cw qBckYSWbwl/F/qzQWwMJWBxHZ+w 2014-03-12 16:07:08 152.78.9.20 17810 0 +a [bfbd:7a90:2347:cc4:e854:64b3:2c31:124f]:17810 +s Fast Guard Running Stable Valid +w Bandwidth=1902273 +p reject 1-65535 +''' + BRIDGE_SERVER_DESCRIPTOR = '''\ router OutwitsPlod 152.78.9.20 17810 0 0 or-address [bfbd:7a90:2347:cc4:e854:64b3:2c31:124f]:17810 @@ -58,7 +68,66 @@ router-signature i/nkrD4VxqWcnAlBS48hIilrE7C4DvRJhN4XWep7TXNbEC48IqFG+49xpKV6qkts yKaUDBfD9Y1tMM0mrRjEWK0xYWX/4Ug9Xbbv2q1so4EuS35AF11d69Yf/2ppnCu7 r+qtX7csROF4KyFJYFNJUKf/hroPHKWuTGCcqzb+D68= ------END SIGNATURE-----''' +-----END SIGNATURE----- +''' + +BRIDGE_EXTRA_INFO_DESCRIPTOR = '''\ +extra-info OutwitsPlod 6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC +published 2014-03-12 16:07:08 +write-history 2014-03-12 16:07:08 (900 s) 3188736,2226176,2866176 +read-history 2014-03-12 16:07:08 (900 s) 3891200,2483200,2698240 +dirreq-write-history 2014-03-12 16:07:08 (900 s) 1024,0,2048 +dirreq-read-history 2014-03-12 16:07:08 (900 s) 0,0,0 +geoip-db-digest AAF7B842E52974556F9969A62DF8D31F9D886A33 +geoip6-db-digest C2C80F4EF2908E55A764603B08A8CB99A681EA19 +dirreq-stats-end 2014-03-12 16:07:08 (86400 s) +dirreq-v3-ips +dirreq-v3-reqs +dirreq-v3-resp ok=16,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=12,timeout=0,running=0 +transport obfs3 152.78.9.20:17811 +transport obfs2 152.78.9.20:17812 +bridge-stats-end 2014-03-12 16:07:08 (86400 s) +bridge-ips ca=8 +bridge-ip-versions v4=8,v6=0 +bridge-ip-transports <OR>=8 +router-signature +-----BEGIN SIGNATURE----- +aW1ZlxqeaGcbNSxVpMONU0ER4xgdihb9X2crguzKa/TYVweCZ2Ew7x3Rsg4cUNpr +Fb05F3Zxg6ZUTMC8gfh6leDGw5eSX7OGVaaJICTfeLbNopLVk+JKNGMJ32R/Zia0 +feWndKJk/zj5ZtkMND8VVbWuJE+R6Jh2Q3L0p8IZ6J4= +-----END SIGNATURE----- +''' + +BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE = '''\ +extra-info OutwitsPlod 6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC +published 2014-03-12 17:07:08 +write-history 2014-03-12 17:07:08 (900 s) 3188736,2226176,2866176 +read-history 2014-03-12 17:07:08 (900 s) 3891200,2483200,2698240 +dirreq-write-history 2014-03-12 17:07:08 (900 s) 1024,0,2048 +dirreq-read-history 2014-03-12 17:07:08 (900 s) 0,0,0 +geoip-db-digest AAF7B842E52974556F9969A62DF8D31F9D886A33 +geoip6-db-digest C2C80F4EF2908E55A764603B08A8CB99A681EA19 +dirreq-stats-end 2014-03-12 17:07:08 (86400 s) +dirreq-v3-ips +dirreq-v3-reqs +dirreq-v3-resp ok=16,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=12,timeout=0,running=0 +transport obfs3 152.78.9.20:17811 +transport obfs2 152.78.9.20:17812 +bridge-stats-end 2014-03-12 17:07:08 (86400 s) +bridge-ips ca=8 +bridge-ip-versions v4=8,v6=0 +bridge-ip-transports <OR>=8 +router-signature +-----BEGIN SIGNATURE----- +aW1ZlxqeaGcbNSxVpMONU0ER4xgdihb9X2crguzKa/TYVweCZ2Ew7x3Rsg4cUNpr +Fb05F3Zxg6ZUTMC8gfh6leDGw5eSX7OGVaaJICTfeLbNopLVk+JKNGMJ32R/Zia0 +feWndKJk/zj5ZtkMND8VVbWuJE+R6Jh2Q3L0p8IZ6J4= +-----END SIGNATURE----- +''' class ParseDescriptorsTests(unittest.TestCase):

1 0

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

19 Feb '15

commit 2a2c57acf68b1cd4a453823cdf746867bbb18381 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 19:19:32 2014 +0000 Add additional unittests for bridgedb.parse.descriptors module. --- lib/bridgedb/test/test_parse_descriptors.py | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index c085a9c..7c4fc93 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -150,3 +150,40 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + + def test_parse_descriptors_parseBridgeNetworkStatusFile(self): + """Test for ``b.p.descriptors.parseNetworkStatusFile``.""" + descFile = io.BytesIO(BRIDGE_NETWORKSTATUS) + routers = descriptors.parseNetworkStatusFile(descFile) + self.assertIsInstance(routers, list) + bridge = routers[0] + self.assertIsInstance(bridge, RelayDescriptor) + self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(bridge.fingerprint, + u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + + def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): + """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one + bridge extrainfo file.""" + descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + routers = descriptors.parseBridgeExtraInfoFiles(descFile) + self.assertIsInstance(routers, list) + bridge = routers[0] + self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(bridge.fingerprint, + u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') + + def test_parse_descriptors_parseBridgeExtraInfoFiles_two_files(self): + """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` 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) + self.assertIsInstance(routers, list) + bridge = routers[0] + self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(bridge.fingerprint, + u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/develop] Add bridgedb.parse.descriptors module.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 7869e4c7cd1e43f9354480f6cafba0794fd86433 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 19:20:43 2014 +0000 Add bridgedb.parse.descriptors module. This module implements parsing bridge descriptors with Stem. * FIXES (partially) #9380. --- lib/bridgedb/parse/descriptors.py | 151 +++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py new file mode 100644 index 0000000..bedc0b1 --- /dev/null +++ b/lib/bridgedb/parse/descriptors.py @@ -0,0 +1,151 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_parse_descriptors ; -*- +#_____________________________________________________________________________ +# +# 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) 2007-2014, The Tor Project, Inc. +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +from __future__ import print_function + +import datetime +import logging + +from stem.descriptor import extrainfo_descriptor +from stem.descriptor import networkstatus +from stem.descriptor import server_descriptor +from stem.descriptor import parse_file + +from bridgedb import safelog + + +def parseNetworkStatusFile(filename, validate=True): + """Parse a file which contains an ``@type bridge-networkstatus`` document. + + :rtype: dict + :returns: A dictionary of + :api:`stem.descriptor.router_status_entry.RouterStatusEntryV2`. + """ + logging.info("Parsing networkstatus entries with Stem: %s" % filename) + + fh = open(filename) + descriptors = fh.read() + fh.close() + + # See ticket #12254 for why networkstatus-bridges documents don't look + # anything like the networkstatus v2 documents that they are purported to + # look like. They are missing all headers, and the entire footer including + # authority signatures. + # + # https://trac.torproject.org/projects/tor/ticket/12254 + # + # As such, they do not currently start with a "published" line with an + # ISO8601 timestamp, as stem expects them to: + # + if not descriptors.startswith("published"): + precise = datetime.datetime.now().isoformat(sep=chr(0x20)) + timestamp = precise.rsplit('.', 1)[0] + descriptors = "published {t}\n{d}".format(t=timestamp, d=descriptors) + else: + logging.warn( + ("Networkstatus file '%s' started with 'published' line! Please " + "revise this function!") % filename) + + routers = networkstatus.BridgeNetworkStatusDocument(descriptors, + validate=validate) + return routers + +def parseServerDescriptorsFile(filename, validate=False): + """Parse a file which contains ``@type bridge-server-descriptor``s. + + .. note:: ``validate`` defaults to ``False`` because there appears to be a + bug in Leekspin, the fake descriptor generator, where Stem thinks the + fingerprint doesn't match the key… + + .. note:: We have to lie to Stem, pretending that these are ``@type + server-descriptor``s, **not** ``@type bridge-server-descriptor``s. + See ticket `#11257`_. + + .. _`#11257`: https://trac.torproject.org/projects/tor/ticket/11257 + + :param str filename: The file to parse descriptors from. + :param bool validate: Whether or not to validate descriptor + contents. (default: ``False``) + :rtype: list + :returns: A list of + :api:`stem.descriptor.server_descriptor.RelayDescriptor`s. + """ + logging.info("Parsing server descriptors with Stem: %s" % filename) + descriptorType = 'server-descriptor 1.0' + document = parse_file(filename, descriptorType, validate=validate) + + routers = [router for router in document] + return routers + +def deduplicate(descriptors): + duplicates = [] + nonDuplicates = [] + + for descriptor in descriptors: + router = descriptors.pop(descriptors.index(descriptor)) + fingerprint = router.fingerprint + + logging.debug("Deduplicating %s descriptor for router %s" + % (str(router.__class__).rsplit('.', 1)[1], + safelog.logSafely(fingerprint))) + + for possibleDuplicate in descriptors: + if fingerprint == possibleDuplicate.fingerprint: + logging.warn("Duplicate extra-info descriptor for router %s" + % safelog.logSafely(fingerprint)) + if router.published > possibleDuplicate.published: + # The router is newer than the duplicate, so get rid of + # the duplicate: + duplicates.append(possibleDuplicate) + elif router.published < possibleDuplicate.published: + # The router is older than the duplicate, so replace our + # router: + duplicates.append(router) + router = possibleDuplicate + else: + duplicates.append(possibleDuplicate) + logging.warn(("Duplicate descriptor and original " + "descriptor for router %s both had the same " + "timestamp: %s") + % (safelog.logSafely(fingerprint), + router.published)) + else: + nonDuplicates.append(router) + + logging.info("Descriptor deduplication finished.") + logging.info("Number of duplicates: %d" % len(duplicates)) + logging.info("Number of non-duplicates: %d" % len(nonDuplicates)) + return nonDuplicates + + +def parseBridgeExtraInfoFiles(*filenames, **kwargs): + """Parse files which contain ``@type bridge-extrainfo-descriptor``s. + + :kwargs: If there is a ``'validate'`` keyword argument, its value will be + passed along as the ``'validate'`` argument to + :api:`stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor`. + """ + descriptors = [] + descriptorType = 'bridge-extra-info 1.1' + + validate = False + if ('validate' in kwargs) and (kwargs['validate'] is True): + validate = True + + for filename in filenames: + logging.info("Parsing %s descriptors with Stem: %s" + % (descriptorType, filename)) + document = parse_file(filename, descriptorType, validate=validate) + descriptors.extend([router for router in document]) + + routers = deduplicate(descriptors) + return routers

1 0

[bridgedb/develop] Fix parseNetworkStatusFile() to actually return a dict.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 803ce0995ce428f0f21986f13162e347c2358a57 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 01:48:17 2014 +0000 Fix parseNetworkStatusFile() to actually return a dict. Previously, it was returning a BridgeNetworkStatusDocument class. --- lib/bridgedb/parse/descriptors.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index cfb895e..362731f 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -27,8 +27,8 @@ def parseNetworkStatusFile(filename, validate=True): """Parse a file which contains an ``@type bridge-networkstatus`` document. :rtype: dict - :returns: A dictionary of - :api:`stem.descriptor.router_status_entry.RouterStatusEntryV2`. + :returns: A dictionary fingerprints mapped to + :api:`stem.descriptor.router_status_entry.RouterStatusEntryV2`s. """ logging.info("Parsing networkstatus entries with Stem: %s" % filename) @@ -55,9 +55,9 @@ def parseNetworkStatusFile(filename, validate=True): ("Networkstatus file '%s' started with 'published' line! Please " "revise this function!") % filename) - routers = networkstatus.BridgeNetworkStatusDocument(descriptors, - validate=validate) - return routers + document = networkstatus.BridgeNetworkStatusDocument(descriptors, + validate=validate) + return document.routers def parseServerDescriptorsFile(filename, validate=False): """Parse a file which contains ``@type bridge-server-descriptor``s.

1 0

[bridgedb/develop] Add test method to encsure that parseNetworkStatusFile() returns a dict.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit a61d60d780c67b29630999f4ce504a9e8d4263a2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 01:52:58 2014 +0000 Add test method to encsure that parseNetworkStatusFile() returns a dict. --- lib/bridgedb/test/test_parse_descriptors.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index df1df13..90ecb73 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -169,12 +169,25 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') - def test_parse_descriptors_parseBridgeNetworkStatusFile(self): - """Test for ``b.p.descriptors.parseNetworkStatusFile``.""" - descFile = io.BytesIO(BRIDGE_NETWORKSTATUS) + def test_parse_descriptors_parseBridgeNetworkStatusFile_return_type(self): + """``b.p.descriptors.parseNetworkStatusFile`` should return a dict.""" + # Write the descriptor to a file for testing. This is necessary + # because the function opens the networkstatus file to read it. + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + BRIDGE_NETWORKSTATUS_0) routers = descriptors.parseNetworkStatusFile(descFile) - self.assertIsInstance(routers, list) - bridge = routers[0] + self.assertIsInstance(routers, dict) + + def test_parse_descriptors_parseBridgeNetworkStatusFile_one_file(self): + """Test ``b.p.descriptors.parseNetworkStatusFile`` with one bridge + networkstatus descriptor. + """ + # Write the descriptor to a file for testing. This is necessary + # because the function opens the networkstatus file to read it. + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + BRIDGE_NETWORKSTATUS_0) + routers = descriptors.parseNetworkStatusFile(descFile) + bridge = routers.items()[0] self.assertIsInstance(bridge, RelayDescriptor) self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint,

1 0

[bridgedb/develop] Add another unittest for parseBridgeExtraInfoFiles() return type.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 6700f6b7f15fd3d8fe964fd3a16f64b96d455d02 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 03:44:57 2014 +0000 Add another unittest for parseBridgeExtraInfoFiles() return type. --- lib/bridgedb/test/test_parse_descriptors.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index fae6441..9cb4b91 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -237,13 +237,21 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseBridgeExtraInfoFiles(descFile) self.assertIsInstance(routers, list) + def test_parse_descriptors_parseBridgeExtraInfoFiles_has_BridgeExtraInfoDescriptor(self): + """The return of ``b.p.descriptors.parseBridgeExtraInfoFiles`` should + contain ``BridgeExtraInfoDescriptor``s. + """ + descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + routers = descriptors.parseBridgeExtraInfoFiles(descFile) + bridge = routers.values()[0] + self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + def test_parse_descriptors_parseBridgeExtraInfoFiles_one_file(self): """Test for ``b.p.descriptors.parseBridgeExtraInfoFiles`` with only one bridge extrainfo file.""" descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseBridgeExtraInfoFiles(descFile) - bridge = routers[0] - self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + bridge = routers.values()[0] self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC') @@ -255,8 +263,7 @@ class ParseDescriptorsTests(unittest.TestCase): descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, descFileTwo) - bridge = routers[0] - self.assertIsInstance(bridge, BridgeExtraInfoDescriptor) + bridge = routers.values()[0] self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/develop] Change unittest; parseNetworkStatusFile() should return `RouterStatusEntryV2`s.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit fbb47f14a6b9e7853b11619bea9239959d570331 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 01:59:32 2014 +0000 Change unittest; parseNetworkStatusFile() should return `RouterStatusEntryV2`s. --- lib/bridgedb/test/test_parse_descriptors.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 90ecb73..da8078c 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -22,6 +22,7 @@ HAS_STEM = False try: from stem.descriptor.server_descriptor import RelayDescriptor from stem.descriptor.extrainfo_descriptor import BridgeExtraInfoDescriptor + from stem.descriptor.router_status_entry import RouterStatusEntryV2 from bridgedb.parse import descriptors except (ImportError, NameError), error: print("There was an error importing stem: %s" % error) @@ -188,7 +189,7 @@ class ParseDescriptorsTests(unittest.TestCase): BRIDGE_NETWORKSTATUS_0) routers = descriptors.parseNetworkStatusFile(descFile) bridge = routers.items()[0] - self.assertIsInstance(bridge, RelayDescriptor) + self.assertIsInstance(bridge, RouterStatusEntryV2) self.assertEqual(bridge.address, u'152.78.9.20') self.assertEqual(bridge.fingerprint, u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/develop] Add utility function to test_parse_descriptors for writing test descriptor files.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit bd10fbc05bef64475b6ed3b9f340bd99e1cc2f29 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 26 01:50:05 2014 +0000 Add utility function to test_parse_descriptors for writing test descriptor files. * ADDS new method: test_parse_descriptors.ParseDescriptorsTests.writeTestDescriptorsToFile(). --- lib/bridgedb/test/test_parse_descriptors.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 7c4fc93..df1df13 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -12,6 +12,7 @@ from __future__ import print_function import io +import os import textwrap from twisted.trial import unittest @@ -28,7 +29,7 @@ else: HAS_STEM = True -BRIDGE_NETWORKSTATUS = '''\ +BRIDGE_NETWORKSTATUS_0 = '''\ r OutwitsPlod b6khbPOgbomgMSGswx9w+N/X3cw qBckYSWbwl/F/qzQWwMJWBxHZ+w 2014-03-12 16:07:08 152.78.9.20 17810 0 a [bfbd:7a90:2347:cc4:e854:64b3:2c31:124f]:17810 s Fast Guard Running Stable Valid @@ -140,6 +141,23 @@ class ParseDescriptorsTests(unittest.TestCase): if self.skip: raise unittest.SkipTest("Couldn't import Stem.") + def writeTestDescriptorsToFile(self, filename, *descriptors): + """Write **descriptors** to **filename**. + + :param str filename: A filename. It will be appended to the current + working directory automatically. + :param str descriptors: Some optional strings containing + descriptors. Each one will be written to **filename** as-is. + :rtype: str + :returns: The full path to the file which was written to. + """ + descFilename = os.path.join(os.getcwd(), filename) + with open(descFilename, 'w') as fh: + for desc in descriptors: + fh.write(desc) + fh.flush() + return descFilename + def test_parse_descriptors_parseBridgeDescriptorsFile(self): """Test for ``b.p.descriptors.parseBridgeDescriptorsFile``.""" descFile = io.BytesIO(BRIDGE_SERVER_DESCRIPTOR)

1 0