Changeset 7297

Timestamp:

7 Dec 2011, 05:51:08 (13 years ago)

Author:

uli

Message:

Change verify interface for captchas: expect HTTP requests instead of
CaptchaRequest? instances.

File:

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

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

@@ -65 +65 @@
 class ICaptcha(Interface):
 
-    def verify(request_data):
-        """Verify data entered in a request.
-
-        Expects some ICaptchaRequest object and returns an
+    def verify(request):
+        """Verify data entered in an HTTP request.
+
+        Expects some IHTTPRequest object and returns an
         ICaptchaResponse indicating that the solution was correct or
         not.
@@ -173 +173 @@
     grok.implements(ICaptcha)
 
-    def verify(self, captcha_request):
+    def verify(self, request):
         return CaptchaResponse(True, None)
 
@@ -191 +191 @@
     grok.implements(ICaptcha)
 
+    #: name of solution field in HTTP request
+    sol_field = 'solution'
+    #: name of challenge field in HTTP request
+    chal_field = 'challenge'
+
     def verify(self, request):
-        if request.solution == request.challenge and request.solution:
+        form = getattr(request, 'form', {})
+        solution=form.get(self.sol_field, None)
+        challenge=form.get(self.chal_field, None)
+        if solution == challenge and solution:
             return CaptchaResponse(is_valid=True)
         return CaptchaResponse(is_valid=False)