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

[bridgedb/master] Add setup-tests script and use it in .travis.yml.
by isis＠torproject.org 01 May '15

01 May '15

commit 0344fe89ff12ebe6c0cb8737ba14d28419eba221 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 09:39:01 2015 +0000 Add setup-tests script and use it in .travis.yml. --- .travis.yml | 17 +---------------- scripts/setup-tests | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7cda131..b058d71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,22 +64,7 @@ install: # Start a BridgeDB instance before running the tests: before_script: - - mkdir run - - cp -R -t run bridgedb.conf captchas .gnupg - # Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be - # done on testing servers, never on production servers. - - sed -r -i -e "s/(EMAIL_DOMAINS)(.*)(])/\1\2\, '127.0.0.1']/" run/bridgedb.conf - # Change EMAIL_SMTP_PORT to 2525: - - sed -r -i -e "s/(EMAIL_SMTP_PORT = )([1-9]{2,5})/\12525/" run/bridgedb.conf - # Enable plaintext HTTP distribution, otherwise the mechanize-based tests in - # test_https.py will fail with CERTIFICATE_VERIFY_FAILED because urllib2 - # won't recognize our self-signed certificate: - - sed -r -i -e "s/(HTTP_UNENCRYPTED_BIND_IP = )(None)/\1'127.0.0.1'/" run/bridgedb.conf - - sed -r -i -e "s/(HTTP_UNENCRYPTED_PORT = )(None)/\16788/" run/bridgedb.conf - - leekspin -n 100 - - cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors - - ./scripts/make-ssl-cert - - cp -t run privkey.pem cert + - ./scripts/setup-tests - bridgedb -r run & script: diff --git a/scripts/setup-tests b/scripts/setup-tests new file mode 100755 index 0000000..e82576f --- /dev/null +++ b/scripts/setup-tests @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -x -- + +THIS_SCRIPT="$(realpath $0)" +HERE="$THIS_SCRIPT" + +while [ "${HERE##*/}" != "bridgedb" ] ; do HERE="${HERE%/*}" ; done + +THERE="$HERE" +echo "Found top-level repo directory: $THERE" +cd $THERE + +mkdir run +cp -R -t run bridgedb.conf captchas .gnupg +# Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be +# done on testing servers, never on production servers. +sed -r -i -e "s/(EMAIL_DOMAINS)(.*)(])/\1\2\, '127.0.0.1']/" run/bridgedb.conf +# Change EMAIL_SMTP_PORT to 2525: +sed -r -i -e "s/(EMAIL_SMTP_PORT = )([1-9]{2,5})/\12525/" run/bridgedb.conf +# Enable plaintext HTTP distribution, otherwise the mechanize-based tests in +# test_https.py will fail with CERTIFICATE_VERIFY_FAILED because urllib2 +# won't recognize our self-signed certificate: +sed -r -i -e "s/(HTTP_UNENCRYPTED_BIND_IP = )(None)/\1'127.0.0.1'/" run/bridgedb.conf +sed -r -i -e "s/(HTTP_UNENCRYPTED_PORT = )(None)/\16788/" run/bridgedb.conf +leekspin -n 100 +cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors +./scripts/make-ssl-cert +cp -t run privkey.pem cert

1 0

[bridgedb/master] Add unittests for excluding PTs with missing/incorrect arguments.
by isis＠torproject.org 01 May '15

01 May '15

