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

[bridgedb/master] Use `smtp` rather than `twisted.mail.smtp` in EmailServer.composeMail().
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit a020c975387fc47c1632c80ee19d66222dc2f5b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:57:34 2014 +0000 Use `smtp` rather than `twisted.mail.smtp` in EmailServer.composeMail(). --- lib/bridgedb/EmailServer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 2d2158d..599b446 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -442,12 +442,12 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, msg = message.Message() msg.add_header("From", fromAddr) msg.add_header("To", clientAddr) - msg.add_header("Message-ID", twisted.mail.smtp.messageid()) + msg.add_header("Message-ID", smtp.messageid()) if not subject.startswith("Re:"): subject = "Re: %s"%subject msg.add_header("Subject", subject) if msgID: msg.add_header("In-Reply-To", msgID) - msg.add_header("Date", twisted.mail.smtp.rfc822date()) + msg.add_header("Date", smtp.rfc822date()) msg.set_default_type("text/plain") headers = [': '.join(m) for m in msg.items()] mail = StringIO("\r\n".join(headers))

1 0

[bridgedb/master] PEP8: use `except … as …` syntax in EmailServer.getMailResponse().
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 37d144d2c581b43ca73b47fb47cd1b6597a5235c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 12 15:24:53 2014 +0000 PEP8: use `except … as …` syntax in EmailServer.getMailResponse(). --- lib/bridgedb/EmailServer.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 5fa550d..7d54b4e 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -186,9 +186,9 @@ def getMailResponse(lines, ctx): bridgeFilterRules=bridgeFilterRules) # Handle rate limited email - except TooSoonEmail, e: - logging.info("Got a mail too frequently; warning %r: %s.", - util.logSafely(clientAddr), e) + except TooSoonEmail as err: + logging.info("Got a mail too frequently; warning '%s': %s." + % (util.logSafely(clientAddr), err)) # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours @@ -196,14 +196,14 @@ def getMailResponse(lines, ctx): return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID, gpgContext=ctx.gpgContext) - except IgnoreEmail, e: - logging.info("Got a mail too frequently; ignoring %r: %s.", - util.logSafely(clientAddr), e) + except IgnoreEmail as err: + logging.info("Got a mail too frequently; ignoring '%s': %s." + % (util.logSafely(clientAddr), err)) return None, None - except BadEmail, e: - logging.info("Got a mail from a bad email address %r: %s.", - util.logSafely(clientAddr), e) + except BadEmail as err: + logging.info("Got a mail from a bad email address '%s': %s." + % (util.logSafely(clientAddr), err)) return None, None if bridges:

1 0

[bridgedb/master] PEP8 reorder import statements in HTTPServer.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 24d53464c031b2c70758b1655caf4a305c29dede Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 03:06:30 2014 +0000 PEP8 reorder import statements in HTTPServer. --- lib/bridgedb/HTTPServer.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c0e5b66..40a69af 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -14,6 +14,13 @@ import textwrap import time import os +from ipaddr import IPv4Address +from ipaddr import IPv6Address + +import mako.exceptions +from mako.template import Template +from mako.lookup import TemplateLookup + from twisted.internet import reactor from twisted.internet.error import CannotListenError from twisted.python import filepath @@ -35,11 +42,7 @@ from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.parse import headers -from ipaddr import IPv4Address, IPv6Address from random import randint -import mako.exceptions -from mako.template import Template -from mako.lookup import TemplateLookup template_root = os.path.join(os.path.dirname(__file__),'templates')

1 0

[bridgedb/master] PEP8 reorder import statements in Dist.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit c27abfc91dffb89f3061a6e658132072fcee667e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 03:10:32 2014 +0000 PEP8 reorder import statements in Dist. --- lib/bridgedb/Dist.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index e7bc443..c6e8756 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -12,15 +12,17 @@ """This module has functions to decide which bridges to hand out to whom.""" -import bridgedb.Bridges -import bridgedb.Storage -import bridgedb.util as util - import logging import re import time -from ipaddr import IPv6Address, IPAddress +from ipaddr import IPv6Address +from ipaddr import IPAddress + +import bridgedb.Bridges +import bridgedb.Storage + +from bridgedb import util from bridgedb.crypto import getHMAC from bridgedb.crypto import getHMACFunc from bridgedb.Filters import filterAssignBridgesToRing

1 0

[bridgedb/master] Cleanup captcha.html template.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 72d5f0c95031756e64c7f5de68967468ffbf747e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 03:14:40 2014 +0000 Cleanup captcha.html template. * FIX the "Type the two words" alt text by changing it to "Type the word". * CHANGE the "I am human" button to say "Submit". --- lib/bridgedb/templates/captcha.html | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/bridgedb/templates/captcha.html b/lib/bridgedb/templates/captcha.html index a670072..74866ce 100644 --- a/lib/bridgedb/templates/captcha.html +++ b/lib/bridgedb/templates/captcha.html @@ -1,16 +1,24 @@ ## -*- coding: utf-8 -*- <%inherit file="base.html"/> <div class="captcha"> -<form action="" method="POST"> - <input type="hidden" name="captcha_challenge_field" - id="captcha_challenge_field" value="${challenge_field}"> - <img width="300" height="57" - alt="${_('Your browser is not displaying images properly.')}" - src="${imgstr}"> - <div class="captcha_input_area"> - <label for="captcha_response_field">${_("Type the two words")}</label></div> - <input name="captcha_response_field" id="captcha_response_field" - type="text" autocomplete="off"> - <input class="btn btn-success" type="submit" name="submit" value="I am human"> -</form> + <form action="" method="POST"> + <input type="hidden" + name="captcha_challenge_field" + id="captcha_challenge_field" + value="${challenge_field}"> + <img width="300" + height="57" + alt=${_("Your browser is not displaying images properly.")} + src="${imgstr}"> + <div class="captcha_input_area"> + <label for="captcha_response_field">${_("Type the word")}</label></div> + <input name="captcha_response_field" + id="captcha_response_field" + type="text" + autocomplete="off"> + <input class="btn btn-primary" + type="submit" + name="submit" + value=${_("Submit")}> + </form> </div>

