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

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

08 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/develop] Fix emacs encoding specifier in lib/bridgedb/captcha.py.
by isis＠torproject.org 08 Apr '14

08 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/develop] Add BridgeDB logo .png and link to homepage in base.html.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 4bc7e9e0bb74580ee82f31884144e06820f2faa4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 10 01:52:53 2014 +0000 Add BridgeDB logo .png and link to homepage in base.html. * FIXES #11346 add homepage link to BridgeDB HTTPS distributor. --- lib/bridgedb/templates/assets/bridgedb.png | Bin 0 -> 2946 bytes lib/bridgedb/templates/base.html | 25 ++++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/bridgedb/templates/assets/bridgedb.png b/lib/bridgedb/templates/assets/bridgedb.png new file mode 100644 index 0000000..3cea47c Binary files /dev/null and b/lib/bridgedb/templates/assets/bridgedb.png differ diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 228078e..51e9f85 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -1,4 +1,4 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <!DOCTYPE html> <html lang="en"> <head> @@ -27,18 +27,17 @@ span { </head> <body> -<div class="container-narrow"> - -<div class="masthead"> - - <ul class="nav nav-pills pull-right"> - <h3 class="muted">BridgeDB</h3> - </ul> - <a href="https://www.torproject.org"><img src="/assets/tor.svg" - height="10%" width="15%"/></a> - -</div> - + <div class="container-narrow"> + <div class="masthead"> + <ul class="nav nav-pills pull-right"> +  + <a href="https://bridges.torproject.org/"><img src="/assets/bridgedb.png" + height="100%" + width="100%" /></a> + </ul> + <a href="https://www.torproject.org"><img src="/assets/tor.svg" + height="10%" width="15%"/></a> + </div> <hr> ${self.body()}

1 0

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

08 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

