Changeset 3615 in products

Timestamp:

Jan 17, 2013 10:34:10 AM (11 years ago)

Author:

kroman0

Message:

Fixed ValueError? on validation

File:

• quintagroup.captcha.core/trunk/quintagroup/captcha/core/skins/captcha_core/static/captcha_validator.vpy (modified) (4 diffs)

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

@@ -6 +6 @@
 from DateTime import DateTime
 
+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':
     return  state
@@ -12 +18 @@
 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 @@
 date = parsed_key['date']
 
-img = getattr(context, '%s.jpg' % index)
+try:
+    img = getattr(context, '%s.jpg' % index)
+except AttributeError:
+    return set_error()
 solution = img.title
 enc = encrypt1(test_key)
@@ -24 +36 @@
 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)