Avoid NPE if parameter is missing

Refs #48
iamthechad · Nov 11, 2015 · 92a817d · 92a817d
1 parent e468291
commit 92a817d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/grails-app/services/com/megatome/grails/RecaptchaService.groovy b/grails-app/services/com/megatome/grails/RecaptchaService.groovy
@@ -144,7 +144,7 @@ class RecaptchaService {
             return true
         }
 
-        def success = getRecaptchaInstance().checkAnswer(remoteAddress, params["g-recaptcha-response"].trim())
+        def success = getRecaptchaInstance().checkAnswer(remoteAddress, params["g-recaptcha-response"]?.trim())
         session["recaptcha_error"] = success ? null : true
         return success
     }

diff --git a/test/unit/com/megatome/grails/RecaptchaServiceTests.groovy b/test/unit/com/megatome/grails/RecaptchaServiceTests.groovy
@@ -199,6 +199,16 @@ class RecaptchaServiceTests extends Specification {
         service.verifyAnswer([:], "127.0.0.1", [:])
     }
 
+    // Address issue #48
+    void "Avoid NPE when g-recaptcha-response parameter is missing"() {
+        setup:
+        config.recaptcha.publicKey = "ABC"
+        config.recaptcha.privateKey = "123"
+
+        expect:
+        !service.verifyAnswer([:], "127.0.0.1", [:])
+    }
+
     void "test verify answer true"() {
         setup:
         config.recaptcha.publicKey = "ABC"