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

[bridgedb/develop] Add three unittests for parsing unparseable extrainfo files.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 4933866de8aff1d5bb88ac8a10099e2489e544c4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 09:34:36 2014 +0000 Add three unittests for parsing unparseable extrainfo files. --- lib/bridgedb/test/test_parse_descriptors.py | 111 +++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 67bef6a..b017dd6 100644 --- a/lib/bridgedb/test/… [View More]test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -12,6 +12,7 @@ from __future__ import print_function import datetime +import glob import io import os import textwrap @@ -419,3 +420,113 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, validate=False) self.assertGreaterEqual(len(routers), 1) + + def test_parse_descriptosrs_parseBridgeExtraInfoFiles_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 + after parsing. + """ + # Give it a bad geoip-db-digest: + unparseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( + "MiserLandfalls E08B324D20AD0A13E114F027AB9AC3F32CA696A0", + "DontParseMe F373CC1D86D82267F1F1F5D39470F0E0A022122E").replace( + "geoip-db-digest 09A0E093100B279AD9CFF47A67B13A21C6E1483F", + "geoip-db-digest FOOOOOOOOOOOOOOOOOOBAAAAAAAAAAAAAAAAAARR") + + descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) + descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + # This must be a "real" file or _copyUnparseableDescriptorFile() will + # raise an AttributeError saying: + # '_io.BytesIO' object has no attribute 'rpartition'" + descFileThree = self.writeTestDescriptorsToFile( + "unparseable-descriptor", unparseable) + routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, + descFileTwo, + descFileThree) + self.assertIsInstance(routers, dict) + self.assertEqual(len(routers), 1, ( + "There were three extrainfo descriptors: one was a duplicate, " + "and one was unparseable, so that should only leave one " + "descriptor remaining.")) + + bridge = routers.values()[0] + self.assertEqual( + bridge.fingerprint, + "E08B324D20AD0A13E114F027AB9AC3F32CA696A0", + ("It looks like the (supposedly) unparseable bridge was returned " + "instead of the valid one!")) + self.assertEqual( + bridge.published, + 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): + """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 + only two descriptors returned after parsing. + """ + # Mess up the bridge-ip-transports line: + unparseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( + "MiserLandfalls E08B324D20AD0A13E114F027AB9AC3F32CA696A0", + "DontParseMe F373CC1D86D82267F1F1F5D39470F0E0A022122E").replace( + "bridge-ip-transports <OR>=8", + "bridge-ip-transports <OR>") + + parseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( + "MiserLandfalls E08B324D20AD0A13E114F027AB9AC3F32CA696A0", + "ImOkWithBeingParsed 2B5DA67FBA13A6449DE625673B7AE9E3AA7DF75F") + + descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) + # This must be a "real" file or _copyUnparseableDescriptorFile() will + # raise an AttributeError saying: + # '_io.BytesIO' object has no attribute 'rpartition'" + descFileThree = self.writeTestDescriptorsToFile( + "unparseable-descriptor.new", unparseable) + descFileFour = io.BytesIO(parseable) + routers = descriptors.parseBridgeExtraInfoFiles(descFileOne, + descFileTwo, + descFileThree, + descFileFour) + self.assertIsInstance(routers, dict) + self.assertEqual(len(routers), 2, ( + "There were four extrainfo descriptors: one was a duplicate, " + "and one was unparseable, so that should only leave two " + "descriptors remaining.")) + + self.assertNotIn("F373CC1D86D82267F1F1F5D39470F0E0A022122E", routers.keys(), + "The 'unparseable' descriptor was returned by the parser.") + + self.assertIn("E08B324D20AD0A13E114F027AB9AC3F32CA696A0", routers.keys(), + ("A bridge extrainfo which had duplicates was completely missing " + "from the data which the parser returned.")) + self.assertEqual( + routers["E08B324D20AD0A13E114F027AB9AC3F32CA696A0"].published, + 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.") + + self.assertIn("2B5DA67FBA13A6449DE625673B7AE9E3AA7DF75F", routers.keys(), + "The 'parseable' descriptor wasn't returned by the parser.") + + def test_parse_descriptosrs_parseBridgeExtraInfoFiles_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 + AttributeError because _copyUnparseableDescriptorFile() tries to + manipulate the io.BytesIO object's filename, and it doesn't have one. + """ + # Give it a bad geoip-db-digest: + unparseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( + "MiserLandfalls E08B324D20AD0A13E114F027AB9AC3F32CA696A0", + "DontParseMe F373CC1D86D82267F1F1F5D39470F0E0A022122E").replace( + "geoip-db-digest 09A0E093100B279AD9CFF47A67B13A21C6E1483F", + "geoip-db-digest FOOOOOOOOOOOOOOOOOOBAAAAAAAAAAAAAAAAAARR") + + descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) + descFileThree = io.BytesIO(unparseable) + self.assertRaises(AttributeError, + descriptors.parseBridgeExtraInfoFiles, + descFileOne, descFileTwo, descFileThree) [View Less]