commit f4e83a5a5dce2fdf67051e2462e210936b261f92 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 22:32:31 2015 +0000 Add unittests for excluding PTs with missing/incorrect arguments. --- lib/bridgedb/test/test_bridges.py | 107 +++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 4388437..e9e0526 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -480,6 +480,61 @@ class PluggableTransportTests(unittest.TestCase): self.assertItemsEqual(args, {"sharedsecret": "foobar", "publickey": "1234"}) + def test_PluggableTransport_checkArguments_scramblesuit_missing_password(self): + """Calling _checkArguments on a scramblesuit PT without a password should + raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'scramblesuit', ('34.230.223.87', 37341, [])) + + def test_PluggableTransport_checkArguments_obfs4_missing_iatmode(self): + """Calling _checkArguments on an obfs4 PT without an iat-mode argument + should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223.87', 37341, [ + 'cert=UXj/cWm0qolGrROYpkl0UyD/7PEhzkoZkZXrOpjRKwImvkpQZwmF0nSzBXfyfbT9afBZEw'])) + + def test_PluggableTransport_checkArguments_obfs4_missing_cert(self): + """Calling _checkArguments on an obfs4 PT without a cert argument + should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223.87', 37341, ['iat-mode=1'])) + + def test_PluggableTransport_checkArguments_obfs4_missing_publickey(self): + """Calling _checkArguments on an obfs4 PT without a public-key argument + should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223.87', 37341, [ + ('iat-mode=1,' + 'node-id=2a79f14120945873482b7823caabe2fcde848722')])) + + def test_PluggableTransport_checkArguments_obfs4_missing_nodeid(self): + """Calling _checkArguments on an obfs4 PT without a public-key argument + should raise a MalformedPluggableTransport exception. + """ + pt = bridges.PluggableTransport() + self.assertRaises( + bridges.MalformedPluggableTransport, + pt.updateFromStemTransport, + self.fingerprint, 'obfs4', ('34.230.223.87', 37341, [ + ('iat-mode=1,' + 'public-key=0a5b046d07f6f971b7776de682f57c5b9cdc8fa060db7ef59de82e721c8098f4')])) + def test_PluggableTransport_runChecks_invalid_fingerprint(self): """Calling _runChecks() on a PluggableTransport with an invalid fingerprint should raise a MalformedPluggableTransport exception. @@ -1355,3 +1410,55 @@ class BridgeTests(unittest.TestCase): self.assertTrue(self.bridge.transportIsBlockedIn('GB', 'obfs4')) self.assertTrue(self.bridge.addressIsBlockedIn('GB', '179.178.155.140', 36493)) self.assertFalse(self.bridge.addressIsBlockedIn('gb', '179.178.155.140', 36488)) + + def test_Bridge_updateFromExtraInfoDescriptor_obfs4_no_iatmode(self): + """An extrainfo descriptor with an obfs4 transport missing the + `iat-mode=[…]` argument should not add the obfs4 transport. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + obfs4 = self.extrainfo.transport['obfs4'] + obfs4 = (u'1.1.1.1', 1111, obfs4[-1][-1].replace('iat-mode=0,', '')) + + self.extrainfo.transport['obfs4'] = obfs4 + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertTrue(len(self.bridge.transports), 3) + self.assertNotIn('obfs4', + [pt.methodname for pt in self.bridge.transports]) + + def test_Bridge_updateFromExtraInfoDescriptor_scramblesuit_no_password(self): + """An extrainfo descriptor with `transport scramblesuit 1.1.1.1:1111` + (i.e. missing the `password=[…]` argument) should not add the + scramblesuit transport. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + self.extrainfo.transport['scramblesuit'] = (u'1.1.1.1', 1111, []) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertTrue(len(self.bridge.transports), 3) + self.assertNotIn('scramblesuit', + [pt.methodname for pt in self.bridge.transports]) + + def test_Bridge_updateFromExtraInfoDescriptor_changed_scramblesuit_no_password(self): + """An extrainfo descriptor whose scramblesuit transport was previously + valid and is now missing the `password=[…]` argument should be removed + from the Bridge.transports list. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertTrue(len(self.bridge.transports), 4) + self.assertIn('scramblesuit', + [pt.methodname for pt in self.bridge.transports]) + + self.extrainfo.transport['scramblesuit'] = (u'1.1.1.1', 1111, []) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertTrue(len(self.bridge.transports), 3) + self.assertNotIn('scramblesuit', + [pt.methodname for pt in self.bridge.transports])

1 0

[bridgedb/master] Add PluggableTransport._checkArguments() as tmp fix for missing PT args.
by isis＠torproject.org 01 May '15

01 May '15

commit 3827008912ca7ba707903edb84343e3eec5e8543 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 22:34:57 2015 +0000 Add PluggableTransport._checkArguments() as tmp fix for missing PT args. * ADD bridgedb.bridges.PluggableTransport._checkArguments() method, which raises a MalformedPluggableTransport exception if a known transport (which should have one of some sets of arguments) has missing or incorrect arguments. * CHANGE bridgedb.bridges.Bridge.updateFromExtraInfoDescriptor() method to catch MalforedPluggableTransport exceptions raised when attempting to add or update a PluggableTransport. * FIXES #13202: https://bugs.torproject.org/13202 Until Tor-0.2.4.x is deprecated and no longer in use, this is a temporary fix for #13202. --- lib/bridgedb/bridges.py | 52 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 86123b2..17838be 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -372,6 +372,31 @@ class PluggableTransport(BridgeAddressBase): ("Cannot create PluggableTransport with arguments type: %s") % type(self.arguments)) + if not self._checkArguments(): + raise MalformedPluggableTransport( + ("Can't use %s transport with missing arguments. Arguments: " + "%s") % (self.methodname, ' '.join(self.arguments.keys()))) + + def _checkArguments(self): + """This method is a temporary fix for PTs with missing arguments + (see `#13202 <https://bugs.torproject.org/13202`_) This method can + be removed after Tor-0.2.4.x is deprecated. + """ + # obfs4 requires (iat-mode && (cert || (node-id && public-key))): + if self.methodname == 'obfs4': + if self.arguments.get('iat-mode'): + if (self.arguments.get('cert') or \ + (self.arguments.get('node-id') and self.arguments.get('public-key'))): + return True + # scramblesuit requires (password): + elif self.methodname == 'scramblesuit': + if self.arguments.get('password'): + return True + else: + return True + + return False + @property def port(self): """Get the port number which this ``PluggableTransport`` is listening @@ -1574,10 +1599,16 @@ class Bridge(BridgeBackwardsCompatibility): % (methodname, self, pt.address, pt.port, address, port)) - oldTransports.remove(pt) - pt.updateFromStemTransport(str(self.fingerprint), - methodname, - (address, port, args,)) + original = pt + try: + pt.updateFromStemTransport(str(self.fingerprint), + methodname, + (address, port, args,)) + except MalformedPluggableTransport as error: + logging.info(str(error)) + else: + oldTransports.remove(original) + updated = True break @@ -1590,11 +1621,14 @@ class Bridge(BridgeBackwardsCompatibility): logging.info( "Received new %s pluggable transport for bridge %s." % (methodname, self)) - transport = PluggableTransport() - transport.updateFromStemTransport(str(self.fingerprint), - methodname, - (address, port, args,)) - self.transports.append(transport) + try: + transport = PluggableTransport() + transport.updateFromStemTransport(str(self.fingerprint), + methodname, + (address, port, args,)) + self.transports.append(transport) + except MalformedPluggableTransport as error: + logging.info(str(error)) # These are the pluggable transports which we knew about before, which # however were not updated in this descriptor, ergo the bridge must

