April 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Add useful output during startup integration test
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit a3d59f0b2b9870ee8ee184bfb6617844891f8b57 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Mar 26 05:26:07 2014 +0000 Add useful output during startup integration test --- lib/bridgedb/test/test_bridgedb.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 1f4470b..e73e2bc 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -92,10 +92,12 @@ class BridgeDBCliTest(unittest.TestCase): # Sorry Windows users devnull = open('/dev/null', 'w') bridgedbProc = Popen([bridgedbScript, '-r', runDir], stdout=devnull) + print("Waiting 30 seconds while bridgedb loads...") time.sleep(30) assignments = pjoin(runDir, 'assignments.log') self.assertTrue(os.path.isfile(assignments)) os.unlink(assignments) + print("Sending SIGHUP, checking for assignments.log ...") bridgedbProc.send_signal(signal.SIGHUP) time.sleep(5) try: @@ -105,6 +107,7 @@ class BridgeDBCliTest(unittest.TestCase): bridgedbProcCode = bridgedbProc.wait() print("`bridgedb' exited with status code %d" % int(bridgedbProcCode)) raise e + print("Sending SIGUSR1, checking for bucket files...") bridgedbProc.send_signal(signal.SIGUSR1) time.sleep(5) buckets = [['email', False], ['https', False], ['unallocated', False]] @@ -121,6 +124,7 @@ class BridgeDBCliTest(unittest.TestCase): bridgedbProcCode = bridgedbProc.wait() print("`bridgedb' exited with status code %d" % int(bridgedbProcCode)) raise e + print("Done. Killing processes.") bridgedbProc.send_signal(signal.SIGINT) bridgedbProcCode = bridgedbProc.wait() print("`bridgedb' exited with status code %d" % int(bridgedbProcCode))

1 0

[bridgedb/master] Add TODO mentioning that we should be able to disable distributors
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit 8dfcd5d7f77950828d3c95f93417baf7ea70c6b7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Mar 30 13:36:49 2014 +0000 Add TODO mentioning that we should be able to disable distributors If we reparse our config and it tells us that a distributor, which is currently running, should be disabled then we should be able to shut it down. Also wrap long lines. --- lib/bridgedb/Main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 1f7e52d..8a1b650 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -609,10 +609,14 @@ def startup(options): state.save() if inThread: + # XXX shutdown the distributors if they were previously running + # and should now be disabled if ipDistributorTmp: - reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) + reactor.callFromThread(replaceBridgeRings, + ipDistributor, ipDistributorTmp) if emailDistributorTmp: - reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) + reactor.callFromThread(replaceBridgeRings, + emailDistributor, emailDistributorTmp) else: # We're still starting up. Return these distributors so # they are configured in the outer-namespace

1 0

[bridgedb/master] Bump leekspin to v0.1.3
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit 6ce6bcc999882535169aaaa68797d31f3be2c0d7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Mar 27 03:10:05 2014 +0000 Bump leekspin to v0.1.3 --- .travis.yml | 2 +- CHANGELOG | 3 +++ setup.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5553a81..7aef0ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ python: install: - pip install -r requirements.txt - - pip install --no-use-wheel leekspin==0.1.1 coverage==3.7 coveralls==0.3 sure==1.2.2 + - pip install --no-use-wheel leekspin==0.1.3 coverage==3.7 coveralls==0.3 sure==1.2.2 - make install script: diff --git a/CHANGELOG b/CHANGELOG index 0498e4f..4f36267 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,9 @@ Changes in version 0.1.7 - significantly increased the availability of bridgedb, as a result. +And includes the following general changes: + * BUMPS leekspin version to 0.1.3 + Changes in version 0.1.6 - 2014-03-26 BridgeDB 0.1.6 includes fixes for the following bugs: * FIXES #11196 BridgeDB should use leekspin diff --git a/setup.py b/setup.py index d859f87..d77bc1d 100644 --- a/setup.py +++ b/setup.py @@ -277,7 +277,7 @@ setuptools.setup( scripts=['scripts/bridgedb'], extras_require={'test': ["sure==1.2.2", "coverage==3.7", - "leekspin==0.1.1"]}, + "leekspin==0.1.3"]}, zip_safe=False, cmdclass=get_cmdclass(), include_package_data=True,

