#930 Create registration captcha manager

- Introduce registration captcha manager, rename login captcha manager accordingly
- Integrate reg. captcha manager into /register command

Open points:
- Refactor common captcha functionality into abstract superclass
- If captcha before /register necessary, show appropriate message to player immediately
- Unit tests

src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java

@@ -1,7 +1,8 @@
 package fr.xephi.authme.command.executable.captcha;
 
 import fr.xephi.authme.command.PlayerCommand;
-import fr.xephi.authme.data.CaptchaManager;
+import fr.xephi.authme.data.LoginCaptchaManager;
+import fr.xephi.authme.data.RegistrationCaptchaManager;
 import fr.xephi.authme.data.auth.PlayerCache;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.message.MessageKey;
@@ -17,7 +18,10 @@ public class CaptchaCommand extends PlayerCommand {
     private PlayerCache playerCache;
 
     @Inject
-    private CaptchaManager captchaManager;
+    private LoginCaptchaManager loginCaptchaManager;
+
+    @Inject
+    private RegistrationCaptchaManager registrationCaptchaManager;
 
     @Inject
     private CommonService commonService;
@@ -27,25 +31,40 @@ public class CaptchaCommand extends PlayerCommand {
 
     @Override
     public void runCommand(Player player, List<String> arguments) {
-        final String playerName = player.getName().toLowerCase();
+        final String name = player.getName();
 
-        if (playerCache.isAuthenticated(playerName)) {
+        if (playerCache.isAuthenticated(name)) {
             commonService.send(player, MessageKey.ALREADY_LOGGED_IN_ERROR);
-        } else if (!captchaManager.isCaptchaRequired(playerName)) {
-            commonService.send(player, MessageKey.USAGE_LOGIN);
+        } else if (loginCaptchaManager.isCaptchaRequired(name)) {
+            checkLoginCaptcha(player, arguments.get(0));
+        } else if (registrationCaptchaManager.isCaptchaRequired(name)) {
+            checkRegisterCaptcha(player, arguments.get(0));
         } else {
-            checkCaptcha(player, arguments.get(0));
+            MessageKey errorMessage = playerCache.isAuthenticated(name)
+                ? MessageKey.ALREADY_LOGGED_IN_ERROR : MessageKey.USAGE_LOGIN;
+            commonService.send(player, errorMessage);
         }
     }
 
-    private void checkCaptcha(Player player, String captchaCode) {
-        final boolean isCorrectCode = captchaManager.checkCode(player.getName(), captchaCode);
+    private void checkLoginCaptcha(Player player, String captchaCode) {
+        final boolean isCorrectCode = loginCaptchaManager.checkCode(player.getName(), captchaCode);
         if (isCorrectCode) {
             commonService.send(player, MessageKey.CAPTCHA_SUCCESS);
             commonService.send(player, MessageKey.LOGIN_MESSAGE);
             limboService.unmuteMessageTask(player);
         } else {
-            String newCode = captchaManager.generateCode(player.getName());
+            String newCode = loginCaptchaManager.generateCode(player.getName());
+            commonService.send(player, MessageKey.CAPTCHA_WRONG_ERROR, newCode);
+        }
+    }
+
+    private void checkRegisterCaptcha(Player player, String captchaCode) {
+        final boolean isCorrectCode = registrationCaptchaManager.checkCode(player.getName(), captchaCode);
+        if (isCorrectCode) {
+            commonService.send(player, MessageKey.CAPTCHA_SUCCESS);
+            commonService.send(player, MessageKey.REGISTER_MESSAGE);
+        } else {
+            String newCode = registrationCaptchaManager.generateCode(player.getName());
             commonService.send(player, MessageKey.CAPTCHA_WRONG_ERROR, newCode);
         }
     }

src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java

@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.register;
 
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.data.RegistrationCaptchaManager;
 import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.process.Management;
@@ -45,8 +46,15 @@ public class RegisterCommand extends PlayerCommand {
     @Inject
     private ValidationService validationService;
 
+    @Inject
+    private RegistrationCaptchaManager registrationCaptchaManager;
+
     @Override
     public void runCommand(Player player, List<String> arguments) {
+        if (!isCaptchaFulfilled(player)) {
+            return; // isCaptchaFulfilled handles informing the player on failure
+        }
+
         if (commonService.getProperty(SecuritySettings.PASSWORD_HASH) == HashAlgorithm.TWO_FACTOR) {
             //for two factor auth we don't need to check the usage
             management.performRegister(RegistrationMethod.TWO_FACTOR_REGISTRATION,
@@ -74,7 +82,16 @@ public class RegisterCommand extends PlayerCommand {
 
     @Override
     public MessageKey getArgumentsMismatchMessage() {
-        return MessageKey.USAGE_LOGIN;
+        return MessageKey.USAGE_REGISTER;
+    }
+
+    private boolean isCaptchaFulfilled(Player player) {
+        if (registrationCaptchaManager.isCaptchaRequired(player.getName())) {
+            String code = registrationCaptchaManager.getCaptchaCodeOrGenerateNew(player.getName());
+            commonService.send(player, MessageKey.CAPTCHA_FOR_REGISTRATION_REQUIRED, code);
+            return false;
+        }
+        return true;
     }
 
     private void handlePasswordRegistration(Player player, List<String> arguments) {