1 0

[bridgedb/master] Add two tests for getBridgeLine() and _constructBridgeLine() for IPv6.
by isis＠torproject.org 01 May '15

01 May '15

commit 5dba09ae563a164a934003d73eaf6209f8d6bd55 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:52:12 2015 +0000 Add two tests for getBridgeLine() and _constructBridgeLine() for IPv6. --- lib/bridgedb/test/test_bridges.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 1592f00..86d0cf1 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -921,6 +921,18 @@ class BridgeTests(unittest.TestCase): identifier = str(bridge) self.assertEqual(identifier, ''.join(['$', '0'*40, '~', 'Unnamed'])) + def test_Bridge_constructBridgeLine_IPv6(self): + """Bridge._constructBridgeLine() called with an IPv6 address should + wrap the IPv6 address in '[]' in the returned bridge line. + """ + bridge = bridges.Bridge() + addrport = (u'6bf3:806b:78cd::4ced:cfad:dad4', 36488, 6) + + bridgeline = bridge._constructBridgeLine(addrport, + includeFingerprint=False, + bridgePrefix=True) + self.assertEqual(bridgeline, 'Bridge [6bf3:806b:78cd::4ced:cfad:dad4]:36488') + def test_Bridge_updateFromNetworkStatus_IPv4_ORAddress(self): """Calling updateFromNetworkStatus() with a descriptor which has an IPv4 address as an additional ORAddress should result in a @@ -1259,6 +1271,25 @@ class BridgeTests(unittest.TestCase): self.assertNotIn('179.178.155.140:36493', line) self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + def test_Bridge_getBridgeLine_IPv6_no_fingerprint(self): + """Calling getBridgeLine(includeFingerprint=False) with a valid request + for IPv6 bridges should return a bridge line without the fingerprint. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withIPv6() + line = self.bridge.getBridgeLine(request, includeFingerprint=False) + + self.assertIsNotNone(line) + self.assertTrue( + line.startswith('[6bf3:806b:78cd:d4b4:f6a7:4ced:cfad:dad4]:36488')) + self.assertNotIn('179.178.155.140:36493', line) + self.assertNotIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + def test_Bridge_getBridgeLine_obfs4(self): """ """ self.bridge.updateFromNetworkStatus(self.networkstatus)

