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

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

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

19 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/master] Merge branch 'fix/11346-homepage-link' into develop
by isis＠torproject.org 19 Apr '14

19 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] Merge branch 'release-0.2.0'
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 10dd8522d76dbb020438fc59ca50fe71830aecdf Merge: f266f32 073d5c8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:57:44 2014 +0000 Merge branch 'release-0.2.0' .travis.yml | 2 +- CHANGELOG | 269 +++++++---- bridgedb.conf | 24 +- doc/sphinx/source/bridgedb.Util.rst | 6 +- doc/sphinx/source/bridgedb.captcha.rst | 2 + doc/sphinx/source/bridgedb.rst | 5 +- doc/sphinx/source/bridgedb.safelog.rst | 9 + doc/sphinx/source/bridgedb.txrecaptcha.rst | 9 + doc/sphinx/source/conf.py | 5 +- doc/sphinx/source/gen_bridge_descriptors.rst | 7 - lib/bridgedb/Bridges.py | 93 ++-- lib/bridgedb/Bucket.py | 104 ++--- lib/bridgedb/Dist.py | 271 ++++------- lib/bridgedb/EmailServer.py | 476 +++++++++----------- lib/bridgedb/HTTPServer.py | 183 +++----- lib/bridgedb/I18n.py | 6 +- lib/bridgedb/Main.py | 280 ++++++------ lib/bridgedb/Stability.py | 204 ++++----- lib/bridgedb/Storage.py | 158 ++++++- lib/bridgedb/Tests.py | 13 +- lib/bridgedb/Util.py | 12 - lib/bridgedb/__init__.py | 2 - lib/bridgedb/_langs.py | 2 + lib/bridgedb/captcha.py | 24 +- lib/bridgedb/crypto.py | 179 ++++++++ lib/bridgedb/parse/addr.py | 185 +++++++- lib/bridgedb/runner.py | 19 +- lib/bridgedb/safelog.py | 197 ++++++++ lib/bridgedb/templates/assets/bootstrap.min.css | 9 - lib/bridgedb/templates/assets/bridgedb.png | Bin 0 -> 2946 bytes .../templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/templates/assets/css/custom.css | 122 +++++ .../templates/assets/css/font-awesome-ie7.min.css | 384 ++++++++++++++++ .../templates/assets/css/font-awesome.min.css | 403 +++++++++++++++++ lib/bridgedb/templates/assets/css/main.css | 24 + lib/bridgedb/templates/assets/custom.css | 104 ----- .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++++++++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 ++++ lib/bridgedb/templates/base.html | 76 ++-- lib/bridgedb/templates/bridges.html | 89 +++- lib/bridgedb/templates/captcha.html | 71 ++- lib/bridgedb/templates/howto.html | 47 ++ lib/bridgedb/templates/index.html | 33 +- lib/bridgedb/templates/options.html | 198 ++++++-- lib/bridgedb/templates/static/bridgedb.asc | 274 +++++++++++ lib/bridgedb/test/test_EmailServer.py | 250 +++++++++- lib/bridgedb/test/test_HTTPServer.py | 104 +++-- lib/bridgedb/test/test_Storage.py | 56 +++ lib/bridgedb/test/test_bridgedb.py | 41 +- lib/bridgedb/test/test_captcha.py | 104 ++++- lib/bridgedb/test/test_safelog.py | 336 ++++++++++++++ lib/bridgedb/test/test_translations.py | 78 ++++ lib/bridgedb/translations.py | 122 +++++ lib/bridgedb/util.py | 207 +++++++++ setup.py | 10 +- 61 files changed, 5050 insertions(+), 1339 deletions(-)

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit b76a543f82f364c7fa2b343cbbeba35fd66a666c Merge: 073d5c8 10dd852 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:59:32 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit eb5abdcb75e94f87013a8a865a3f5978dd30c660 Merge: 24dc8dc f266f32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 26 05:46:59 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Add bridgedb.conf settings from bridgedb-admin repo.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 87451679860c3e1561a61d309c5c894a54d00dc2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 28 06:43:36 2014 +0000 Add bridgedb.conf settings from bridgedb-admin repo. --- bridgedb.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bridgedb.conf b/bridgedb.conf index 1eb3037..006f715 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,15 +15,21 @@ # for details. # :copyright: (c) 2007-2013 The Tor Project, Inc. # (c) 2007-2013, all sentient entities within the AUTHORS file -# :version: 0.0.5 +# :version: 0.0.6 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.6 - 2014-03-28 +# * CHANGE gimp-captchas to be the norm. +# * ADD bucket for support team. +# # Changes in version 0.0.5 - 2014-02-27 # * ADD GIMP_CAPTCHA_ENABLED, GIMP_CAPTCHA_DIR, GIMP_CAPTCHA_HMAC_KEYFILE, # and GIMP_CAPTCHA_RSA_KEYFILE settings (see #10809). # * Decrease email share. +# * Whitelist the public IP address of bridges.torproject.org in +# RECAPTCHA_REMOTE_IP setting. # # Changes in version 0.0.4 - 2014-01-24 # * ADD COLLECT_TIMESTAMPS option (see #10724). Set it to False for the

