Remove captcha support

It uses reCAPTCHA v1, which hasn't worked since March 2018.

Signed-off-by: Peter Marheine <peter@taricorp.net>

airsonic-main/pom.xml

@@ -323,12 +323,6 @@
             <version>1.1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.tanesha.recaptcha4j</groupId>
-            <artifactId>recaptcha4j</artifactId>
-            <version>0.0.8</version>
-        </dependency>
-
         <dependency>
             <groupId>de.u-mass</groupId>
             <artifactId>lastfm-java</artifactId>

airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java

@@ -1,8 +1,5 @@
 package org.airsonic.player.controller;
 
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaFactory;
-import net.tanesha.recaptcha.ReCaptchaResponse;
 import org.airsonic.player.domain.User;
 import org.airsonic.player.service.SecurityService;
 import org.airsonic.player.service.SettingsService;
@@ -49,21 +46,13 @@ public class RecoverController {
 
         Map<String, Object> map = new HashMap<String, Object>();
         String usernameOrEmail = StringUtils.trimToNull(request.getParameter("usernameOrEmail"));
-        ReCaptcha captcha = ReCaptchaFactory.newSecureReCaptcha("6LcZ3OMSAAAAANkKMdFdaNopWu9iS03V-nLOuoiH",
-                "6LcZ3OMSAAAAAPaFg89mEzs-Ft0fIu7wxfKtkwmQ", false);
-        boolean showCaptcha = true;
 
         if (usernameOrEmail != null) {
 
             map.put("usernameOrEmail", usernameOrEmail);
             User user = getUserByUsernameOrEmail(usernameOrEmail);
-            String challenge = request.getParameter("recaptcha_challenge_field");
-            String uresponse = request.getParameter("recaptcha_response_field");
-            ReCaptchaResponse captchaResponse = captcha.checkAnswer(request.getRemoteAddr(), challenge, uresponse);
 
-            if (!captchaResponse.isValid()) {
+            if (user == null) {
-                map.put("error", "recover.error.invalidcaptcha");
-            } else if (user == null) {
                 map.put("error", "recover.error.usernotfound");
             } else if (user.getEmail() == null) {
                 map.put("error", "recover.error.noemail");
@@ -74,17 +63,12 @@ public class RecoverController {
                     user.setLdapAuthenticated(false);
                     user.setPassword(password);
                     securityService.updateUser(user);
-                    showCaptcha = false;
                 } else {
                     map.put("error", "recover.error.sendfailed");
                 }
             }
         }
 
-        if (showCaptcha) {
-            map.put("captcha", captcha.createRecaptchaHtml(null, null));
-        }
-
         return new ModelAndView("recover", "model", map);
     }
 

airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp

@@ -21,12 +21,6 @@
                 <input name="submit" type="submit" value="<fmt:message key="recover.send"/>">
             </c:if>
 
-            <c:if test="${not empty model.captcha}">
-                <p style="padding-top: 1em">
-                    <c:out value="${model.captcha}" escapeXml="false"/>
-                </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>

repo/net/tanesha/recaptcha4j/recaptcha4j/0.0.8/recaptcha4j-0.0.8.pom

@@ -1,6 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>net.tanesha.recaptcha4j</groupId>
-    <artifactId>recaptcha4j</artifactId>
-    <version>0.0.8</version>
-</project>