1 0

[bridgedb/master] PEP8 reorder import statements in Main.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit d04fd55c1bef12fdbb4edef97428d6122cf6b4e2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 03:12:34 2014 +0000 PEP8 reorder import statements in Main. --- lib/bridgedb/Main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 84e2252..379c775 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -20,14 +20,13 @@ from twisted.internet import reactor from bridgedb import crypto from bridgedb import persistent +from bridgedb import util from bridgedb.parse import options import bridgedb.Bridges as Bridges import bridgedb.Dist as Dist import bridgedb.Time as Time import bridgedb.Storage -from bridgedb import util - def configureLogging(cfg): """Set up Python's logging subsystem based on the configuratino.

1 0

[bridgedb/master] Change import of `random.randint`; only use one random value to create IP.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 4bc1ffb742c66502cd5fde3e57709bae0d462f71 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 03:07:46 2014 +0000 Change import of `random.randint`; only use one random value to create IP. --- lib/bridgedb/HTTPServer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 40a69af..06ae2ed 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -9,6 +9,7 @@ This module implements the web (http, https) interfaces to the bridge database. import base64 import gettext import logging +import random import re import textwrap import time @@ -42,7 +43,6 @@ from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.parse import headers -from random import randint template_root = os.path.join(os.path.dirname(__file__),'templates') @@ -439,8 +439,8 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): remoteIP = self.recaptchaRemoteIP else: # generate a random IP for the captcha submission - remoteIP = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), - randint(1,255),randint(1,255)) + remoteIP = IPv4Address(random.randint(0, 2**32-1)).compressed + return remoteIP def checkSolution(self, request):

1 0

[bridgedb/master] Decrease sleep time in server startup unittest.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 59c8e1ec08e05d0c3225d58df2804ff838b1509a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 16:40:02 2014 +0000 Decrease sleep time in server startup unittest. --- lib/bridgedb/test/test_bridgedb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 3015094..c7aefff 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -95,8 +95,8 @@ 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) + print("Waiting 10 seconds while bridgedb loads...") + time.sleep(10) assignments = pjoin(runDir, 'assignments.log') self.assertTrue(os.path.isfile(assignments)) os.unlink(assignments)

1 0

[bridgedb/master] Fix emacs encoding specifier in lib/bridgedb/captcha.py.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 9f3d9e31a920518522945f354d2ea78e9726a93e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 8 12:28:50 2014 +0000 Fix emacs encoding specifier in lib/bridgedb/captcha.py. * FIXES an non-deterministic, intermittent failure in the `test_captcha.GimpCaptchaTests.test_createChallenge_hmacValid` unittest do to returned HMAC values having different raw bytes depending on the binary representation and the encoding used. --- 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 f993a9d..6bc3661 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- #_____________________________________________________________________________ # # This file is part of BridgeDB, a Tor bridge distribution system.

1 0

[bridgedb/master] Catch gimp CAPTCHA challenge decryption ValueErrors.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit a033b057422772ab01e88e9fae3a04ce554d5e06 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 8 15:18:35 2014 +0000 Catch gimp CAPTCHA challenge decryption ValueErrors. * ADD unittest will raise a ValueError during decryption with the previous commit's code. * ADD exception handling to `captcha.GimpCaptcha.check()` to cover this case. --- lib/bridgedb/captcha.py | 10 +++++++--- lib/bridgedb/test/test_captcha.py | 10 ++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 6ca7629..8f56552 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -203,9 +203,13 @@ class GimpCaptcha(Captcha): return False finally: if validHMAC: - decrypted = secretKey.decrypt(original) - if solution.lower() == decrypted.lower(): - return True + try: + decrypted = secretKey.decrypt(original) + except Exception as error: + logging.warn(error.message) + else: + if solution.lower() == decrypted.lower(): + return True return False def createChallenge(self, answer): diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index 9cc5a89..7a6f2c4 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -321,3 +321,13 @@ class GimpCaptchaTests(unittest.TestCase): self.assertEquals( c.check(challenge, c.answer, c.secretKey, hmacKeyBad), False) + + def test_check_badRSAkey(self): + """A challenge with a bad RSA secret key should return False.""" + secretKeyBad, publicKeyBad = crypto.getRSAKey('test_gimpCaptcha_badRSAkey') + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + self.assertEquals( + c.check(challenge, c.answer, secretKeyBad, c.hmacKey), + False)

1 0