Changeset 3618 in products

Timestamp:

Feb 11, 2013 11:12:59 AM (11 years ago)

Author:

kroman0

Message:

Fixed errors on validation

Location:

quintagroup.captcha.core/trunk

Files:

• docs/HISTORY.txt (modified) (1 diff)
• quintagroup/captcha/core/skins/captcha_core/dynamic/captcha_validator.vpy (modified) (3 diffs)
• quintagroup/captcha/core/skins/captcha_core/static/getCaptchaImage.py (modified) (1 diff)
• setup.py (modified) (1 diff)

quintagroup.captcha.core/trunk/docs/HISTORY.txt

@@ -1 +1 @@
 Changelog
 =========
+
+0.4.1 - (2013-02-11)
+------------------
+
+* Fixed ValueError on validation for dynamic captcha [kroman0]
+
+* Fixed AttributeError on validation [kroman0]
 
 0.4 - (2013-01-17)

quintagroup.captcha.core/trunk/quintagroup/captcha/core/skins/captcha_core/dynamic/captcha_validator.vpy

@@ -4 +4 @@
 from DateTime import DateTime
 from Products.CMFCore.utils import getToolByName
+
+def set_error():
+    message = _(u"Please re-enter validation code.")
+    context.plone_utils.addPortalMessage(message, 'error')
+    state.setError('key', message, 'key_required')
+    return state.set(status="failure")
 
 if state.getStatus()=='failure':
@@ -11 +17 @@
 test_key = request.get('key', '')
 hashkey = request.get('hashkey', '')
-decrypted_key = decrypt(context.captcha_key, hashkey)
+try:
+    decrypted_key = decrypt(context.captcha_key, hashkey)
+except:
+    return set_error()
 parsed_key = parseKey(decrypted_key)
 
@@ -18 +27 @@
 
 enc = test_key
-solution = getWord(int(index))
+try:
+    solution = getWord(int(index))
+except AttributeError:
+    return set_error()
 captcha_tool = getToolByName(context, 'portal_captchas')
 if (enc != solution) or (captcha_tool.has_key(decrypted_key)) \
     or (DateTime().timeTime() - float(date)>3600):
-    message = _(u"Please re-enter validation code.")
-    context.plone_utils.addPortalMessage(message, 'error')
-    state.setError('key', message, 'key_required')
-    return state.set(status="failure")
+    return set_error() 
 else:
     captcha_tool.addExpiredKey(decrypted_key)

quintagroup.captcha.core/trunk/quintagroup/captcha/core/skins/captcha_core/static/getCaptchaImage.py

@@ -10 +10 @@
     getWord, parseKey
 
-hk = context.REQUEST.traverse_subpath[0]
-dk = decrypt(context.captcha_key, hk)
+try:
+    hk = context.REQUEST.traverse_subpath[0]
+except IndexError:
+    return
+try:
+    dk = decrypt(context.captcha_key, hk)
+except:
+    return
 key = parseKey(dk)['key']
-img = getattr(context, '%s.jpg' % key)
+try:
+    img = getattr(context, '%s.jpg' % key)
+except AttributeError:
+    return
 return img.index_html(context.REQUEST, context.REQUEST.RESPONSE)

quintagroup.captcha.core/trunk/setup.py

@@ -2 +2 @@
 import os
 
-version = '0.4'
+version = '0.4.1'
 
 setup(name='quintagroup.captcha.core',