1 0

[bridgedb/master] Fix bug in Bridge.setStatus(stable=True).
by isis＠torproject.org 01 May '15

01 May '15

commit b0cfd90ec1e2b72aa85d3a90ce360743f1089bc3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:48:07 2015 +0000 Fix bug in Bridge.setStatus(stable=True). --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 86123b2..1121a0b 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -668,7 +668,7 @@ class BridgeBackwardsCompatibility(BridgeBase): self.flags.running = bool(running) if stable is not None: self.stable = bool(stable) - self.flags.stable = bool(running) + self.flags.stable = bool(stable) def getConfigLine(self, includeFingerprint=False, addressClass=None, request=None, transport=None):

1 0

[bridgedb/master] Update CHANGELOG for bridgedb-0.3.2.
by isis＠torproject.org 01 May '15

01 May '15

commit 1488ca74f8aeca15a63c2de22acb9bf17935e83c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 27 04:46:30 2015 +0000 Update CHANGELOG for bridgedb-0.3.2. --- CHANGELOG | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 279ad57..8c1bb0e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,35 @@ +Changes in version 0.3.2 - 2015-03-?? + + * FIXES a problem with the calculation of Levenshtein distances + between blacklisted email addresses and those on incoming + email. This fixes a problem with the fuzzy matching implemented in + #9385: https://bugs.torproject.org/9385. + + * FIXES #12504 https://bugs.torproject.org/12504 + Which Pluggable Transports BridgeDB distributes is now easily + configurable via the bridgedb.conf configuration file. + + * FIXES #13202 https://bugs.torproject.org/13202 + Old bridges running Tor-0.2.4.x with Pluggable Transports like + scramblesuit and obfs4proxy have a bug which causes them to not + include the PT arguments in the `transport` line they submit to + the BridgeAuthority in their extrainfo descriptors. This causes + BridgeDB to have broken bridge lines for these bridges. + For example, scramblesuit requires a `password=` in the + `ClientTransportPlugin` for clients to connect to it. If BridgeDB + receives a line in that bridge's extrainfo which says + `transport scramblesuit 1.2.3.4:1234` (without a password), then + when BridgeDB gives clients a bridge line for that bridge, it'll + look like "Bridge scramblesuit 1.2.3.4:1234" - meaning that it won't + work. This fixes the issue by excluding broken transports from + being distributed to clients. + + * FIXES #15464 https://bugs.torproject.org/15464 + The setup procedure for creating a BridgeDB Continuous Integration + build machine is now simplified and generalised to include build + environments like Jenkins, not just TravisCI. + + Changes in version 0.3.1 - 2015-03-24 * FIXES #14065 https://bugs.torproject.org/14065

1 0

[bridgedb/master] Add test for Bridge._updateORAddresses() with invalid addresses.
by isis＠torproject.org 01 May '15

01 May '15

