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

[bridgedb/develop] Add unittest for str(Bridge) without fingerprint or nickname.
by isis＠torproject.org 28 Mar '15

28 Mar '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/develop] Add two tests for getBridgeLine() and _constructBridgeLine() for IPv6.
by isis＠torproject.org 28 Mar '15

28 Mar '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/develop] Add test for Bridge._updateORAddresses() with invalid addresses.
by isis＠torproject.org 28 Mar '15

28 Mar '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/develop] Fix typo in comment in bridgedb.configure found by Robert Ransom.
by isis＠torproject.org 28 Mar '15

28 Mar '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/develop] Merge branch 'fix/15464-ci-directives_r1' into develop
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 6a1a93585064bf8752589ae2781443387c90bb73 Merge: 718adaa 0344fe8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:55:14 2015 +0000 Merge branch 'fix/15464-ci-directives_r1' into develop .travis.yml | 21 ++------------------- scripts/install-dependencies | 40 ++++++++++++++++++++++++++++++++++++++++ scripts/setup-tests | 29 +++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 19 deletions(-)

1 0

[bridgedb/develop] Change to new URL for check.tpo TorBulkExitList.py script.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit b4c177c00c4017b51d2d0cbe68ee1b3fd238bdaa Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:14:34 2015 +0000 Change to new URL for check.tpo TorBulkExitList.py script. See https://bugs.torproject.org/15480#comment:1 --- scripts/get-tor-exits | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get-tor-exits b/scripts/get-tor-exits index 32b457d..d4e59e3 100755 --- a/scripts/get-tor-exits +++ b/scripts/get-tor-exits @@ -152,7 +152,7 @@ def main(filename=None, address=None, port=None): if not address: address = getSelfIPAddress() - check = "https://check.torproject.org/cgi-bin/TorBulkExitList.py" + check = "https://check.torproject.org/torbulkexitlist" params = [] params.append('ip=%s' % address)

1 0

[bridgedb/develop] Merge branch 'fix/12504-config-pts' into develop
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 12996cfe36c7cc763f75f5373bed9f52b8336d1c Merge: 60c0e8a 3ce7032 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 27 00:31:51 2015 +0000 Merge branch 'fix/12504-config-pts' into develop lib/bridgedb/configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[bridgedb/develop] Log which PROXY_LIST_FILES we load at startup.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 7163888e0d6bec87c6cd8450ba527ec6160663a6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:36:25 2015 +0000 Log which PROXY_LIST_FILES we load at startup. --- lib/bridgedb/Main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 45908c7..31a9c66 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -369,6 +369,7 @@ def run(options, reactor=reactor): # Get a proxy list. proxyList = proxy.ProxySet() for proxyfile in config.PROXY_LIST_FILES: + logging.info("Loading proxies from: %s" % proxyfile) proxy.loadProxiesFromFile(proxyfile, proxyList) emailDistributor = ipDistributor = None

1 0

[bridgedb/develop] Merge branch 'fix/13202-missing-pt-args' into develop
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 60c0e8a7cac1273b8d5422f591bc1c84882fbeec Merge: 6a1a935 3827008 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 27 00:01:03 2015 +0000 Merge branch 'fix/13202-missing-pt-args' into develop Conflicts: lib/bridgedb/test/test_bridges.py lib/bridgedb/bridges.py | 52 ++++++++++++++---- lib/bridgedb/test/test_bridges.py | 107 +++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 9 deletions(-) diff --cc lib/bridgedb/test/test_bridges.py index 1755e6f,e9e0526..5a79d5e --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@@ -1473,39 -1411,54 +1528,91 @@@ class BridgeTests(unittest.TestCase) 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_changed_no_verify(self): + """A changed extrainfo descriptor should log that a transport's + IP and/or port changed. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + changedExtrainfo = BRIDGE_EXTRAINFO + changedExtrainfo.replace('transport obfs3 179.178.155.140:36490', + 'transport obfs3 179.178.155.14:3649') + self._writeExtrainfo(changedExtrainfo) + + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo, verify=False) + + def test_Bridge_updateFromExtraInfoDescriptor_changed_verify(self): + """A changed extrainfo descriptor with verify=True should raise an + InvalidExtraInfoSignature exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfoNew) + + # We should have hit the return just after the + # `except InvalidExtraInfoSignature` line, and so the + # bridge.descriptors['extrainfo'] shouldn't have been updated. + # Therefore, the one we stored should be older, that is, we shouldn't + # have kept the new one. + self.assertLess(self.bridge.descriptors['extrainfo'].published, + self.extrainfoNew.published) + # And the one we stored should be the older one, with the same + # published timestamp: + self.assertEqual(self.bridge.descriptors['extrainfo'], self.extrainfo) + self.assertEqual(self.bridge.descriptors['extrainfo'].published, + self.extrainfo.published) ++ + 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/develop] Add note about an annoying technical limitation for filter descriptions.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 607c0a6b345dc5eba81eec1d8aeddb4302b09800 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:35:06 2015 +0000 Add note about an annoying technical limitation for filter descriptions. --- lib/bridgedb/Filters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b06a605..eadf012 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -27,6 +27,8 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): return False _assignBridgesToRing.__name__ = ("filterAssignBridgesToRing(%s, %s, %s)" % (hmac, numRings, assignedRing)) + # XXX The `description` attribute must contain an `=`, or else + # dumpAssignments() will not work correctly. setattr(_assignBridgesToRing, "description", "ring=%d" % assignedRing) funcs[ruleset] = _assignBridgesToRing return _assignBridgesToRing

1 0