Changeset 7305 for main/waeup.sirp/trunk/src/waeup

Timestamp:

7 Dec 2011, 15:46:35 (13 years ago)

Author:

uli

Message:

Make recaptcha keys instance attributes for better customization.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/browser/captcha.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/captcha.py

@@ -238 +238 @@
 API_SSL_SERVER = "https://www.google.com/recaptcha/api"
 VERIFY_SERVER = "https://www.google.com/recaptcha/api"
-# Do not use the following keys in productive environments!
-# As they are both made publicly available, they are not secure any more!
-# Use them for testing and evaluating only!
-PUBLIC_KEY = "6Lc0y8oSAAAAAHwdojrqPtcKn7Rww5qGprb0rrSk"
-PRIVATE_KEY = "6Lc0y8oSAAAAAMHVbMrGWLLjw2pm8v2Uprwm9AbR"
 
 class ReCaptcha(StaticCaptcha):
+    """ReCaptcha - strong captchas with images, sound, etc.
+
+    This is the SIRP implementation to support captchas as provided by
+    http://www.google.com/recaptcha.
+
+    ReCaptcha is widely used and adopted in web applications
+    """
 
     grok.implements(ICaptcha)
@@ -252 +254 @@
     #: name of challenge field in HTTP request
     chal_field = 'recaptcha_challenge_field'
+
+    # Do not use the following keys in productive environments!  As
+    # they are both made publicly available, they are not secure any
+    # more!  Use them for testing and evaluating only!
+    PUBLIC_KEY = "6Lc0y8oSAAAAAHwdojrqPtcKn7Rww5qGprb0rrSk"
+    PRIVATE_KEY = "6Lc0y8oSAAAAAMHVbMrGWLLjw2pm8v2Uprwm9AbR"
 
     def verify(self, request):
@@ -264 +272 @@
         params = urllib.urlencode(
             {
-                'privatekey': PRIVATE_KEY,
+                'privatekey': self.PRIVATE_KEY,
                 'remoteip': '127.0.0.1',
                 'challenge': challenge,
@@ -308 +316 @@
             u'</noscript>' % {
                 'ApiServer' : API_SSL_SERVER,
-                'PublicKey' : PUBLIC_KEY,
+                'PublicKey' : self.PUBLIC_KEY,
                 'ErrorParam' : error_param,
                 }