#1141 Rough version of TOTP commands to add and remove a code for a player

src/main/java/fr/xephi/authme/command/CommandInitializer.java

@@ -40,6 +40,10 @@ import fr.xephi.authme.command.executable.email.ShowEmailCommand;
 import fr.xephi.authme.command.executable.login.LoginCommand;
 import fr.xephi.authme.command.executable.logout.LogoutCommand;
 import fr.xephi.authme.command.executable.register.RegisterCommand;
+import fr.xephi.authme.command.executable.totp.AddTotpCommand;
+import fr.xephi.authme.command.executable.totp.ConfirmTotpCommand;
+import fr.xephi.authme.command.executable.totp.RemoveTotpCommand;
+import fr.xephi.authme.command.executable.totp.TotpBaseCommand;
 import fr.xephi.authme.command.executable.unregister.UnregisterCommand;
 import fr.xephi.authme.command.executable.verification.VerificationCommand;
 import fr.xephi.authme.permission.AdminPermission;
@@ -134,6 +138,9 @@ public class CommandInitializer {
             .executableCommand(ChangePasswordCommand.class)
             .register();
 
+        // Create totp base command
+        CommandDescription totpBase = buildTotpBaseCommand();
+
         // Register the base captcha command
         CommandDescription captchaBase = CommandDescription.builder()
             .parent(null)
@@ -156,16 +163,8 @@ public class CommandInitializer {
             .executableCommand(VerificationCommand.class)
             .register();
 
-        List<CommandDescription> baseCommands = ImmutableList.of(
-            authMeBase,
-            emailBase,
-            loginBase,
-            logoutBase,
-            registerBase,
-            unregisterBase,
-            changePasswordBase,
-            captchaBase,
-            verificationBase);
+        List<CommandDescription> baseCommands = ImmutableList.of(authMeBase, emailBase, loginBase, logoutBase,
+            registerBase, unregisterBase, changePasswordBase, totpBase, captchaBase, verificationBase);
 
         setHelpOnAllBases(baseCommands);
         commands = baseCommands;
@@ -543,6 +542,56 @@ public class CommandInitializer {
         return emailBase;
     }
 
+    /**
+     * Creates a command description object for {@code /totp} including its children.
+     *
+     * @return the totp base command description
+     */
+    private CommandDescription buildTotpBaseCommand() {
+        // Register the base totp command
+        CommandDescription totpBase = CommandDescription.builder()
+            .parent(null)
+            .labels("totp", "2fa")
+            .description("TOTP commands")
+            .detailedDescription("Performs actions related to two-factor authentication.")
+            .executableCommand(TotpBaseCommand.class)
+            .register();
+
+        // Register totp add
+        CommandDescription.builder()
+            .parent(totpBase)
+            .labels("add")
+            .description("Enables TOTP")
+            .detailedDescription("Enables two-factor authentication for your account.")
+            .permission(PlayerPermission.TOGGLE_TOTP_STATUS)
+            .executableCommand(AddTotpCommand.class)
+            .register();
+
+        // Register totp confirm
+        CommandDescription.builder()
+            .parent(totpBase)
+            .labels("confirm")
+            .description("Enables TOTP after successful code")
+            .detailedDescription("Saves the generated TOTP secret after confirmation.")
+            .withArgument("code", "Code from the given secret from /totp add", false)
+            .permission(PlayerPermission.TOGGLE_TOTP_STATUS)
+            .executableCommand(ConfirmTotpCommand.class)
+            .register();
+
+        // Register totp remove
+        CommandDescription.builder()
+            .parent(totpBase)
+            .labels("remove")
+            .description("Removes TOTP")
+            .detailedDescription("Disables two-factor authentication for your account.")
+            .withArgument("code", "Current 2FA code", false)
+            .permission(PlayerPermission.TOGGLE_TOTP_STATUS)
+            .executableCommand(RemoveTotpCommand.class)
+            .register();
+
+        return totpBase;
+    }
+
     /**
      * Sets the help command on all base commands, e.g. to register /authme help or /register help.
      *

src/main/java/fr/xephi/authme/command/executable/totp/AddTotpCommand.java

@@ -0,0 +1,41 @@
+package fr.xephi.authme.command.executable.totp;
+
+import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.data.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.security.TotpService;
+import fr.xephi.authme.security.TotpService.TotpGenerationResult;
+import fr.xephi.authme.service.CommonService;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import javax.inject.Inject;
+import java.util.List;
+
+/**
+ * Command for a player to enable TOTP.
+ */
+public class AddTotpCommand extends PlayerCommand {
+
+    @Inject
+    private TotpService totpService;
+
+    @Inject
+    private DataSource dataSource;
+
+    @Inject
+    private CommonService commonService;
+
+    @Override
+    protected void runCommand(Player player, List<String> arguments) {
+        PlayerAuth auth = dataSource.getAuth(player.getName());
+        if (auth.getTotpKey() == null) {
+            TotpGenerationResult createdTotpInfo = totpService.generateTotpKey(player);
+            commonService.send(player, MessageKey.TWO_FACTOR_CREATE,
+                createdTotpInfo.getTotpKey(), createdTotpInfo.getAuthenticatorQrCodeUrl());
+        } else {
+            player.sendMessage(ChatColor.RED + "Two-factor authentication is already enabled for your account!");
+        }
+    }
+}

src/main/java/fr/xephi/authme/command/executable/totp/ConfirmTotpCommand.java

@@ -0,0 +1,39 @@
+package fr.xephi.authme.command.executable.totp;
+
+import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.security.TotpService;
+import org.bukkit.entity.Player;
+
+import javax.inject.Inject;
+import java.util.List;
+
+/**
+ * Command to enable TOTP by supplying the proper code as confirmation.
+ */
+public class ConfirmTotpCommand extends PlayerCommand {
+
+    @Inject
+    private TotpService totpService;
+
+    @Inject
+    private DataSource dataSource;
+
+    @Override
+    protected void runCommand(Player player, List<String> arguments) {
+        // TODO #1141: Check if player already has TOTP
+
+        final String totpKey = totpService.retrieveGeneratedSecret(player);
+        if (totpKey == null) {
+            player.sendMessage("No TOTP key has been generated for you or it has expired. Please run /totp add");
+        } else {
+            boolean isTotpCodeValid = totpService.confirmCodeForGeneratedTotpKey(player, arguments.get(0));
+            if (isTotpCodeValid) {
+                dataSource.setTotpKey(player.getName(), totpKey);
+                player.sendMessage("Successfully enabled two-factor authentication for your account");
+            } else {
+                player.sendMessage("Wrong code or code has expired. Please use /totp add again");
+            }
+        }
+    }
+}

src/main/java/fr/xephi/authme/command/executable/totp/RemoveTotpCommand.java

@@ -0,0 +1,37 @@
+package fr.xephi.authme.command.executable.totp;
+
+import fr.xephi.authme.command.PlayerCommand;
+import fr.xephi.authme.data.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.security.TotpService;
+import org.bukkit.entity.Player;
+
+import javax.inject.Inject;
+import java.util.List;
+
+/**
+ * Command for a player to remove 2FA authentication.
+ */
+public class RemoveTotpCommand extends PlayerCommand {
+
+    @Inject
+    private DataSource dataSource;
+
+    @Inject
+    private TotpService totpService;
+
+    @Override
+    protected void runCommand(Player player, List<String> arguments) {
+        PlayerAuth auth = dataSource.getAuth(player.getName());
+        if (auth.getTotpKey() == null) {
+            player.sendMessage("Two-factor authentication is not enabled for your account!");
+        } else {
+            if (totpService.verifyCode(auth, arguments.get(0))) {
+                dataSource.removeTotpKey(auth.getNickname());
+                player.sendMessage("Successfully removed two-factor authentication from your account");
+            } else {
+                player.sendMessage("Invalid code!");
+            }
+        }
+    }
+}

src/main/java/fr/xephi/authme/command/executable/totp/TotpBaseCommand.java

@@ -0,0 +1,29 @@
+package fr.xephi.authme.command.executable.totp;
+
+import fr.xephi.authme.command.CommandMapper;
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.command.FoundCommandResult;
+import fr.xephi.authme.command.help.HelpProvider;
+import org.bukkit.command.CommandSender;
+
+import javax.inject.Inject;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Base command for /totp.
+ */
+public class TotpBaseCommand implements ExecutableCommand {
+
+    @Inject
+    private CommandMapper commandMapper;
+
+    @Inject
+    private HelpProvider helpProvider;
+
+    @Override
+    public void executeCommand(CommandSender sender, List<String> arguments) {
+        FoundCommandResult result = commandMapper.mapPartsToCommand(sender, Collections.singletonList("totp"));
+        helpProvider.outputHelp(sender, result, HelpProvider.SHOW_CHILDREN);
+    }
+}