From 1b833003fbf1e890b33e536663b09893e7a1f7f5 Mon Sep 17 00:00:00 2001
From: Peter Marheine <peter@taricorp.net>
Date: Tue, 7 Aug 2018 14:09:34 +1000
Subject: [PATCH] Bring back an optional reCAPTCHA v2

Only showing it in the recovery view, not yet validating the result.

Signed-off-by: Peter Marheine <peter@taricorp.net>
---
 .../org/airsonic/player/controller/RecoverController.java  | 4 ++++
 airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp      | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
index 63b2a6d8..2c98c397 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
@@ -69,6 +69,10 @@ public class RecoverController {
             }
         }
 
+        if (settingsService.isCaptchaEnabled()) {
+            map.put("recaptchaSiteKey", settingsService.getRecaptchaSiteKey());
+        }
+
         return new ModelAndView("recover", "model", map);
     }
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
index 3ee0b042..ff26a610 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
@@ -21,6 +21,13 @@
                 <input name="submit" type="submit" value="<fmt:message key="recover.send"/>">
             </c:if>
 
+            <c:if test="${not empty model.recaptchaSiteKey and empty model.sentTo}">
+                <p style="padding-top: 1em">
+                    <script src="https://www.google.com/recaptcha/api.js" async defer></script>
+                    <div class="g-recaptcha" data-sitekey="${model.recaptchaSiteKey}"></div>
+                </p>
+            </c:if>
+
             <c:if test="${not empty model.sentTo}">
                 <p style="padding-top: 1em"><fmt:message key="recover.success"><fmt:param value="${model.sentTo}"/></fmt:message></p>
             </c:if>