commit 718adaa978f8320950d05b173674d58d80b3e0b9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:53:26 2015 +0000 Add test for Bridge._updateORAddresses() with invalid addresses. --- lib/bridgedb/test/test_bridges.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 86d0cf1..1755e6f 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -933,6 +933,23 @@ class BridgeTests(unittest.TestCase): bridgePrefix=True) self.assertEqual(bridgeline, 'Bridge [6bf3:806b:78cd::4ced:cfad:dad4]:36488') + def test_Bridge_updateORAddresses_valid_and_invalid(self): + """Bridge._updateORAddresses() called with a mixture of valid and + invalid ORAddress tuples should only retain the valid ones. + """ + orAddresses = [ + (u'1.1.1.1', 1111, False), # valid + (u'127.0.0.1', 2222, False), # invalid IPv4 loopback + (u'FE80::1234', 3333, True)] # invalid IPv6 link local + bridge = bridges.Bridge() + bridge._updateORAddresses(orAddresses) + + self.assertEqual(len(bridge.orAddresses), 1) + addr, port, version = bridge.orAddresses[0] + self.assertEqual(addr, ipaddr.IPAddress('1.1.1.1')) + self.assertEqual(port, 1111) + self.assertEqual(version, 4) + def test_Bridge_updateFromNetworkStatus_IPv4_ORAddress(self): """Calling updateFromNetworkStatus() with a descriptor which has an IPv4 address as an additional ORAddress should result in a

1 0

[bridgedb/master] Fix typo in comment in bridgedb.configure found by Robert Ransom.
by isis＠torproject.org 01 May '15

01 May '15

commit 3ce70324b6f23c4fd2f02568549a26f84e7c461b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 27 00:28:40 2015 +0000 Fix typo in comment in bridgedb.configure found by Robert Ransom. --- lib/bridgedb/configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index 4fb6cc0..54dcdff 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -120,7 +120,7 @@ def loadConfig(configFile=None, configCls=None): setattr(config, attr, setting) for attr in ["SUPPORTED_TRANSPORTS"]: - setting = getattr(config, attr, {}) # Default to emtpy dicts + setting = getattr(config, attr, {}) # Default to empty dicts setattr(config, attr, setting) # Set the SUPPORTED_TRANSPORTS to populate the webserver and email options:

1 0

[bridgedb/master] Add unittest for str(Bridge) without fingerprint or nickname.
by isis＠torproject.org 01 May '15

01 May '15

commit ce197f4997d7eaef7694d17081c0a3ce96bd974c Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:48:56 2015 +0000 Add unittest for str(Bridge) without fingerprint or nickname. --- lib/bridgedb/test/test_bridges.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 763e4c4..1592f00 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -912,6 +912,15 @@ class BridgeTests(unittest.TestCase): ''.join(['$', '0'*40, '~', bridge.nickname])) + def test_Bridge_str_without_fingerprint_without_nickname(self): + """Calling str(Bridge) on a Bridge whose fingerprint and nickname were + not set should return a Bridge identifier string where the fingerprint + is all 0's and the nickname is "Unnamed". + """ + bridge = bridges.Bridge() + identifier = str(bridge) + self.assertEqual(identifier, ''.join(['$', '0'*40, '~', 'Unnamed'])) + def test_Bridge_updateFromNetworkStatus_IPv4_ORAddress(self): """Calling updateFromNetworkStatus() with a descriptor which has an IPv4 address as an additional ORAddress should result in a

1 0

[bridgedb/master] Add test for Bridge.setStatus() that exposes a bug.
by isis＠torproject.org 01 May '15

01 May '15

commit 581fec101457891c76f41bef14757f91c594b7f2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:44:24 2015 +0000 Add test for Bridge.setStatus() that exposes a bug. Doing: >>> from bridgedb import bridges >>> b = bridges.Bridge() >>> b.setStatus(stable=True) Results in: >>> b.stable True >>> b.flags.stable False When it should result in: >>> b.stable True >>> b.flags.stable True --- lib/bridgedb/test/test_bridges.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index cda052e..763e4c4 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -706,6 +706,24 @@ class BridgeBackwardsCompatibilityTests(unittest.TestCase): self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) self.assertEqual(len(bridge.orAddresses), 1) + def test_BridgeBackwardsCompatibility_setStatus_stable(self): + """Using setStatus() to set the Stable flag should set Bridge.stable + and Bridge.flags.stable to True. + """ + bridge = bridges.BridgeBackwardsCompatibility( + nickname=self.nickname, + ip=self.address, + orport=self.orPort, + fingerprint=self.fingerprint, + or_addresses={"2006:42::123F": 443, "2006:42::123E": 9001}) + self.assertIsInstance(bridge, bridges.BridgeBackwardsCompatibility) + self.assertFalse(bridge.stable) + self.assertFalse(bridge.flags.stable) + + bridge.setStatus(stable=True) + self.assertTrue(bridge.stable) + self.assertTrue(bridge.flags.stable) + def test_BridgeBackwardsCompatibility_setStatus_running(self): """Using setStatus() to set the Running flag should set Bridge.running and Bridge.flags.running to True.

1 0