You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/11/27 02:36:18 UTC
incubator-usergrid git commit: Fixed recaptcha - USERGRID-257
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 42e27178b -> dd636edad
Fixed recaptcha - USERGRID-257
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dd636eda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dd636eda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dd636eda
Branch: refs/heads/master
Commit: dd636edad8c280483085e7a0166543fa5a207d4e
Parents: 42e2717
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Nov 26 10:33:00 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Nov 26 15:06:14 2014 -0800
----------------------------------------------------------------------
.../rest/management/users/UsersResource.java | 38 ++++++++++++--------
1 file changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dd636eda/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
index 89d5468..144a6de 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
@@ -179,27 +179,37 @@ public class UsersResource extends AbstractContextResource {
return handleViewable( "resetpw_email_form", this );
}
- ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
- reCaptcha.setPrivateKey( properties.getRecaptchaPrivate() );
+ //we don't require recaptcha - only use it if it is present in the props file
+ boolean reCaptchaPassed = false;
+ if ( useReCaptcha() ) {
- ReCaptchaResponse reCaptchaResponse =
- reCaptcha.checkAnswer( httpServletRequest.getRemoteAddr(), challenge, uresponse );
+ ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
+ reCaptcha.setPrivateKey(properties.getRecaptchaPrivate());
- if ( !useReCaptcha() || reCaptchaResponse.isValid() ) {
- user = management.findAdminUser( email );
- if ( user != null ) {
- management.startAdminUserPasswordResetFlow( user );
- return handleViewable( "resetpw_email_success", this );
+ ReCaptchaResponse reCaptchaResponse =
+ reCaptcha.checkAnswer(httpServletRequest.getRemoteAddr(), challenge, uresponse);
+
+ if (reCaptchaResponse.isValid()) {
+ reCaptchaPassed = true;
}
- else {
+ } else {
+ reCaptchaPassed = true;
+ }
+
+ if (reCaptchaPassed) {
+ user = management.findAdminUser(email);
+ if (user != null) {
+ management.startAdminUserPasswordResetFlow(user);
+ return handleViewable("resetpw_email_success", this);
+ } else {
errorMsg = "We don't recognize that email, try again...";
- return handleViewable( "resetpw_email_form", this );
+ return handleViewable("resetpw_email_form", this);
}
- }
- else {
+ } else {
errorMsg = "Incorrect Captcha, try again...";
- return handleViewable( "resetpw_email_form", this );
+ return handleViewable("resetpw_email_form", this);
}
+
}
catch ( RedirectionException e ) {
throw e;