Changeset 25725

Timestamp:

2012-05-31T13:56:53+12:00 (12 years ago)

Author:

sjm84

Message:

An attempt at fixing the registration problem for systems behind a firewall that does not let them access google services

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/Authentication.java

@@ -412 +412 @@
             newPassword = hashPassword(newPassword);
 
-            if (_recaptchaPrivateKey != null)
+            if (_recaptchaPrivateKey != null && _recaptchaPrivateKey.length() > 0)
             {
                 ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
                 reCaptcha.setPrivateKey(_recaptchaPrivateKey);
 
-                String challenge = (String) paramMap.get("recaptcha_challenge_field");
-                String uResponse = (String) paramMap.get("recaptcha_response_field");
-
-                if (challenge == null || uResponse == null)
-                {
-                    serviceNode.setAttribute("operation", REGISTER);
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_MISSING));
-                    return result;
-                }
-
-                ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), challenge, uResponse);
-
-                if (!reCaptchaResponse.isValid())
-                {
-                    serviceNode.setAttribute("operation", REGISTER);
-                    GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_DOES_NOT_MATCH));
-                    return result;
+                try
+                {
+                    //If this line throws an exception then we'll assume the user has problems with their firewall
+                    reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), "", "");
+
+                    String challenge = (String) paramMap.get("recaptcha_challenge_field");
+                    String uResponse = (String) paramMap.get("recaptcha_response_field");
+
+                    if (challenge == null || uResponse == null)
+                    {
+                        serviceNode.setAttribute("operation", REGISTER);
+                        GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_MISSING));
+                        return result;
+                    }
+
+                    ReCaptchaResponse reCaptchaResponse = reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), challenge, uResponse);
+
+                    if (!reCaptchaResponse.isValid())
+                    {
+                        serviceNode.setAttribute("operation", REGISTER);
+                        GSXML.addError(this.doc, result, _errorMessageMap.get(ERROR_CAPTCHA_DOES_NOT_MATCH));
+                        return result;
+                    }
+                }
+                catch (Exception ex)
+                {
                 }
             }
@@ -637 +646 @@
         else if (op.equals(REGISTER))
         {
-            try
-            {
-                ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
-                reCaptcha.setPrivateKey(_recaptchaPrivateKey);
-                reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), "", "");
-            }
-            catch(Exception ex)
-            {
-                return result;
+            if (_recaptchaPrivateKey != null && _recaptchaPrivateKey.length() > 0)
+            {
+                try
+                {
+                    ReCaptchaImpl reCaptcha = new ReCaptchaImpl();
+                    reCaptcha.setPrivateKey(_recaptchaPrivateKey);
+                    reCaptcha.checkAnswer(request.getAttribute("remoteAddress"), "", "");
+                }
+                catch (Exception ex)
+                {
+                    return result;
+                }
             }