1 0

[bridgedb/master] Only update distributor's hashring if it's still active
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit a79d154de5db6293321f6c68835e8f4ff25032d8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Mar 28 00:15:16 2014 +0000 Only update distributor's hashring if it's still active TODO: shutdown the distributor in this situation --- lib/bridgedb/Main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index a28b75f..1f7e52d 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -609,8 +609,10 @@ def startup(options): state.save() if inThread: - reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) - reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) + if ipDistributorTmp: + reactor.callFromThread(replaceBridgeRings, ipDistributor, ipDistributorTmp) + if emailDistributorTmp: + reactor.callFromThread(replaceBridgeRings, emailDistributor, emailDistributorTmp) else: # We're still starting up. Return these distributors so # they are configured in the outer-namespace

1 0

[bridgedb/master] Use `email.message.Message` instead of `MimeWriter.MimeWriter`
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit 5092364f7e3ce42b61b0336a95519639d0e59308 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Sun Mar 30 12:42:06 2014 +0000 Use `email.message.Message` instead of `MimeWriter.MimeWriter` `MimeWriter.MimeWriter` was deprecated in Python 2.3, now is a great time for us to switch to the replacement. Fixes #11370 --- CHANGELOG | 4 ++++ lib/bridgedb/EmailServer.py | 39 ++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4f36267..7f160df 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,10 @@ Changes in version 0.1.7 - descriptor reparsing into another thread and significantly increased the availability of bridgedb, as a result. + * FIXES #11370 We were using an old (and deprecated) module when + we created our email responses. Now we use the newer + version. This should only affect internal functionality + and should not result in any noticable user-visible changes. And includes the following general changes: * BUMPS leekspin version to 0.1.3 diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 8b7783f..90b22af 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_EmailServer -*- # BridgeDB by Nick Mathewson. # Copyright (c) 2007-2013, The Tor Project, Inc. # See LICENSE for licensing information @@ -6,8 +7,10 @@ This module implements the email interface to the bridge database. """ -from StringIO import StringIO -import MimeWriter +from __future__ import unicode_literals + +from email import message +from io import StringIO import gettext import gpgme import logging @@ -430,17 +433,19 @@ def addSMTPServer(cfg, dist, sched): def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, gpgContext=None): - f = StringIO() - w = MimeWriter.MimeWriter(f) - w.addheader("From", fromAddr) - w.addheader("To", clientAddr) - w.addheader("Message-ID", twisted.mail.smtp.messageid()) + msg = message.Message() + msg.add_header("From", fromAddr) + msg.add_header("To", clientAddr) + msg.add_header("Message-ID", twisted.mail.smtp.messageid()) if not subject.startswith("Re:"): subject = "Re: %s"%subject - w.addheader("Subject", subject) + msg.add_header("Subject", subject) if msgID: - w.addheader("In-Reply-To", msgID) - w.addheader("Date", twisted.mail.smtp.rfc822date()) - mailbody = w.startbody("text/plain") + msg.add_header("In-Reply-To", msgID) + msg.add_header("Date", twisted.mail.smtp.rfc822date()) + msg.set_default_type("text/plain") + headers = [': '.join(m) for m in msg.items()] + mail = StringIO("\r\n".join(headers)) + mail.writelines(unicode(msg.as_string())) # gpg-clearsign messages if gpgContext: @@ -450,20 +455,20 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, if (len(sigs) != 1): logging.warn('Failed to sign message!') signature.seek(0) - [mailbody.write(l) for l in signature] + [mail.write(l) for l in signature] else: - mailbody.write(body) + mail.write(body) # Only log the email text (including all headers) if SAFE_LOGGING is # disabled: if not Util.safe_logging: - f.seek(0) - logging.debug("Email contents:\n%s" % f.read()) + mail.seek(0) + logging.debug("Email contents:\n%s" % mail.read()) else: logging.debug("Email text for %r created." % Util.logSafely(clientAddr)) - f.seek(0) + mail.seek(0) - return clientAddr, f + return clientAddr, mail def getGPGContext(cfg): """Import a key from a file and initialise a context for GnuPG operations.

1 0

