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

[bridgedb/master] Merge branch 'fix/12872-bridge-geoip_r1' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 22d39691f7d4e773b95d172e6c0949b333e14c38 Merge: dd2398c 45b0927 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 19 04:14:48 2015 +0000 Merge branch 'fix/12872-bridge-geoip_r1' into develop .travis.yml | 2 +- lib/bridgedb/HTTPServer.py | 32 ++++--------- lib/bridgedb/bridges.py | 17 +++++++ lib/bridgedb/geo.py | 78 ++++++++++++++++++++++++++++++ lib/bridgedb/test/test_bridges.py | 12 +++++ lib/… [View More]

1 0

[bridgedb/master] Add skip coverage pragma to bridgedb.Main code for block files.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit d8495e1ebf08c3aecfba4895598ca0ca7e3f7299 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 22:47:21 2015 +0000 Add skip coverage pragma to bridgedb.Main code for block files. --- lib/bridgedb/Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 83b60a4..d274fcd 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -177,7 +177,7 @@ def load(state, splitter, clear=False): … [View More]

1 0

[bridgedb/master] Fix two lines with old import syntax in bridgedb.Main.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 5c65848a904c7b6774edba6217d82ee050643955 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 22:44:01 2015 +0000 Fix two lines with old import syntax in bridgedb.Main. --- lib/bridgedb/Main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 440784b..83b60a4 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -42,10 +42,10 @@ from bridgedb.parse import options from bridgedb.… [View More]

1 0