1 0

[bridgedb/develop] Actually, let's call it 0.2.0. Threading and UI changed enough, right?
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 073d5c895477fd6985e51013167de636adc10868 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:50:40 2014 +0000 Actually, let's call it 0.2.0. Threading and UI changed enough, right? --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 1db9dc5..f640282 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Changes in version 0.1.7 - +Changes in version 0.2.0 - 2014-04-19 * FIXES #5232 Perform long running and blocking transactions in background threads. Primarily this moves bridge descriptor reparsing into another thread, which significantly increases

1 0

[bridgedb/develop] Merge branch 'hotfix/10803-bridge-lines-newlines' into develop
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 8535f4d3f2739dc26080d00d20e2048cd0336bd0 Merge: 45d6eff 4ea93b1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:37:36 2014 +0000 Merge branch 'hotfix/10803-bridge-lines-newlines' into develop lib/bridgedb/templates/assets/css/custom.css | 18 ++++++++++++++++++ lib/bridgedb/templates/bridges.html | 5 +---- lib/bridgedb/test/test_HTTPServer.py | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-)

1 0

[bridgedb/develop] Fix word wrapping/newlines in div containing bridge lines.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 437542f408c1a11d78cf8d90452d0b88b18a8576 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 04:32:50 2014 +0000 Fix word wrapping/newlines in div containing bridge lines. --- lib/bridgedb/templates/assets/css/custom.css | 18 ++++++++++++++++++ lib/bridgedb/templates/bridges.html | 5 +---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/templates/assets/css/custom.css b/lib/bridgedb/templates/assets/css/custom.css index a0dbdf0..3fd1065 100644 --- a/lib/bridgedb/templates/assets/css/custom.css +++ b/lib/bridgedb/templates/assets/css/custom.css @@ -102,3 +102,21 @@ margin-top: 2px; .bdb_span7 { width: 560px } + +div.bridge-lines { + padding: 20px; + margin: 0px 0px 20px; + min-height: 20px; + font-family: Monaco,Menlo,Consolas,"Courier New",monospace; + font-size: 95%; + line-height: 175%; + color: rgb(44, 62, 80); + word-break: break-all; + word-wrap: break-word; + white-space: pre-wrap; + background-color: rgb(236, 240, 241); + border: 1px solid transparent; + border-radius: 6px 6px 6px 6px; + box-shadow: none; + -moz-box-sizing: border-box; +} \ No newline at end of file diff --git a/lib/bridgedb/templates/bridges.html b/lib/bridgedb/templates/bridges.html index f8e5a0e..a118404 100644 --- a/lib/bridgedb/templates/bridges.html +++ b/lib/bridgedb/templates/bridges.html @@ -12,11 +12,8 @@ % if answer: <div class="container-fluid" style="width: 98%; align: center; margin: auto;"> <div class="container-fluid" style="padding: 1px"> -<div class="well well-lg"> -<p style="font-family: Menlo,Monaco,Consolas,monospace; - font-size: 95%;"> +<div class="bridge-lines"> ${answer} -</p> </div> </div> </div>

1 0