1 0

[bridgedb/develop] Add unittests for the new bridgedb.bridges.Flags class.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 5050990c02796b1d3a9194c3d4b1e4d76b5aa3f5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:15:06 2014 +0000 Add unittests for the new bridgedb.bridges.Flags class. --- lib/bridgedb/test/test_bridges.py | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 6164620..6ca96de 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/… [View More]

1 0

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

19 Feb '15

commit afd6e55820f674756bef28c9f436b90d949276fd Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 09:35:40 2014 +0000 Add two unittest for _copyUnparseableDescriptorFile(). --- 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 0b81dd7..d867768 100644 --- a/lib/bridgedb/test/test_parse_descriptors.… [View More]

1 0

[bridgedb/develop] Refactor old test_Bridges.py tests into test_bridges.py equivalents.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit b97f646c072352187b3f67e5059afe7668499b00 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:08:13 2014 +0000 Refactor old test_Bridges.py tests into test_bridges.py equivalents. The changes were very minor, mostly just replacing 's/Bridges\.Bridge/bridges\.Bridge/'. The old test_init() integration test was separated into six new tests, test_integration_init_[0-6]; all other integration tests have one-to-one correspondents with only trivial … [View More] changes. --- lib/bridgedb/test/test_Bridges.py | 200 -------------------------- lib/bridgedb/test/test_bridges.py | 283 +++++++++++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+), 200 deletions(-) diff --git a/lib/bridgedb/test/test_Bridges.py b/lib/bridgedb/test/test_Bridges.py deleted file mode 100644 index 2c7d09b..0000000 --- a/lib/bridgedb/test/test_Bridges.py +++ /dev/null @@ -1,200 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file -# :license: 3-Clause BSD, see LICENSE for licensing information - -"""Unittests for the :mod:`bridgedb.EmailServer` module.""" - -import ipaddr -from binascii import a2b_hex - -from twisted.trial import unittest - -from bridgedb import Bridges -from bridgedb.bridges import PluggableTransport -from bridgedb.parse.addr import PortList - -import hashlib -try: - from cStringIO import StringIO -except ImportError: - from io import StringIO - - -class BridgeClassTest(unittest.TestCase): - """Tests for :class:`bridgedb.Bridges.Bridge`.""" - - def setUp(self): - self.nickname = 'unnamed' - self.ip = ipaddr.IPAddress('127.0.0.1') - self.orport = '9001' - self.fingerprint = 'a1cc8dfef1fa11af9c40af1054df9daf45250556' - self.id_digest = a2b_hex(self.fingerprint) - self.or_addresses = {ipaddr.IPAddress('6.6.6.6'): PortList(6666), - ipaddr.IPAddress('42.1.42.1'): PortList(443)} - - def test_init(self): - try: - Bridges.Bridge(self.nickname, self.ip, self.orport, - fingerprint=self.fingerprint) - Bridges.Bridge(self.nickname, self.ip, self.orport, - id_digest=self.id_digest) - except Exception as e: - self.fail("Unexpected %s exception." % type(e)) - - self.failUnlessRaises(TypeError, Bridges.Bridge, - self.nickname, self.ip, self.orport, - id_digest=self.id_digest[:-1]) - - self.failUnlessRaises(TypeError, Bridges.Bridge, - self.nickname, self.ip, self.orport, - fingerprint=self.fingerprint[:-1]) - - self.failUnlessRaises(TypeError, Bridges.Bridge, - self.nickname, self.ip, self.orport) - - invalid_fingerprint = self.fingerprint[:-1] + 'q' - self.failUnlessRaises(TypeError, Bridges.Bridge, self.nickname, - self.ip, self.orport, - fingerprint=invalid_fingerprint) - - def test_getID(self): - bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, - self.fingerprint) - self.assertEqual(self.id_digest, bridge.getID()) - - def test_setDescriptorDigest(self): - """Test setting the server-descriptor digest value.""" - bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, - self.fingerprint) - testtext = 'thisisatest' - bridge.setDescriptorDigest(testtext) - self.assertEqual(bridge.desc_digest, testtext) - - def test_setExtraInfoDigest(self): - """Test setting the extra-info digest value.""" - bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, - self.fingerprint) - testtext = 'thisisatest' - bridge.setExtraInfoDigest(testtext) - self.assertEqual(bridge.ei_digest, testtext) - - def test_setVerified(self): - """Test setting the `verified` attribute on a Bridge.""" - bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, - self.fingerprint) - bridge.setVerified() - self.assertTrue(bridge.isVerified()) - self.assertTrue(bridge.verified) - self.assertEqual(self.id_digest, bridge.getID()) - - def test_setRunningStable(self): - """Test setting the `running` and `stable` attributes on a Bridge.""" - bridge = Bridges.Bridge(self.nickname, self.ip, self.orport, - self.fingerprint) - self.assertFalse(bridge.running) - self.assertFalse(bridge.stable) - bridge.setStatus(True, True) - self.assertTrue(bridge.running) - self.assertTrue(bridge.stable) - - def test_getConfigLine_vanilla_withoutFingerprint(self): - """Should return a config line without a fingerprint.""" - bridge = Bridges.Bridge('nofpr', '23.23.23.23', 2323, self.fingerprint, - or_addresses=self.or_addresses) - bridgeLine = bridge.getConfigLine() - ip = bridgeLine.split(':')[0] - self.assertTrue(ipaddr.IPAddress(ip)) - - def test_getConfigLine_vanilla_withFingerprint(self): - """Should return a config line with a fingerprint.""" - bridge = Bridges.Bridge('fpr', '23.23.23.23', 2323, - id_digest=self.id_digest, - or_addresses=self.or_addresses) - bridgeLine = bridge.getConfigLine(includeFingerprint=True) - self.assertSubstring(self.fingerprint, bridgeLine) - ip = bridgeLine.split(':')[0] - self.assertTrue(ipaddr.IPAddress(ip)) - - def test_getConfigLine_scramblesuit_withFingerprint(self): - """Should return a scramblesuit config line with a fingerprint.""" - bridge = Bridges.Bridge('philipkdick', '23.23.23.23', 2323, - id_digest=self.id_digest, - or_addresses=self.or_addresses) - ptArgs = {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} - pt = PluggableTransport(bridge.fingerprint, 'scramblesuit', - ipaddr.IPAddress('42.42.42.42'), 4242, - ptArgs) - bridge.transports.append(pt) - bridgeLine = bridge.getConfigLine(includeFingerprint=True, - transport='scramblesuit') - ptArgsList = ' '.join(["{0}={1}".format(k,v) for k,v in ptArgs.items()]) - self.assertEqual("scramblesuit 42.42.42.42:4242 %s %s" - % (self.fingerprint, ptArgsList), - bridgeLine) - - def test_getDescriptorDigests(self): - sha1hash = hashlib.sha1() - ei_digest = 'abcdefghijklmno' - - test = "this is a test line\nFollowed by another\n" - test += "extra-info-digest %s\n" % ei_digest - sha1hash.update(test) - digest = sha1hash.hexdigest() - test += "-----BEGIN SIGNATURE-----\n" - test += "This is a test line that should be skipped\n" - test += "-----END SIGNATURE-----\n" - digests = Bridges.getDescriptorDigests(StringIO(test)) - self.failUnlessIn(digest, digests) - self.failUnlessEqual(ei_digest, digests[digest]) - - def test_getExtraInfoDigests(self): - 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(StringIO(test)) - self.failUnlessIn(digest, digests) - self.failUnlessEqual(content, digests[digest].read()) - - def test_splitterBridgeInsertion(self): - key = "Testing-Bridges-To-Rings" - splitter = Bridges.FilteredBridgeSplitter(key) - - bridge1 = Bridges.Bridge('unamed1', '1.2.3.5', 9100, - 'a1cc8dfef1fa11af9c40af1054df9daf45250550') - bridge1.setStatus(running = True) - bridge2 = Bridges.Bridge('unamed2', '1.2.3.4', 8080, - 'a1cc8dfef1fa11af9c40af1054df9daf45250551') - bridge2.setStatus(running = True) - bridge3 = Bridges.Bridge('unamed3', '5.2.3.4', 8080, - 'b1cc8dfef1fa11af9c40af1054df9daf45250552') - bridge3.setStatus(running = True) - bridge4 = Bridges.Bridge('unamed3', '5.2.3.4', 8080, - 'b1cc8dfef1fa11af9c40af1054df9daf45250552') - bridge4.setStatus(running = True) - - self.failUnlessEqual(len(splitter), 0) - splitter.insert(bridge1) - splitter.insert(bridge2) - splitter.insert(bridge3) - # Check that all were inserted - self.failUnlessEqual(len(splitter), 3) - splitter.insert(bridge1) - # Check that the same bridge is not inserted twice - self.failUnlessEqual(len(splitter), 3) - splitter.insert(bridge4) - # Check that identical bridges are not inserted twice - self.failUnlessEqual(len(splitter), 3) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py new file mode 100644 index 0000000..6164620 --- /dev/null +++ b/lib/bridgedb/test/test_bridges.py @@ -0,0 +1,283 @@ +# -*- 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-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.bridges` module.""" + +from binascii import a2b_hex + +import ipaddr +import io +import hashlib +import warnings + +from twisted.trial import unittest + +from bridgedb import bridges +from bridgedb.Bridges import FilteredBridgeSplitter +from bridgedb.bridgerequest import BridgeRequestBase +from bridgedb.parse.addr import PortList + +# Don't print "WARNING:root: Couldn't parse K=V from PT arg: ''" a bunch of +# times while running the tests. +warnings.filterwarnings("ignore", ".*Couldn't parse K=V from PT arg.*", Warning) + + +class BridgeIntegrationTests(unittest.TestCase): + """Integration tests to ensure that the new :class:`bridgedb.bridges.Bridge` + class has compatible behaviour with the expected behaviour of the old + :class:`bridgedb.Bridges.Bridge` class. + + .. data: OldTest (enum) + + These tests were refactored from the old tests for + :class:`~bridgedb.test.deprecated.Bridge`, which lived in + ``lib/bridgedb/test/test_Bridges.py``. For the translations from the old + tests in ``bridgedb.test.test_Bridges.BridgeClassTest`` to their new + equivalents here in ``bridgedb.test.test_bridges.BridgeIntegrationTests``, + which should test for the same things as their old equivalents, see the + following table: + + ============================================== ======================== + OldTest Equivalent Test(s) Here + ============================================== ======================== + test_init test_integration_init_[0-5] + test_getID test_integration_getID + test_setDescriptorDigest test_integration_setDescriptorDigest + test_setExtraInfoDigest test_integration_setExtraInfoDigest + test_setVerified test_integration_setVerified + test_setRunningStable test_integration_setRunningStable + test_getConfigLine_vanilla_withoutFingerprint test_integration_getConfigLine_vanilla_withoutFingerprint + test_getConfigLine_vanilla_withFingerprint test_integration_getConfigLine_vanilla_withFingerprint + test_getConfigLine_scramblesuit_withFingeprint test_integration_getConfigLine_scramblesuit_withFingerprint + test_getDescriptorDigests test_integration_getDescriptorDigests + test_getExtraInfoDigests test_integration_getExtraInfoDigests + test_splitterBridgeInsertion test_integration_splitterBridgeInsertion + ============================================== ======================== + .. + """ + + def setUp(self): + self.nickname = 'unnamed' + self.ip = ipaddr.IPAddress('127.0.0.1') + self.orport = '9001' + self.fingerprint = 'a1cc8dfef1fa11af9c40af1054df9daf45250556' + self.id_digest = a2b_hex(self.fingerprint) + self.or_addresses = {ipaddr.IPAddress('6.6.6.6'): PortList(6666), + ipaddr.IPAddress('42.1.42.1'): PortList(443)} + + def test_integration_init_0(self): + """Ensure that we can initialise the new :class:`bridgedb.bridges.Bridge` + class in the same manner as the old :class:`bridgedb.Bridges.Bridge` + class. This test ensures that initialisation with a fingerprint is + successful. + """ + b = bridges.Bridge(self.nickname, self.ip, self.orport, + fingerprint=self.fingerprint) + self.assertIsInstance(b, bridges.Bridge) + + def test_integration_init_1(self): + """Ensure that we can initialise the new :class:`bridgedb.bridges.Bridge` + class in the same manner as the old :class:`bridgedb.Bridges.Bridge` + class. This test ensures that initialisation with a digest of a + bridge's ID key is successful. + """ + b = bridges.Bridge(self.nickname, self.ip, self.orport, + id_digest=self.id_digest) + self.assertIsInstance(b, bridges.Bridge) + + def test_integration_init_2(self): + """Initialisation of a :class:`bridgedb.bridges.Bridge` with a bad + ``id_digest`` should raise a TypeError. + """ + self.failUnlessRaises(TypeError, bridges.Bridge, + self.nickname, self.ip, self.orport, + id_digest=self.id_digest[:-1]) + + def test_integration_init_3(self): + """Initialisation of a :class:`bridgedb.bridges.Bridge` with a bad + ``fingerprint`` should raise a TypeError. + """ + self.failUnlessRaises(TypeError, bridges.Bridge, + self.nickname, self.ip, self.orport, + fingerprint=self.fingerprint[:-1]) + + def test_integration_init_4(self): + """Initialisation of a :class:`bridgedb.bridges.Bridge` with a bad + ``fingerprint`` should raise a TypeError. + """ + invalid_fingerprint = self.fingerprint[:-1] + 'q' + self.failUnlessRaises(TypeError, bridges.Bridge, self.nickname, + self.ip, self.orport, + fingerprint=invalid_fingerprint) + + def test_integration_init_5(self): + """Initialisation of a :class:`bridgedb.bridges.Bridge` without either + a ``fingerprint`` or an ``id_digest`` should raise a TypeError. + """ + self.failUnlessRaises(TypeError, bridges.Bridge, + self.nickname, self.ip, self.orport) + + def test_integration_getID(self): + """Calling ``bridges.Bridge.getID()`` should return the binary encoded + ``fingerprint``. + """ + bridge = bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) + self.assertEqual(self.id_digest, bridge.getID()) + + def test_integration_setDescriptorDigest(self): + """Test setting the server-descriptor digest value.""" + bridge = bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) + testtext = 'thisisatest' + bridge.setDescriptorDigest(testtext) + self.assertEqual(bridge.desc_digest, testtext) + + def test_integration_setExtraInfoDigest(self): + """Test setting the extra-info digest value.""" + bridge = bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) + testtext = 'thisisatest' + bridge.setExtraInfoDigest(testtext) + self.assertEqual(bridge.ei_digest, testtext) + + def test_integration_setVerified(self): + """Test setting the `verified` attribute on a Bridge.""" + raise unittest.SkipTest( + ("The setVerified() and isVerified() methods were not refactored " + "into the new bridgedb.bridges.Bridge class, as it's not clear " + "yet if they are necessary. Skip these tests for now.")) + + bridge = bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) + bridge.setVerified() + self.assertTrue(bridge.isVerified()) + self.assertTrue(bridge.verified) + self.assertEqual(self.id_digest, bridge.getID()) + + def test_integration_setRunningStable(self): + """Test setting the `running` and `stable` attributes on a Bridge.""" + bridge = bridges.Bridge(self.nickname, self.ip, self.orport, + self.fingerprint) + self.assertFalse(bridge.running) + self.assertFalse(bridge.stable) + bridge.setStatus(True, True) + self.assertTrue(bridge.running) + self.assertTrue(bridge.stable) + + def test_integration_getConfigLine_vanilla_withoutFingerprint(self): + """Should return a config line without a fingerprint.""" + #self.skip = True + bridge = bridges.Bridge('nofpr', '23.23.23.23', 2323, self.fingerprint, + or_addresses=self.or_addresses) + bridgeLine = bridge.getConfigLine() + ip = bridgeLine.split(':')[0] + self.assertTrue(ipaddr.IPAddress(ip)) + + def test_integration_getConfigLine_vanilla_withFingerprint(self): + """Should return a config line with a fingerprint.""" + bridge = bridges.Bridge('fpr', '23.23.23.23', 2323, + id_digest=self.id_digest, + or_addresses=self.or_addresses) + bridgeLine = bridge.getConfigLine(includeFingerprint=True) + self.assertSubstring(self.fingerprint, bridgeLine) + ip = bridgeLine.split(':')[0] + self.assertTrue(ipaddr.IPAddress(ip)) + + def test_integration_getConfigLine_scramblesuit_withFingerprint(self): + """Should return a scramblesuit config line with a fingerprint.""" + bridge = bridges.Bridge('philipkdick', '23.23.23.23', 2323, + id_digest=self.id_digest, + or_addresses=self.or_addresses) + ptArgs = {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} + pt = bridges.PluggableTransport(bridge.fingerprint, 'scramblesuit', + ipaddr.IPAddress('42.42.42.42'), 4242, + ptArgs) + bridge.transports.append(pt) + bridgeLine = bridge.getConfigLine(includeFingerprint=True, + transport='scramblesuit') + ptArgsList = ' '.join(["{0}={1}".format(k,v) for k,v in ptArgs.items()]) + self.assertEqual("scramblesuit 42.42.42.42:4242 %s %s" + % (self.fingerprint, ptArgsList), + bridgeLine) + + def test_integration_getDescriptorDigests(self): + raise unittest.SkipTest( + ("The functions getDescriptorDigests() and getExtraInfoDigests() " + "have not been refactored into the new bridgedb.bridges module " + "because it's not clear yet if they're necessary. Skip these " + "tests for now.")) + + sha1hash = hashlib.sha1() + ei_digest = 'abcdefghijklmno' + + test = "this is a test line\nFollowed by another\n" + test += "extra-info-digest %s\n" % ei_digest + sha1hash.update(test) + digest = sha1hash.hexdigest() + test += "-----BEGIN SIGNATURE-----\n" + test += "This is a test line that should be skipped\n" + test += "-----END SIGNATURE-----\n" + digests = bridges.getDescriptorDigests(io.StringIO(test)) + self.failUnlessIn(digest, digests) + self.failUnlessEqual(ei_digest, digests[digest]) + + def test_integration_getExtraInfoDigests(self): + raise unittest.SkipTest( + ("The functions getDescriptorDigests() and getExtraInfoDigests() " + "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) + + bridge1 = bridges.Bridge('unamed1', '1.2.3.5', 9100, + 'a1cc8dfef1fa11af9c40af1054df9daf45250550') + bridge1.setStatus(running = True) + bridge2 = bridges.Bridge('unamed2', '1.2.3.4', 8080, + 'a1cc8dfef1fa11af9c40af1054df9daf45250551') + bridge2.setStatus(running = True) + bridge3 = bridges.Bridge('unamed3', '5.2.3.4', 8080, + 'b1cc8dfef1fa11af9c40af1054df9daf45250552') + bridge3.setStatus(running = True) + bridge4 = bridges.Bridge('unamed3', '5.2.3.4', 8080, + 'b1cc8dfef1fa11af9c40af1054df9daf45250552') + bridge4.setStatus(running = True) + + self.failUnlessEqual(len(splitter), 0) + splitter.insert(bridge1) + splitter.insert(bridge2) + splitter.insert(bridge3) + # Check that all were inserted + self.failUnlessEqual(len(splitter), 3) + splitter.insert(bridge1) + # Check that the same bridge is not inserted twice + self.failUnlessEqual(len(splitter), 3) + splitter.insert(bridge4) + # Check that identical bridges are not inserted twice + self.failUnlessEqual(len(splitter), 3) [View Less]

