[tor-commits] [bridgedb/develop] Catch error case in HTTPServer where ReCaptcha image is None.

[isis at torproject.org]

commit c47420c63b010ed66d286c8e1bb5665424aec729
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sun Jan 26 02:47:23 2014 +0000

    Catch error case in HTTPServer where ReCaptcha image is None.
---
 lib/bridgedb/HTTPServer.py |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py
index 26bc5ad..9b4c515 100644
--- a/lib/bridgedb/HTTPServer.py
+++ b/lib/bridgedb/HTTPServer.py
@@ -96,6 +96,15 @@ class CaptchaProtectedResource(twisted.web.resource.Resource):
         except Exception as error:
             logging.fatal("Connection to Recaptcha server failed: %s" % error)
 
+        if c.image is None:
+            # TODO: We should have a general "Something went wrong!" page
+            # which displays here, rather than displaying the img alt text
+            # (which says "Upgrade your browser to Firefox"), so that users
+            # don't think the problem is on their end when it's actually a
+            # problem with ReCaptcha or BridgeDB.
+            logging.warn("No CAPTCHA image received from ReCaptcha server!")
+            c.image = ''
+
         # TODO: this does not work for versions of IE < 8.0
         imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(c.image)
         template = lookup.get_template('captcha.html')