From 54ad20c1eaa88e733e4e570d2bbdd40c21816bce Mon Sep 17 00:00:00 2001 From: Isman Firmansyah Date: Sun, 24 Aug 2014 18:57:39 +0700 Subject: [PATCH 1/3] add recaptcha in registration form --- users/default_config.py | 3 +++ users/static/css/user-map.css | 4 ++++ users/static/js/user-map-component.js | 6 ++++++ users/static/js/user-map.js | 19 ++++++++++++++++--- users/templates/html/base.html | 13 +++++++++++++ users/templates/html/user_form.html | 20 ++++++++++++++++++++ users/views.py | 12 ++++++++++++ 7 files changed, 74 insertions(+), 3 deletions(-) diff --git a/users/default_config.py b/users/default_config.py index a47aff1..07e30f9 100644 --- a/users/default_config.py +++ b/users/default_config.py @@ -56,3 +56,6 @@ # http://docs.sqlalchemy.org/en/rel_0_9/core/engines.html # for details. SQLALCHEMY_DATABASE_URI = "postgresql://scott:tiger@localhost:5432/mydatabase" + +RECAPTCHA_PUBLIC_KEY = "" +RECAPTCHA_PRIVATE_KEY = "" diff --git a/users/static/css/user-map.css b/users/static/css/user-map.css index f2b7e71..92cc15d 100644 --- a/users/static/css/user-map.css +++ b/users/static/css/user-map.css @@ -61,3 +61,7 @@ html, body, #map { line-height: 18px; color: #555; } + +#recaptcha_image img { + width: 280px; +} diff --git a/users/static/js/user-map-component.js b/users/static/js/user-map-component.js index df7b36c..0d2e35b 100644 --- a/users/static/js/user-map-component.js +++ b/users/static/js/user-map-component.js @@ -213,6 +213,12 @@ function onMapClick(e) { }; var popup = getUserFormPopup(user, ADD_USER_MODE); marker_new_user.bindPopup(popup).openPopup() + + // activate captcha + var captcha_element = document.getElementById("recaptcha-container"); + if (captcha_element !== null) { + showCaptcha(captcha_element); + } } /** diff --git a/users/static/js/user-map.js b/users/static/js/user-map.js index 9ae783d..b50183e 100644 --- a/users/static/js/user-map.js +++ b/users/static/js/user-map.js @@ -96,6 +96,9 @@ function addUser() { var twitter = $("#twitter").val(); + var recaptcha_response_field = $("#recaptcha_response_field").val(); + var recaptcha_challenge_field = $("#recaptcha_challenge_field").val(); + var is_client_side_valid = validate_user_form(name, email, website); if (is_client_side_valid) { $.ajax({ @@ -108,18 +111,28 @@ function addUser() { email_updates: email_updates, latitude: latitude, longitude: longitude, - twitter: twitter + twitter: twitter, + recaptcha_response_field: recaptcha_response_field, + recaptcha_challenge_field: recaptcha_challenge_field }, success: function (response) { if (response.type.toString() == 'Error') { if (typeof response.name != 'undefined') { $name_input.parent().addClass('has-error'); - $name_input.attr('placeholder', response.name.toString()); + var $name_err = $("#name-error"); + $name_err.text(response.name.toString()); } if (typeof response.email != 'undefined') { $email_input.parent().addClass('has-error'); - $email_input.attr('placeholder', response.email.toString()); + var $email_err = $("#email-error"); + $email_err.text(response.email.toString()); + } + if (typeof response.recaptcha_response_field != 'undefined') { + var $captha_input = $("#recaptcha_response_field"); + $captha_input.parent().addClass('has-error'); + var $captcha_err = $("#captcha-error"); + $captcha_err.text(response.recaptcha_response_field.toString()); } } else { //Clear marker diff --git a/users/templates/html/base.html b/users/templates/html/base.html index 5e127f9..e34d509 100644 --- a/users/templates/html/base.html +++ b/users/templates/html/base.html @@ -25,6 +25,19 @@ + + {% endblock head_resources %} diff --git a/users/templates/html/user_form.html b/users/templates/html/user_form.html index 26956c5..ad0236a 100644 --- a/users/templates/html/user_form.html +++ b/users/templates/html/user_form.html @@ -60,6 +60,26 @@

User Data

+
+
+
+
+
Incorrect please try again
+ + Enter the words above: + Enter the numbers you hear: + + + + +
Get another CAPTCHA
+
Get an audio CAPTCHA
+
Get an image CAPTCHA
+ +
Help
+
+
+
diff --git a/users/views.py b/users/views.py index 407f06a..7c932fb 100644 --- a/users/views.py +++ b/users/views.py @@ -7,6 +7,7 @@ from flask import render_template, Response, request, current_app from werkzeug.exceptions import default_exceptions +from recaptcha.client import captcha # App declared directly in __init__ as per # http://flask.pocoo.org/docs/patterns/packages/#larger-applications @@ -123,6 +124,17 @@ def add_user_view(): if user is not None: message['email'] = 'Email has been registered by other user.' + if not current_app.testing: + captcha_resp = captcha.submit( + request.form.get("recaptcha_challenge_field", ""), + request.form.get("recaptcha_response_field", ""), + current_app.config["RECAPTCHA_PRIVATE_KEY"], + request.remote_addr, + ) + + if not captcha_resp.is_valid: + message["recaptcha_response_field"] = "Captcha is not valid" + # Process data if len(message) != 0: message['type'] = 'Error' From d5bfcea28fc32fde6589fdd2ec0f9417aaae5da8 Mon Sep 17 00:00:00 2001 From: Isman Firmansyah Date: Sun, 24 Aug 2014 19:39:19 +0700 Subject: [PATCH 2/3] show captcha only in registration form, but not in editing mode --- users/templates/html/user_form.html | 3 +++ users/views.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/users/templates/html/user_form.html b/users/templates/html/user_form.html index ad0236a..0734f37 100644 --- a/users/templates/html/user_form.html +++ b/users/templates/html/user_form.html @@ -60,6 +60,8 @@

User Data

+ + {% if not user %}
@@ -80,6 +82,7 @@

User Data

+ {% endif %}
diff --git a/users/views.py b/users/views.py index 7c932fb..a9803f4 100644 --- a/users/views.py +++ b/users/views.py @@ -207,7 +207,7 @@ def edit_user_view(guid): #noinspection PyUnresolvedReferences data_privacy_content = render_template('html/data_privacy.html') #noinspection PyUnresolvedReferences - user_form_template = render_template('html/user_form.html') + user_form_template = render_template('html/user_form.html', user=user) user_menu = dict( edit_user=True, delete_user=True, From 104e6a796aaa7d542a3216b29a36aa85d5baf47a Mon Sep 17 00:00:00 2001 From: Isman Firmansyah Date: Sun, 24 Aug 2014 19:54:26 +0700 Subject: [PATCH 3/3] add recaptcha-client package to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index c571b86..83b5ee5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,7 @@ flask-appconfig==0.9.1 itsdangerous==0.24 nose==1.3.3 pydns==2.3.6 +recaptcha-client==1.0.6 six==1.7.3 validate-email==1.1 wsgiref==0.1.2