[bridgedb/master] Change Main.run() to take a reactor as a parameter.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 88310463af23b403d2a73b082b89508fb134b16e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 21 22:48:35 2015 +0000 Change Main.run() to take a reactor as a parameter. This makes unittesting easier, as we can then pass mocked reactors with less risk of touching the real one. (However, to pass mocked reactors, we'd probably need to check the code for the EmailDistributor and IPBasedDistributor in bridgedb.Dist to ensure that neither are touching … [View More] the reactor either.) This also changes the main loop to only call reactor.run() if the reactor is not already running. --- lib/bridgedb/Main.py | 77 +++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index d274fcd..4fb6338 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -300,7 +300,7 @@ def createBridgeRings(cfg, proxyList, key): return splitter, emailDistributor, ipDistributor -def run(options): +def run(options, reactor=reactor): """This is BridgeDB's main entry point and main runtime loop. Given the parsed commandline options, this function handles locating the @@ -312,6 +312,11 @@ def run(options): options given in the commandline we were called with. :type state: :class:`bridgedb.persistent.State` :ivar state: A persistent state object which holds config changes. + :param reactor: An implementer of + :api:`twisted.internet.interfaces.IReactorCore`. This parameter is + mainly for testing; the default + :api:`twisted.internet.epollreactor.EPollReactor` is fine for normal + application runs. """ # Change to the directory where we're supposed to run. This must be done # before parsing the config file, otherwise there will need to be two @@ -494,43 +499,45 @@ def run(options): signal.signal(signal.SIGHUP, _handleSIGHUP) signal.signal(signal.SIGUSR1, _handleSIGUSR1) - # And actually load it to start parsing. Get back our distributors. - emailDistributor, ipDistributor = reload(False) - - # Configure all servers: - if config.HTTPS_DIST and config.HTTPS_SHARE: - #webSchedule = schedule.ScheduledInterval("day", 2) - webSchedule = schedule.Unscheduled() - HTTPServer.addWebServer(config, ipDistributor, webSchedule) - if config.EMAIL_DIST and config.EMAIL_SHARE: - #emailSchedule = schedule.ScheduledInterval("day", 1) - emailSchedule = schedule.Unscheduled() - addSMTPServer(config, emailDistributor, emailSchedule) - - tasks = {} - - # Setup all our repeating tasks: - if config.TASKS['GET_TOR_EXIT_LIST']: - tasks['GET_TOR_EXIT_LIST'] = task.LoopingCall( - proxy.downloadTorExits, - proxyList, - config.SERVER_PUBLIC_EXTERNAL_IP) - - # Schedule all configured repeating tasks: - for name, seconds in config.TASKS.items(): - if seconds: - try: - tasks[name].start(abs(seconds)) - except KeyError: - logging.info("Task %s is disabled and will not run." % name) - else: - logging.info("Scheduled task %s to run every %s seconds." - % (name, seconds)) + if reactor: + # And actually load it to start parsing. Get back our distributors. + emailDistributor, ipDistributor = reload(False) + + # Configure all servers: + if config.HTTPS_DIST and config.HTTPS_SHARE: + #webSchedule = schedule.ScheduledInterval("day", 2) + webSchedule = schedule.Unscheduled() + HTTPServer.addWebServer(config, ipDistributor, webSchedule) + if config.EMAIL_DIST and config.EMAIL_SHARE: + #emailSchedule = schedule.ScheduledInterval("day", 1) + emailSchedule = schedule.Unscheduled() + addSMTPServer(config, emailDistributor, emailSchedule) + + tasks = {} + + # Setup all our repeating tasks: + if config.TASKS['GET_TOR_EXIT_LIST']: + tasks['GET_TOR_EXIT_LIST'] = task.LoopingCall( + proxy.downloadTorExits, + proxyList, + config.SERVER_PUBLIC_EXTERNAL_IP) + + # Schedule all configured repeating tasks: + for name, seconds in config.TASKS.items(): + if seconds: + try: + tasks[name].start(abs(seconds)) + except KeyError: + logging.info("Task %s is disabled and will not run." % name) + else: + logging.info("Scheduled task %s to run every %s seconds." + % (name, seconds)) # Actually run the servers. try: - logging.info("Starting reactors.") - reactor.run() + if reactor and not reactor.running: + logging.info("Starting reactors.") + reactor.run() except KeyboardInterrupt: logging.fatal("Received keyboard interrupt. Shutting down...") finally: [View Less]

1 0

[bridgedb/master] Add mock descriptors and several Bridge class unittests.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 7150bd19e86125bcaf48f8f48a960244047ae8b2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:39:04 2014 +0000 Add mock descriptors and several Bridge class unittests. --- lib/bridgedb/test/test_bridges.py | 406 +++++++++++++++++++++++++++++++++++++ 1 file changed, 406 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index cca920d..8328e16 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/… [View More]test_bridges.py @@ -15,6 +15,7 @@ from binascii import a2b_hex import ipaddr import io import hashlib +import os import warnings from twisted.trial import unittest @@ -22,13 +23,90 @@ from twisted.trial import unittest from bridgedb import bridges from bridgedb.Bridges import FilteredBridgeSplitter from bridgedb.bridgerequest import BridgeRequestBase +from bridgedb.parse import descriptors from bridgedb.parse.addr import PortList +from bridgedb.parse.nickname import InvalidRouterNickname + # 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) +BRIDGE_NETWORKSTATUS = '''\ +r FourfoldQuirked LDIlxIBTMQJeIR9Lblv0XDM/3Sw c4EVu2rO/iD/DJYBX/Ll38DGQWI 2014-12-22 21:51:27 179.178.155.140 36489 0 +a [6bf3:806b:78cd:d4b4:f6a7:4ced:cfad:dad4]:36488 +s Fast Guard Running Stable Valid +w Bandwidth=1585163 +p reject 1-65535 +''' + +BRIDGE_SERVER_DESCRIPTOR = '''\ +@purpose bridge +router FourfoldQuirked 179.178.155.140 36489 0 0 +or-address [6bf3:806b:78cd:d4b4:f6a7:4ced:cfad:dad4]:36488 +platform Tor 0.2.3.24-rc on Linux +opt protocols Link 1 2 Circuit 1 +published 2014-12-22 21:51:27 +opt fingerprint 2C32 25C4 8053 3102 5E21 1F4B 6E5B F45C 333F DD2C +uptime 33200687 +bandwidth 1866688205 2110169275 1623207134 +opt extra-info-digest 4497E81715D958105C6A39D348163AD8F3080FB2 +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBANKicvIGWp9WGKOJV8Fs3YKdTDrgxlggzyKgkW+MZWEPQ9lLcrmXqBdW +nVK5EABByHnnxJfk+sm+6yDYxY/lFVL1SEP84pAK1Z21f4+grNlwox1DLyntXDdz +BCZuRszuBYK3ncsk+ePQeUzRKQ/GZt9s/oy0IjtNbAoAoq7DKUVzAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALnJK7A9aZIp2ry9ruVYzm4VfaXzNHdTcvkXTrETu/jLXsosEwj9viSe +Ry3W/uctbjzdwlIY0ZBUuV20q9bh+/c7Q0T8LOHBZouOy+nhFOUX+Q5YCG9cRnY0 +hBebYTzyplh0tT8xyYwcS8y6esL+gjVDLo6Og3QPhWRFQ4CyCic9AgMBAAE= +-----END RSA PUBLIC KEY----- +contact Somebody <somebody(a)example.com> +ntor-onion-key aVmfOm9C046wM8ktGnpfBHSNj1Jm30M/m2P7W3a7Xn8 +reject *:* +router-signature +-----BEGIN SIGNATURE----- +nxml4rTyTrj8dHcsFt2B4ACz2AN5CuZ2t5UF1BtXUpuzHmqVlg7imy8Cp2xIwoDa +4uv/tTG32macauVnMHt0hSbtBF5nHfxU9G1T/XzdtL+KD8REDGky4allXnmvF6In +rFtSn2OeZewvi8oYPmVYKgzHL6tzZxs2Sn/bOTj5sRw= +-----END SIGNATURE----- +''' + +BRIDGE_EXTRAINFO = '''\ +extra-info FourfoldQuirked 2C3225C4805331025E211F4B6E5BF45C333FDD2C +published 2014-12-22 21:51:27 +write-history 2014-12-22 21:51:27 (900 s) 3188736,2226176,2866176 +read-history 2014-12-22 21:51:27 (900 s) 3891200,2483200,2698240 +dirreq-write-history 2014-12-22 21:51:27 (900 s) 1024,0,2048 +dirreq-read-history 2014-12-22 21:51:27 (900 s) 0,0,0 +geoip-db-digest 51AE9611B53880B2BCF9C71E735D73F33FAD2DFE +geoip6-db-digest 26B0D55B20BEB496A3ADE7C6FDD866F5A81027F7 +dirreq-stats-end 2014-12-22 21:51:27 (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 179.178.155.140:36490 +transport obfs2 179.178.155.140:36491 +transport scramblesuit 179.178.155.140:36492 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567 +transport obfs4 179.178.155.140:36493 iat-mode=0,node-id=25293f2761d658cc70c19515861842d712751bdc,public-key=02d20bbd7e394ad5999a4cebabac9619732c343a4cac99470c03e23ba2bdc2bc +bridge-stats-end 2014-12-22 21:51:27 (86400 s) +bridge-ips ca=8 +bridge-ip-versions v4=8,v6=0 +bridge-ip-transports <OR>=8 +router-signature +-----BEGIN SIGNATURE----- +cn4+8pQwCMPnHcp1s8wm7ZYsnd9AXJH6ysNlvQ63jsPCG9JdE5E8BwCThEgUccJI +XILT4o+SveEQUG72R4bENsKxqV4rRNh1g6CNAbYhAITqrU9B+jImDgrBBW+XWT5K +78ECRPn6Y4KsxFb0TIn7ddv9QjApyBJNIDMihH80Yng= +-----END SIGNATURE----- +''' + + 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 @@ -488,3 +566,331 @@ class PluggableTransportTests(unittest.TestCase): self.assertTrue( ("password=unicorns sharedsecret=foobar" in bridgeLine) or ("sharedsecret=foobar password=unicorns" in bridgeLine)) + + +class BridgeBackwardsCompatibilityTests(unittest.TestCase): + """Tests for :class:`bridgedb.bridges.BridgeBackwardsCompatibility`.""" + + def setUp(self): + self.nickname = "RouterNickname" + self.address = "23.23.23.23" + self.orPort = 9001 + self.fingerprint = "0123456789ABCDEF0123456789ABCDEF01234567" + self.orAddresses = {"2006:42::123F": PortList(443, 9001, 1337), + "2006:42::123E": PortList(9001, 993)} + + def test_BridgeBackwardsCompatibility_init_with_PortList(self): + """Test initialisation with the usual number of valid arguments and + PortLists for the orAddresses. + """ + bridge = bridges.BridgeBackwardsCompatibility( + self.nickname, + self.address, + self.orPort, + self.fingerprint, + self.orAddresses) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + + def test_BridgeBackwardsCompatibility_init_without_PortList(self): + """Test initialisation with the usual number of valid arguments and + integers for the orAddresses' ports. + """ + bridge = bridges.BridgeBackwardsCompatibility( + self.nickname, + self.address, + self.orPort, + self.fingerprint, + {"2006:42::123F": 443, + "2006:42::123E": 9001}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + + def test_BridgeBackwardsCompatibility_init_without_address(self): + """Test initialisation without an IP address.""" + bridge = bridges.BridgeBackwardsCompatibility( + nickname=self.nickname, + orport=self.orPort, + fingerprint=self.fingerprint, + or_addresses={"2006:42::123F": 443, "2006:42::123E": 9001}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + + def test_BridgeBackwardsCompatibility_init_invalid_orAddresses_address(self): + """Test initialisation with an invalid ORAddress.""" + bridge = bridges.BridgeBackwardsCompatibility( + nickname=self.nickname, + ip=self.address, + orport=self.orPort, + fingerprint=self.fingerprint, + or_addresses={"10.1.2.3": 443, "2006:42::123E": 9001}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + self.assertEqual(len(bridge.orAddresses), 1) + + def test_BridgeBackwardsCompatibility_init_invalid_orAddresses_port(self): + """Test initialisation with an invalid ORPort.""" + bridge = bridges.BridgeBackwardsCompatibility( + nickname=self.nickname, + ip=self.address, + orport=self.orPort, + fingerprint=self.fingerprint, + or_addresses={"2006:42::123F": 443, "2006:42::123E": "anyport"}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + self.assertEqual(len(bridge.orAddresses), 1) + + def test_BridgeBackwardsCompatibility_setStatus_running(self): + """Using setStatus() to set the Running flag should set Bridge.running + and Bridge.flags.running to True. + """ + bridge = bridges.BridgeBackwardsCompatibility( + nickname=self.nickname, + ip=self.address, + orport="anyport", + fingerprint=self.fingerprint, + or_addresses={"2006:42::123F": 443, "2006:42::123E": 9001}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + self.assertFalse(bridge.running) + self.assertFalse(bridge.flags.running) + + bridge.setStatus(running=True) + self.assertTrue(bridge.running) + self.assertTrue(bridge.flags.running) + + def test_BridgeBackwardsCompatibility_setStatus_running(self): + """Using setStatus() to set the Running and Stable flags should set + Bridge.running, Bridge.flags.running, Bridge.stable, and + Bridge.flags.stable. + """ + bridge = bridges.BridgeBackwardsCompatibility( + nickname=self.nickname, + ip=self.address, + orport="anyport", + fingerprint=self.fingerprint, + or_addresses={"2006:42::123F": 443, "2006:42::123E": 9001}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + self.assertFalse(bridge.running) + self.assertFalse(bridge.flags.running) + self.assertFalse(bridge.stable) + self.assertFalse(bridge.flags.stable) + + bridge.setStatus(running=True, stable=True) + self.assertTrue(bridge.running) + self.assertTrue(bridge.flags.running) + self.assertTrue(bridge.stable) + self.assertTrue(bridge.flags.stable) + + +class BridgeTests(unittest.TestCase): + """Tests for :class:`bridgedb.bridges.Bridge`.""" + + def _writeDescriptorFiles(self): + with open(self._networkstatusFile, 'w') as fh: + fh.write(BRIDGE_NETWORKSTATUS) + fh.flush() + + with open(self._serverDescriptorFile, 'w') as fh: + fh.write(BRIDGE_SERVER_DESCRIPTOR) + fh.flush() + + with open(self._extrainfoFile, 'w') as fh: + fh.write(BRIDGE_EXTRAINFO) + fh.flush() + + def setUp(self): + def _cwd(filename): + return os.path.sep.join([os.getcwd(), filename]) + + self._networkstatusFile = _cwd('BridgeTests-networkstatus-bridges') + self._serverDescriptorFile = _cwd('BridgeTests-bridge-descriptors') + self._extrainfoFile = _cwd('BridgeTests-cached-extrainfo') + + self._writeDescriptorFiles() + + self.networkstatus = descriptors.parseNetworkStatusFile( + self._networkstatusFile)[0] + self.serverdescriptor = descriptors.parseServerDescriptorsFile( + self._serverDescriptorFile)[0] + self.extrainfo = descriptors.parseExtraInfoFiles( + self._extrainfoFile).values()[0] + + self.bridge = bridges.Bridge() + + def tearDown(self): + """Reset safelogging to its default (disabled) state, due to + test_Bridge_str_with_safelogging changing it. + """ + bridges.safelog.safe_logging = False + + def test_Bridge_nickname_del(self): + """The del method for the nickname property should reset the nickname + to None. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.assertEqual(self.bridge.nickname, "FourfoldQuirked") + + del(self.bridge.nickname) + self.assertIsNone(self.bridge.nickname) + self.assertIsNone(self.bridge._nickname) + + def test_Bridge_nickname_invalid(self): + """The del method for the nickname property should reset the nickname + to None. + """ + # Create a networkstatus descriptor with an invalid nickname: + filename = self._networkstatusFile + "-invalid" + fh = open(filename, 'w') + invalid = BRIDGE_NETWORKSTATUS.replace( + "FourfoldQuirked", + "ThisRouterNicknameContainsWayMoreThanNineteenBytes") + fh.seek(0) + fh.write(invalid) + fh.flush() + fh.close() + + self.assertRaises(InvalidRouterNickname, + descriptors.parseNetworkStatusFile, + filename) + + def test_Bridge_orport_del(self): + """The del method for the orPort property should reset the orPort + to None. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.assertEqual(self.bridge.orPort, 36489) + + del(self.bridge.orPort) + self.assertIsNone(self.bridge.orPort) + self.assertIsNone(self.bridge._orPort) + + def test_Bridge_str_without_safelogging(self): + """The str() method of a Bridge should return an identifier for the + Bridge, which should be different if safelogging is enabled. + """ + bridges.safelog.safe_logging = False + + bridge = bridges.Bridge() + bridge.updateFromNetworkStatus(self.networkstatus) + + identifier = str(bridge) + self.assertEqual(identifier, + ''.join(['$', bridge.fingerprint, + '~', bridge.nickname])) + + def test_Bridge_str_with_safelogging(self): + """The str() method of a Bridge should return an identifier for the + Bridge, which should be different if safelogging is enabled. + """ + bridges.safelog.safe_logging = True + + bridge = bridges.Bridge() + bridge.updateFromNetworkStatus(self.networkstatus) + + identifier = str(bridge) + self.assertEqual( + identifier, + ''.join(['$$', + hashlib.sha1(bridge.fingerprint).hexdigest().upper(), + '~', bridge.nickname])) + + def test_Bridge_str_without_fingerprint(self): + """The str() method of a Bridge should return an identifier for the + Bridge, which should be different if the fingerprint is unknown. + """ + bridge = bridges.Bridge() + bridge.updateFromNetworkStatus(self.networkstatus) + del(bridge.fingerprint) + + identifier = str(bridge) + self.assertEqual(identifier, + ''.join(['$', '0'*40, + '~', bridge.nickname])) + + def test_Bridge_updateFromServerDescriptor(self): + """ """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + self.assertEqual(self.bridge.fingerprint, + '2C3225C4805331025E211F4B6E5BF45C333FDD2C') + + def test_Bridge_updateFromServerDescriptor_no_networkstatus(self): + """Parsing a server descriptor for a bridge which wasn't included in + the networkstatus document from the BridgeAuthority should raise a + ServerDescriptorWithoutNetworkstatus exception. + """ + self.assertRaises(bridges.ServerDescriptorWithoutNetworkstatus, + self.bridge.updateFromServerDescriptor, + self.serverdescriptor) + + def test_Bridge_updateFromExtraInfoDescriptor(self): + """Bridge.updateFromExtraInfoDescriptor() should add the expected + number of pluggable transports. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.assertEqual(self.bridge.fingerprint, + '2C3225C4805331025E211F4B6E5BF45C333FDD2C') + self.assertEqual(self.bridge.bandwidthObserved, None) + self.assertEqual(len(self.bridge.transports), 0) + + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.assertEqual(self.bridge.fingerprint, + '2C3225C4805331025E211F4B6E5BF45C333FDD2C') + self.assertEqual(self.bridge.bandwidthObserved, 1623207134) + self.assertEqual(len(self.bridge.transports), 0) + + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + self.assertEqual(self.bridge.fingerprint, + '2C3225C4805331025E211F4B6E5BF45C333FDD2C') + self.assertEqual(self.bridge.bandwidthObserved, 1623207134) + self.assertEqual(len(self.bridge.transports), 4) + + def test_Bridge_descriptorDigest(self): + """Parsing a networkstatus descriptor should result in + Bridge.descriptorDigest being set. + """ + realdigest = "738115BB6ACEFE20FF0C96015FF2E5DFC0C64162" + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.assertEqual(self.bridge.descriptorDigest, realdigest) + + def test_Bridge_checkServerDescriptor(self): + """Parsing a server descriptor when the bridge's networkstatus document + didn't have a digest of the server descriptor should raise a + MissingServerDescriptorDigest. + """ + # Create a networkstatus descriptor without a server descriptor digest: + filename = self._networkstatusFile + "-missing-digest" + fh = open(filename, 'w') + invalid = BRIDGE_NETWORKSTATUS.replace("c4EVu2rO/iD/DJYBX/Ll38DGQWI", "foo") + fh.seek(0) + fh.write(invalid) + fh.flush() + fh.close() + + realdigest = "738115BB6ACEFE20FF0C96015FF2E5DFC0C64162" + + #networkstatus = descriptors.parseNetworkStatusFile(filename) + #self.bridge.updateFromNetworkStatus(networkstatus[0]) + #self.assertRaises(bridges.MissingServerDescriptorDigest, + # self.bridge.updateFromNetworkStatus, + # networkstatus[0]) + + def test_Bridge_checkServerDescriptor_digest_mismatch(self): + """Parsing a server descriptor whose digest doesn't match the one given + in the bridge's networkstatus document should raise a + ServerDescriptorDigestMismatch. + """ + # Create a networkstatus descriptor without a server descriptor digest: + filename = self._networkstatusFile + "-mismatched-digest" + fh = open(filename, 'w') + invalid = BRIDGE_NETWORKSTATUS.replace("c4EVu2rO/iD/DJYBX/Ll38DGQWI", + "c4EVu2r1/iD/DJYBX/Ll38DGQWI") + fh.seek(0) + fh.write(invalid) + fh.flush() + fh.close() + + realdigest = "738115BB6ACEFE20FF0C96015FF2E5DFC0C64162" + networkstatus = descriptors.parseNetworkStatusFile(filename) + self.bridge.updateFromNetworkStatus(networkstatus[0]) + #self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + self.assertRaises(bridges.ServerDescriptorDigestMismatch, + self.bridge.updateFromServerDescriptor, + self.serverdescriptor) [View Less]

1 0

[bridgedb/master] Change test_bridges.py unittest to also check bridgeline != None.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 227371b8668f3331df73379403a548846c4755e9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:39:45 2014 +0000 Change test_bridges.py unittest to also check bridgeline != None. --- lib/bridgedb/test/test_bridges.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 8328e16..86b60bf 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -265,6 +265,… [View More]

1 0

[bridgedb/master] Add unittests for bridges.BridgeAddressBase class.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 36c66b1418fb046201dd221439f924793386a412 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:41:54 2014 +0000 Add unittests for bridges.BridgeAddressBase class. --- lib/bridgedb/test/test_bridges.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 649bca3..23ee70b 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/… [View More]

1 0

[bridgedb/master] Add two more unittests for update() method of bridges.Flags class.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit da8bdbe56e5cdb6d7e6798e8248681147b19ae9d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:41:02 2014 +0000 Add two more unittests for update() method of bridges.Flags class. --- lib/bridgedb/test/test_bridges.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 86b60bf..649bca3 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/… [View More]

1 0

[bridgedb/master] Add unittest for PluggableTransport.getTransportLine() with IPv6 address.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit f78bea9e46270afa5a603c061ffa76238d83c2f9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:43:16 2014 +0000 Add unittest for PluggableTransport.getTransportLine() with IPv6 address. --- lib/bridgedb/test/test_bridges.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 794351f..c481578 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/… [View More]

1 0

[bridgedb/master] Raise InvalidRouterNickname in b.p.descriptors.parseNetworkStatusFile().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 978323b132a39fd6d9e429d0cf25e8c0db1e55bd Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Dec 28 12:44:20 2014 +0000 Raise InvalidRouterNickname in b.p.descriptors.parseNetworkStatusFile(). For all other ValueErrors raised by Stem, we'll re-raise another ValueError that reuses Stem's error message. * CHANGE bridgedb.parse.descriptors.parseNetworkStatusFile() to raise an InvalidRouterNickname exception if a router is parsed with a … [View More]

1 0