[bridgedb/master] Merge remote-tracking branch 'tpo-sysrqb/bug5232_adding_concurrent_processing_squashed_r1' into develop
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit 13231f18ff2dc8a80d6d5561833b503f690f3872 Merge: 8745167 8dfcd5d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 1 21:54:44 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug5232_adding_concurrent_processing_squashed_r1' into develop .travis.yml | 2 +- CHANGELOG | 14 +++ lib/bridgedb/Bridges.py | 66 +++++------ lib/bridgedb/Bucket.py | 104 ++++++++-------- lib/bridgedb/Dist.py | 115 +++++++++--------- lib/bridgedb/EmailServer.py | 56 ++++++--- lib/bridgedb/Main.py | 210 +++++++++++++++++++++------------ lib/bridgedb/Stability.py | 204 ++++++++++++++++---------------- lib/bridgedb/Storage.py | 158 +++++++++++++++++++++++-- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/test/test_EmailServer.py | 160 +++++++++++++++++++++++++ lib/bridgedb/test/test_Storage.py | 56 +++++++++ lib/bridgedb/test/test_bridgedb.py | 39 +++++- setup.py | 2 +- 14 files changed, 840 insertions(+), 350 deletions(-)

1 0

[bridgedb/master] Add CHANGELOG entry for #11377.
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit 894e35e4d0c16d737d061118efdcb63d8a7cc25f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 11:12:44 2014 +0000 Add CHANGELOG entry for #11377. --- CHANGELOG | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7dc867b..2a043a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,16 +2,19 @@ Changes in version 0.1.7 - * FIXES #5232 Perform long running and blocking transactions in background threads. Primarily this moves bridge descriptor reparsing into another thread and - significantly increased the availability of bridgedb, + significantly increased the availability of BridgeDB, as a result. * FIXES #11370 We were using an old (and deprecated) module when we created our email responses. Now we use the newer version. This should only affect internal functionality - and should not result in any noticable user-visible changes. + And should not result in any noticable user-visible changes. + * FIXES #11377 CAPTCHAs on BridgeDB's HTTPS interface are now + case-insensitive. Patch thanks to Kostas Jakeliunas. And includes the following general changes: * BUMPS leekspin version to 0.1.3 + Changes in version 0.1.6 - 2014-03-26 BridgeDB 0.1.6 includes fixes for the following bugs: * FIXES #11196 BridgeDB should use leekspin

1 0

[bridgedb/master] Make GimpRecaptcha check be case-insensitive
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit dd9e75ba234d2d4aad90aedb0bf163d8bb13811b Author: Kostas Jakeliunas <kostas(a)jakeliunas.com> Date: Mon Mar 31 17:14:20 2014 +0300 Make GimpRecaptcha check be case-insensitive Users report new captcha case-sensitivity as counter-intuitive. The fix is to simply ignore case when doing the comparison. Fix bug #11377. --- lib/bridgedb/captcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index e5bf5e5..f993a9d 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -203,7 +203,7 @@ class GimpCaptcha(Captcha): finally: if validHMAC: decrypted = secretKey.decrypt(original) - if solution == decrypted: + if solution.lower() == decrypted.lower(): return True return False

1 0

[bridgedb/master] Merge remote-tracking branch 'wfn/bug11377_gimpcaptcha' into develop
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit e77fdd860398d352bd032751da8c4d0c3a07654b Merge: dee20f0 dd9e75b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 11:09:29 2014 +0000 Merge remote-tracking branch 'wfn/bug11377_gimpcaptcha' into develop lib/bridgedb/captcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[bridgedb/master] Add file headers and fix module docstring for bridgedb.Bridges.
by isis＠torproject.org 20 Apr '14

20 Apr '14

commit 8c04ac62954e99de131ac9b409412aeda3ac1c12 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 12:06:17 2014 +0000 Add file headers and fix module docstring for bridgedb.Bridges. --- lib/bridgedb/Bridges.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index bfe1316..14820cc 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1,8 +1,13 @@ -# See LICENSE for licensing information - -""" -This module has low-level functionality for parsing bridges and arranging -them in rings. +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_Bridges -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: see AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""This module has low-level functionality for parsing bridges and arranging +them into hashrings for distributors. """ import binascii

1 0