1 0

[bridgedb/develop] Add DescriptorWarning for matching timestamps for the same bridge.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit dcca03203be4e14233c7734c1d63fe35ea86fbbe Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 09:40:26 2014 +0000 Add DescriptorWarning for matching timestamps for the same bridge. --- lib/bridgedb/parse/descriptors.py | 51 ++++++++++++++----------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 6eac164..66a34b9 100644 --- a/lib/bridgedb/parse/descriptors.py … [View More]+++ b/lib/bridgedb/parse/descriptors.py @@ -17,6 +17,7 @@ import logging import os import shutil +from stem import ProtocolError from stem.descriptor import extrainfo_descriptor from stem.descriptor import server_descriptor from stem.descriptor import parse_file @@ -26,6 +27,10 @@ from stem.descriptor.router_status_entry import RouterStatusEntryV3 from bridgedb import safelog +class DescriptorWarning(Warning): + """Raised when we parse a very odd descriptor.""" + + def _copyUnparseableDescriptorFile(filename): """Save a copy of the bad descriptor file for later debugging. @@ -181,9 +186,10 @@ def deduplicate(descriptors): # ``platform`` line in its server-descriptor and tell whoever # wrote that code that they're probably (D)DOSing the Tor network. else: - logging.warn(("Duplicate descriptor with identical timestamp " - "(%s) for router with fingerprint '%s'!") - % (descriptor.published, fingerprint)) + raise DescriptorWarning( + ("Duplicate descriptor with identical timestamp (%s) for " + "router with fingerprint '%s'!") + % (descriptor.published, fingerprint)) # Hoorah! No duplicates! (yet...) else: @@ -238,38 +244,19 @@ def parseBridgeExtraInfoFiles(*filenames, **kwargs): validate = False for filename in filenames: - document = None - documentWasUnparseable = False - - logging.info("Parsing %s descriptors with Stem: %s" + logging.info("Parsing %s descriptors in %s..." % (descriptorType, filename)) - try: - document = parse_file(filename, descriptorType, validate=validate) - except ValueError as error: - documentWasUnparseable = True - - if documentWasUnparseable: - logging.warn(("Stem ran into an exception while parsing extrainfo " - "file '%s'!") % filename) - logging.debug("Error while parsing extrainfo file:\n%s" - % str(error)) - - if documentWasUnparseable and (validate is True): - logging.info(("Retrying parsing of extrainfo file '%s' with " - "validation disabled...") % filename) - try: - document = parse_file(filename, descriptorType, validate=False) - except ValueError as another: - logging.critical(("We were still unable to parse extrainfo " - "file on the second attempt! Bailing!")) - else: - documentWasUnparseable = False - if documentWasUnparseable: - _copyUnparseableDescriptorFile(filename) + document = parse_file(filename, descriptorType, validate=validate) - if document: - descriptors.extend([router for router in document]) + try: + for router in document: + descriptors.append(router) + except (ValueError, ProtocolError) as error: + logging.error( + ("Stem exception while parsing extrainfo descriptor from " + "file '%s':\n%s") % (filename, str(error))) + _copyUnparseableDescriptorFile(filename) routers = deduplicate(descriptors) return routers [View Less]

1 0

[bridgedb/develop] Add unittests for the new bridgedb.bridges.PluggableTransport class.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 9f91454a2e32f4b39aed5bb34d8b8221850c41ba Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 5 23:16:40 2014 +0000 Add unittests for the new bridgedb.bridges.PluggableTransport class. --- lib/bridgedb/test/test_bridges.py | 168 ++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 6ca96de..2805c6d 100644 --- a/lib/bridgedb/test/test_bridges.… [View More]py +++ b/lib/bridgedb/test/test_bridges.py @@ -81,7 +81,7 @@ class BridgeIntegrationTests(unittest.TestCase): b = bridges.Bridge(self.nickname, self.ip, self.orport, fingerprint=self.fingerprint) self.assertIsInstance(b, bridges.Bridge) - + def test_integration_init_1(self): """Ensure that we can initialise the new :class:`bridgedb.bridges.Bridge` class in the same manner as the old :class:`bridgedb.Bridges.Bridge` @@ -91,7 +91,7 @@ class BridgeIntegrationTests(unittest.TestCase): b = bridges.Bridge(self.nickname, self.ip, self.orport, id_digest=self.id_digest) self.assertIsInstance(b, bridges.Bridge) - + def test_integration_init_2(self): """Initialisation of a :class:`bridgedb.bridges.Bridge` with a bad ``id_digest`` should raise a TypeError. @@ -324,3 +324,167 @@ class FlagsTests(unittest.TestCase): self.flags.update(["Fast", "Stable"]) self.assertTrue(self.flags.fast) self.assertTrue(self.flags.stable) + + +class PluggableTransportTests(unittest.TestCase): + """Tests for :class:`bridgedb.bridges.PluggableTransport.""" + + def setUp(self): + self.fingerprint = "ABCDEF0123456789ABCDEF0123456789ABCDEF01" + + def test_PluggableTransport_init_with_parameters(self): + """Initialising a PluggableTransport with args should work.""" + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + {'sharedsecret': 'foobar'}) + self.assertIsInstance(pt, bridges.PluggableTransport) + + def test_PluggableTransport_init(self): + """Initialising a PluggableTransport without args should work.""" + pt = bridges.PluggableTransport() + self.assertIsInstance(pt, bridges.PluggableTransport) + + def test_PluggableTransport_parseArgumentsIntoDict_valid_list(self): + """Parsing a valid list of PT args should return a dictionary.""" + pt = bridges.PluggableTransport() + args = pt._parseArgumentsIntoDict(["sharedsecret=foobar", + "publickey=1234"]) + self.assertIsInstance(args, dict) + self.assertItemsEqual(args, {"sharedsecret": "foobar", + "publickey": "1234"}) + + def test_PluggableTransport_parseArgumentsIntoDict_valid_list_multi(self): + """Parsing a valid list with multiple PT args in a single list element + should return a dictionary. + """ + pt = bridges.PluggableTransport() + args = pt._parseArgumentsIntoDict(["sharedsecret=foobar,password=baz", + "publickey=1234"]) + self.assertIsInstance(args, dict) + self.assertItemsEqual(args, {"sharedsecret": "foobar", + "password": "baz", + "publickey": "1234"}) + + def test_PluggableTransport_parseArgumentsIntoDict_invalid_missing_equals(self): + """Parsing a string of PT args where one PT arg (K=V) is missing an + ``=`` character should raise a ValueError. + """ + pt = bridges.PluggableTransport() + args = pt._parseArgumentsIntoDict( + ["sharedsecret=foobar,password,publickey=1234"]) + self.assertItemsEqual(args, {"sharedsecret": "foobar", + "publickey": "1234"}) + + def test_PluggableTransport_runChecks_invalid_fingerprint(self): + """Calling _runChecks() on a PluggableTransport with an invalid + fingerprint should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + "INVALIDFINGERPRINT", 'obfs4', ('34.230.223.87', 37341, [ + ('iat-mode=0,' + 'node-id=2a79f14120945873482b7823caabe2fcde848722,' + 'public-key=0a5b046d07f6f971b7776de682f57c5b9cdc8fa060db7ef59de82e721c8098f4')])) + + def test_PluggableTransport_runChecks_invalid_ip(self): + """Calling _runChecks() on a PluggableTransport with an invalid + IP address should raise a InvalidPluggableTransportIP exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.InvalidPluggableTransportIP, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223', 37341, [ + ('iat-mode=0,' + 'node-id=2a79f14120945873482b7823caabe2fcde848722,')])) + + def test_PluggableTransport_runChecks_invalid_port_type(self): + """Calling _runChecks() on a PluggableTransport with an invalid port + should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223.87', "anyport", [ + ('iat-mode=0,' + 'node-id=2a79f14120945873482b7823caabe2fcde848722,')])) + + def test_PluggableTransport_runChecks_invalid_port_range(self): + """Calling _runChecks() on a PluggableTransport with an invalid port + (too high) should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223.87', 65536, [ + ('iat-mode=0,' + 'node-id=2a79f14120945873482b7823caabe2fcde848722,')])) + + def test_PluggableTransport_runChecks_invalid_pt_args(self): + """Calling _runChecks() on a PluggableTransport with an invalid PT + args should raise a MalformedPluggableTransport exception. + """ + try: + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + 'sharedsecret=foobar') + except Exception as error: + self.failUnlessIsInstance(error, + bridges.MalformedPluggableTransport) + + def test_PluggableTransport_getTransportLine_bridge_prefix(self): + """If the 'Bridge ' prefix was requested, then it should be at the + beginning of the bridge line. + """ + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + {'sharedsecret': 'foobar', + 'password': 'unicorns'}) + bridgeLine = pt.getTransportLine(bridgePrefix=True) + self.assertTrue(bridgeLine.startswith("Bridge ")) + + def test_PluggableTransport_getTransportLine_without_Fingerprint(self): + """If no fingerprint was requested, then there shouldn't be a + fingerprint in the bridge line. + """ + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + {'sharedsecret': 'foobar', + 'password': 'unicorns'}) + bridgeLine = pt.getTransportLine(includeFingerprint=False) + self.assertNotSubstring(self.fingerprint, bridgeLine) + + def test_PluggableTransport_getTransportLine_content_order(self): + """Check the order and content of the bridge line string.""" + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + {'sharedsecret': 'foobar', + 'password': 'unicorns'}) + bridgeLine = pt.getTransportLine() + + # We have to check for substrings because we don't know which order + # the PT arguments will end up in the bridge line. Fortunately, the + # following three are the only ones which are important to have in + # order: + self.assertTrue(bridgeLine.startswith("voltronPT")) + self.assertSubstring("voltronPT 1.2.3.4:443 " + self.fingerprint, + bridgeLine) + # These ones can be in any order, but they should be at the end of the + # bridge line: + self.assertSubstring("password=unicorns", bridgeLine) + self.assertSubstring("sharedsecret=foobar", bridgeLine) + + def test_PluggableTransport_getTransportLine_ptargs_space_delimited(self): + """The PT arguments in a bridge line should be space-separated.""" + pt = bridges.PluggableTransport(self.fingerprint, + "voltronPT", "1.2.3.4", 443, + {'sharedsecret': 'foobar', + 'password': 'unicorns'}) + bridgeLine = pt.getTransportLine() + self.assertTrue( + ("password=unicorns sharedsecret=foobar" in bridgeLine) or + ("sharedsecret=foobar password=unicorns" in bridgeLine)) [View Less]

1 0

[bridgedb/develop] Add stem-1.2.2 to .travis.requirements.txt.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 5a15c6589382742263a78394e2c233d214393b59 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:31:16 2014 +0000 Add stem-1.2.2 to .travis.requirements.txt. --- .travis.requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index fcc4c77..a298efc 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -30,4 +30,5 @@ pycrypto==2.6.1 pygeoip==0.2.7 pygpgme==0.3 recaptcha-client==1.0.6 +stem==1.2.2 zope.interface==3.6.1

1 0

[bridgedb/develop] Add file header to test_parse_descriptors.py.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit e10e20027f74cb75a2b989910c61bab03e1a17bd Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 19:17:15 2014 +0000 Add file header to test_parse_descriptors.py. --- lib/bridgedb/test/test_parse_descriptors.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index a606e5b..94d5108 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/… [View More]

1 0

[bridgedb/develop] Move test_parse_descriptors.py SkipTest to setUp().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 21e571b8e53062cb62e5c1023f434aa117c3d3b7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 6 19:19:01 2014 +0000 Move test_parse_descriptors.py SkipTest to setUp(). --- lib/bridgedb/test/test_parse_descriptors.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 84129d9..c085a9c 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +… [View More]

1 0

[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/… [View More]

1 0