Added try/except to recaptcha response verification

CityOfNewYork · Sep 19, 2023 · 05828c1 · 05828c1
1 parent c070b49
commit 05828c1
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 21 deletions.
diff --git a/app/main/views.py b/app/main/views.py
@@ -48,14 +48,19 @@ def status():
 def technical_support():
     if request.method == 'POST':
         if current_app.config['RECAPTCHA_ENABLED']:
-            # Verify recaptcha token and return error if failed
-            recaptcha_response = requests.post(
-                url='https://www.google.com/recaptcha/api/siteverify?secret={}&response={}'
-                    .format(current_app.config["RECAPTCHA_PRIVATE_KEY"],
-                            request.form["g-recaptcha-response"])).json()
-
-            if recaptcha_response['success'] is False or recaptcha_response['score'] < current_app.config[
-                "RECAPTCHA_THRESHOLD"]:
+            try:
+                # Verify recaptcha token and return error if failed
+                recaptcha_response = requests.post(
+                    url='https://www.google.com/recaptcha/api/siteverify?secret={}&response={}'
+                        .format(current_app.config["RECAPTCHA_PRIVATE_KEY"],
+                                request.form["g-recaptcha-response"])).json()
+
+                if recaptcha_response['success'] is False or recaptcha_response['score'] < current_app.config[
+                    "RECAPTCHA_THRESHOLD"]:
+                    flash('Recaptcha failed, please try again.', category='danger')
+                    render_template('main/contact.html')
+            except:
+                current_app.logger.exception("Recaptcha failed to get a response.")
                 flash('Recaptcha failed, please try again.', category='danger')
                 render_template('main/contact.html')
 

diff --git a/app/request/views.py b/app/request/views.py
@@ -99,14 +99,26 @@ def new():
 
     if flask_request.method == "POST":
         if current_app.config['RECAPTCHA_ENABLED']:
-            # Verify recaptcha token and return error if failed
-            recaptcha_response = requests.post(
-                url='https://www.google.com/recaptcha/api/siteverify?secret={}&response={}'
-                    .format(current_app.config["RECAPTCHA_PRIVATE_KEY"],
-                            request.form["g-recaptcha-response"])).json()
-
-            if recaptcha_response['success'] is False or recaptcha_response['score'] < current_app.config[
-                "RECAPTCHA_THRESHOLD"]:
+            try:
+                # Verify recaptcha token and return error if failed
+                recaptcha_response = requests.post(
+                    url='https://www.google.com/recaptcha/api/siteverify?secret={}&response={}'
+                        .format(current_app.config["RECAPTCHA_PRIVATE_KEY"],
+                                flask_request.form["g-recaptcha-response"])).json()
+
+                if recaptcha_response['success'] is False or recaptcha_response['score'] < current_app.config[
+                    "RECAPTCHA_THRESHOLD"]:
+                    flash('Recaptcha failed, please try again.', category='danger')
+                    return render_template(
+                        new_request_template,
+                        form=form,
+                        kiosk_mode=kiosk_mode,
+                        category=category,
+                        agency=agency,
+                        title=title,
+                    )
+            except:
+                current_app.logger.exception("Recaptcha failed to get a response.")
                 flash('Recaptcha failed, please try again.', category='danger')
                 return render_template(
                     new_request_template,

diff --git a/app/templates/main/contact.html b/app/templates/main/contact.html
@@ -34,16 +34,17 @@ <h1 class="text-center">Technical Support</h1>
 
                 <br>
                 {% if config['RECAPTCHA_ENABLED'] %}
-                    <input id="submit"
-                           class="g-recaptcha"
-                           value="Send"
-                           aria-label="Submit button"
+                    <input id="send"
+                           name="send"
                            type="submit"
+                           value="Send"
+                           aria-label="Send button"
+                           class="g-recaptcha"
                            data-sitekey='{{ config['RECAPTCHA_PUBLIC_KEY'] }}'
                            data-callback='onSubmitTechnicalSupport'
                            data-action='technicalSupport'>
                 {% else %}
-                    <input id="submit" name="submit" type="submit" value="Send" aria-label="Submit button">
+                    <input id="send" name="send" type="submit" value="Send" aria-label="Send button">
                 {% endif %}
             </form>
         </div>