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

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

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

01 May '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/master] Add unittests for altered extrainfo descriptors.
by isis＠torproject.org 01 May '15

01 May '15

commit dfb000b94aae3ff422162d98a7db3c185c4751ce Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 26 23:28:49 2015 +0000 Add unittests for altered extrainfo descriptors. --- lib/bridgedb/test/test_bridges.py | 83 ++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 907cc28..cda052e 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -107,6 +107,38 @@ XILT4o+SveEQUG72R4bENsKxqV4rRNh1g6CNAbYhAITqrU9B+jImDgrBBW+XWT5K -----END SIGNATURE----- ''' +# The timestamps have changed, and the IP:port for obfs3 changed +BRIDGE_EXTRAINFO_NEW = '''\ +extra-info FourfoldQuirked 2C3225C4805331025E211F4B6E5BF45C333FDD2C +published 2014-12-22 22:51:27 +write-history 2014-12-22 22:51:27 (900 s) 3188736,2226176,2866176 +read-history 2014-12-22 22:51:27 (900 s) 3891200,2483200,2698240 +dirreq-write-history 2014-12-22 22:51:27 (900 s) 1024,0,2048 +dirreq-read-history 2014-12-22 22:51:27 (900 s) 0,0,0 +geoip-db-digest 51AE9611B53880B2BCF9C71E735D73F33FAD2DFE +geoip6-db-digest 26B0D55B20BEB496A3ADE7C6FDD866F5A81027F7 +dirreq-stats-end 2014-12-22 22: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 11.11.11.11:1111 +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 22: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` @@ -726,6 +758,8 @@ class BridgeTests(unittest.TestCase): self._serverDescriptorFile)[0] self.extrainfo = descriptors.parseExtraInfoFiles( self._extrainfoFile).values()[0] + self.extrainfoNew = descriptors.parseExtraInfoFiles( + self._extrainfoNewFile).values()[0] def _writeNetworkstatus(self, networkstatus): with open(self._networkstatusFile, 'w') as fh: @@ -742,10 +776,16 @@ class BridgeTests(unittest.TestCase): fh.write(extrainfo) fh.flush() - def _writeDescriptorFiles(self, networkstatus, serverdesc, extrainfo): + def _writeExtrainfoNew(self, extrainfo): + with open(self._extrainfoNewFile, 'w') as fh: + fh.write(extrainfo) + fh.flush() + + def _writeDescriptorFiles(self, networkstatus, serverdesc, extrainfo, extrainfoNew): self._writeNetworkstatus(networkstatus) self._writeServerdesc(serverdesc) self._writeExtrainfo(extrainfo) + self._writeExtrainfoNew(extrainfoNew) def setUp(self): def _cwd(filename): @@ -754,10 +794,12 @@ class BridgeTests(unittest.TestCase): self._networkstatusFile = _cwd('BridgeTests-networkstatus-bridges') self._serverDescriptorFile = _cwd('BridgeTests-bridge-descriptors') self._extrainfoFile = _cwd('BridgeTests-cached-extrainfo') + self._extrainfoNewFile = _cwd('BridgeTests-cached-extrainfo.new') self._writeDescriptorFiles(BRIDGE_NETWORKSTATUS, BRIDGE_SERVER_DESCRIPTOR, - BRIDGE_EXTRAINFO) + BRIDGE_EXTRAINFO, + BRIDGE_EXTRAINFO_NEW) self._parseAllDescriptorFiles() self.bridge = bridges.Bridge() @@ -1355,3 +1397,40 @@ 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_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)

1 0

[bridgedb/master] Document countryCode parameter for IPBasedDistributor.getBridgesForIP().
by isis＠torproject.org 01 May '15

01 May '15

commit ba50829d94e7fdbd8d8498aca15273fb75e60dcf Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:17:12 2015 +0000 Document countryCode parameter for IPBasedDistributor.getBridgesForIP(). --- lib/bridgedb/Dist.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 20f27bc..ded8297 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -243,7 +243,11 @@ class IPBasedDistributor(Distributor): be any string, so long as it changes with every period. :param int N: The number of bridges to try to give back. (default: 1) - :param str countryCode: DOCDOC (default: None) + :param str countryCode: The two-letter geoip country code of the + client's IP address. If given, the client will be placed in that + "area". Clients within the same area receive the same bridges per + period. If not given, the **ip** is truncated to it's CIDR /24 + representation and used as the "area". (default: None) :param list bridgeFilterRules: A list of callables used filter the bridges returned in the response to the client. See :mod:`~bridgedb.Filters`.

1 0

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

01 May '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/master] Change to new URL for check.tpo TorBulkExitList.py script.
by isis＠torproject.org 01 May '15

01 May '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/master] PEP8 whitespace fix for one line in Dist.py.
by isis＠torproject.org 01 May '15

01 May '15

commit 4ec9a3e6748ed59e4399c139210ba706f133d392 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:30:20 2015 +0000 PEP8 whitespace fix for one line in Dist.py. --- lib/bridgedb/Dist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index ded8297..c2a8620 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -320,7 +320,7 @@ class IPBasedDistributor(Distributor): # otherwise, add a new ring and populate it if ruleset in self.splitter.filterRings.keys(): logging.debug("Cache hit %s" % ruleset) - _,ring = self.splitter.filterRings[ruleset] + _, ring = self.splitter.filterRings[ruleset] # else create the ring and populate it else:

1 0

[bridgedb/master] Remove the insanely chatty log messages about miscalculated hashrings.
by isis＠torproject.org 01 May '15

01 May '15

commit 78c3df98888252a2045e1e627397ec8e1f7a3f4c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:32:55 2015 +0000 Remove the insanely chatty log messages about miscalculated hashrings. I added these earlier this week for debugging purposes, but it turns out that they print *so* many times that it is impossible to follow the logfiles. --- lib/bridgedb/Filters.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b857967..b06a605 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -24,12 +24,7 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): if which == assignedRing: return True - else: - logging.debug(("Bridge %s has calculated assignment %d; not " - "in correct ring %d.") - % (bridge, which, assignedRing)) - return False - + return False _assignBridgesToRing.__name__ = ("filterAssignBridgesToRing(%s, %s, %s)" % (hmac, numRings, assignedRing)) setattr(_assignBridgesToRing, "description", "ring=%d" % assignedRing) @@ -88,13 +83,6 @@ def filterBridgesByTransport(methodname, addressClass=None): # ignore method name case if transport.methodname.lower() == methodname.lower(): return True - else: - logging.debug(("Transport methodname '%s' doesn't match " - "requested methodname: '%s'.") - % (transport.methodname, methodname)) - else: - logging.debug(("Transport %s has incorrect address version " - "(%s).") % (transport, addressClass)) return False _filterByTransport.__name__ = ("filterBridgesByTransport(%s,%s)"

1 0

[bridgedb/master] Log which PROXY_LIST_FILES we load at startup.
by isis＠torproject.org 01 May '15

01 May '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/master] Add note about an annoying technical limitation for filter descriptions.
by isis＠torproject.org 01 May '15

01 May '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