[bridgedb/develop] Change gimp CAPTCHA encoding strategy to assume HMAC is 20 bytes.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 72c1dcc0fa6cc0a2914e8028193879cc06adb2b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 8 14:16:42 2014 +0000 Change gimp CAPTCHA encoding strategy to assume HMAC is 20 bytes. * CHANGE relevant unittests which looked for the original ';' string delimiter to now split challenge string, taking the first 20 bytes as the HMAC, and the rest as the encrypted blob containing the HMAC answer. * CHANGE `bridgedb.captcha.GimpCaptcha.check()` to always immediately return False whenever any Exception occurs. * ADD eight new unittests for `captcha.GimpCaptcha.check()`. --- lib/bridgedb/captcha.py | 12 +++-- lib/bridgedb/test/test_captcha.py | 94 +++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 6bc3661..6ca7629 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -195,11 +195,12 @@ class GimpCaptcha(Captcha): % (solution, challenge)) try: decoded = urlsafe_b64decode(challenge) - hmac, original = decoded.split(';', 1) + hmac = decoded[:20] + original = decoded[20:] verified = crypto.getHMAC(hmacKey, original) validHMAC = verified == hmac - except Exception as error: - logging.exception(error) + except Exception: + return False finally: if validHMAC: decrypted = secretKey.decrypt(original) @@ -217,7 +218,8 @@ class GimpCaptcha(Captcha): HMAC ";" ENCRYPTED_ANSWER - and lastly base64-encoded (in a URL safe manner). + where the HMAC MUST be the first 20 bytes. Lastly base64-encoded (in a + URL safe manner). :param str answer: The answer to a CAPTCHA. :rtype: str @@ -226,7 +228,7 @@ class GimpCaptcha(Captcha): """ encrypted = self.publicKey.encrypt(answer) hmac = crypto.getHMAC(self.hmacKey, encrypted) - challenge = hmac + ';' + encrypted + challenge = hmac + encrypted encoded = urlsafe_b64encode(challenge) return encoded diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index b2e67b3..9cc5a89 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -153,7 +153,7 @@ class GimpCaptchaTests(unittest.TestCase): self.cacheDir) challenge = c.createChallenge('w00t') decoded = urlsafe_b64decode(challenge) - self.assertTrue(decoded.find(';') >= 1) + self.assertTrue(decoded) def test_createChallenge_hmacValid(self): """The HMAC in createChallenge() return value should be valid.""" @@ -161,7 +161,8 @@ class GimpCaptchaTests(unittest.TestCase): self.cacheDir) challenge = c.createChallenge('ShouldHaveAValidHMAC') decoded = urlsafe_b64decode(challenge) - hmac, orig = decoded.split(';', 1) + hmac = decoded[:20] + orig = decoded[20:] correctHMAC = crypto.getHMAC(self.hmacKey, orig) self.assertEquals(hmac, correctHMAC) @@ -172,7 +173,8 @@ class GimpCaptchaTests(unittest.TestCase): answer = 'ThisAnswerShouldDecryptToThis' challenge = c.createChallenge(answer) decoded = urlsafe_b64decode(challenge) - hmac, orig = decoded.split(';', 1) + hmac = decoded[:20] + orig = decoded[20:] correctHMAC = crypto.getHMAC(self.hmacKey, orig) self.assertEqual(hmac, correctHMAC) decrypted = self.sekrit.decrypt(orig) @@ -232,6 +234,90 @@ class GimpCaptchaTests(unittest.TestCase): c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, self.cacheDir) image, challenge = c.get() + challengeBadB64 = challenge.rstrip('==') + "\x42\x42\x42" self.assertEquals( - c.check(challenge.rstrip('=='), c.answer, c.secretKey, c.hmacKey), + c.check(challenge, c.answer, c.secretKey, c.hmacKey), + True) + self.assertEquals( + c.check(challengeBadB64, c.answer, c.secretKey, c.hmacKey), + False) + + def test_check_caseInsensitive_lowercase(self): + """A correct answer in lowercase characters should return True.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + solution = c.answer.lower() + self.assertEquals( + c.check(challenge, solution, c.secretKey, c.hmacKey), + True) + + def test_check_caseInsensitive_uppercase(self): + """A correct answer in uppercase characters should return True.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + solution = c.answer.upper() + self.assertEquals( + c.check(challenge, solution, c.secretKey, c.hmacKey), + True) + + def test_check_encoding_utf8(self): + """A correct answer in utf-8 lowercase should return True.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + solution = c.answer.encode('utf8') + self.assertEquals( + c.check(challenge, solution, c.secretKey, c.hmacKey), + True) + + def test_check_encoding_ascii(self): + """A correct answer in utf-8 lowercase should return True.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + solution = c.answer.encode('ascii') + self.assertEquals( + c.check(challenge, solution, c.secretKey, c.hmacKey), + True) + + def test_check_encoding_unicode(self): + """A correct answer in utf-8 lowercase should return True.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + solution = unicode(c.answer) + self.assertEquals( + c.check(challenge, solution, c.secretKey, c.hmacKey), + True) + + def test_check_missingHMACbytes(self): + """A challenge that is missing part of the HMAC should return False.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + challengeBadHMAC = challenge[:10] + challenge[20:] + self.assertEquals( + c.check(challengeBadHMAC, c.answer, c.secretKey, c.hmacKey), + False) + + def test_check_missingAnswerbytes(self): + """Partial encrypted answers in challenges should return False.""" + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + challengeBadOrig = challenge[:20] + challenge[30:] + self.assertEquals( + c.check(challengeBadOrig, c.answer, c.secretKey, c.hmacKey), + False) + + def test_check_badHMACkey(self): + """A challenge with a bad HMAC key should return False.""" + hmacKeyBad = crypto.getKey('test_gimpCaptcha_badHMACkey') + c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + self.cacheDir) + image, challenge = c.get() + self.assertEquals( + c.check(challenge, c.answer, c.secretKey, hmacKeyBad), False)

1 0

[bridgedb/develop] Merge branch 'fix/11346-homepage-link' into develop
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 33499da979404bf7772545974fbdaed32e37ef73 Merge: a033b05 4bc7e9e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 8 15:33:39 2014 +0000 Merge branch 'fix/11346-homepage-link' into develop lib/bridgedb/templates/assets/bridgedb.png | Bin 0 -> 2946 bytes lib/bridgedb/templates/base.html | 25 ++++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-)

1 0

[bridgedb/develop] Add file headers and module docstring to bridgedb.Util.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit cc2aab80c9b955ab888b8ee7e7ecae72bd1bd713 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:16:18 2014 +0000 Add file headers and module docstring to bridgedb.Util. --- lib/bridgedb/Util.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/bridgedb/Util.py b/lib/bridgedb/Util.py index e0ce81f..6c70dff 100644 --- a/lib/bridgedb/Util.py +++ b/lib/bridgedb/Util.py @@ -1,3 +1,16 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_Util -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# Matthew Finkel 0x017DD169EA793BE2 <sysrqb(a)torproject.org> +# :copyright: (c) 2013-2014, Isis Lovecruft +# (c) 2013-2014, Matthew Finkel +# (c) 2007-2014, The Tor Project, Inc. +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Common utilities for BridgeDB.""" + safe_logging = True def set_safe_logging(safe):

1 0

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

08 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

[bridgedb/develop] Fix a bug in bridgedb.Bridges due to catching a non-existent exception.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 88e6aeaed8c55362739550561369a50bdddbed33 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 12:06:52 2014 +0000 Fix a bug in bridgedb.Bridges due to catching a non-existent exception. --- 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 14820cc..5c406f6 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -683,7 +683,7 @@ def parseStatusFile(networkstatusFile): elif ID and line.startswith("a "): try: addr, portlist = networkstatus.parseALine(line, toHex(ID)) - except networkstatus.ParseNetstatusError as error: + except networkstatus.NetworkstatusParsingError as error: logging.error(error) else: if (addr is not None) and (portlist is not None):

1 0

[bridgedb/develop] Remove pprinting of configuration changes from bridgedb.Main.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 5957efdaf4b671ffe57133ce340d86bab9e9c87d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 2 14:14:17 2014 +0000 Remove pprinting of configuration changes from bridgedb.Main. They went to stdout, not the logger, and they were annoying. --- lib/bridgedb/Main.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 8a1b650..d21239c 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -16,8 +16,6 @@ import logging import logging.handlers import gettext -from pprint import pprint - from twisted.internet import reactor from bridgedb import crypto @@ -267,8 +265,9 @@ def loadConfig(configFile=None, configCls=None): logging.info("Reloading over in-memory configurations...") if (len(configuration) > 0) and itsSafeToUseLogging: - logging.debug("Old configuration settings:\n%s" - % pprint(configuration, depth=4)) + logging.debug("Old configuration settings:") + logging.debug("\n".join(["{key} = {value}".format(key, value) + for key, value in configuration])) conffile = configFile if (configFile is None) and ('CONFIG_FILE' in configuration):

1 0