fix: Brigadier hate @ it seems, let's fix that

Author: Xephi

authme-core/src/main/java/fr/xephi/authme/command/executable/email/AddEmailCommand.java

@@ -4,6 +4,7 @@
 import fr.xephi.authme.message.MessageKey;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.CommonService;
+import fr.xephi.authme.service.ValidationService;
 import org.bukkit.entity.Player;
 
 import javax.inject.Inject;
@@ -20,13 +21,17 @@ public class AddEmailCommand extends PlayerCommand {
     @Inject
     private CommonService commonService;
 
+    @Inject
+    private ValidationService validationService;
+
     @Override
     public void runCommand(Player player, List<String> arguments) {
         String email = arguments.get(0);
         String emailConfirmation = arguments.get(1);
 
-        if (email.equals(emailConfirmation)) {
-            // Closer inspection of the mail address handled by the async task
+        if (!validationService.validateEmail(email)) {
+            commonService.send(player, MessageKey.INVALID_EMAIL);
+        } else if (email.equals(emailConfirmation)) {
             management.performAddEmail(player, email);
         } else {
             commonService.send(player, MessageKey.CONFIRM_EMAIL_MESSAGE);

authme-core/src/test/java/fr/xephi/authme/command/executable/email/AddEmailCommandTest.java

@@ -8,6 +8,7 @@
 import fr.xephi.authme.message.Messages;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.service.CommonService;
+import fr.xephi.authme.service.ValidationService;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -20,6 +21,7 @@
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
@@ -43,6 +45,9 @@ public class AddEmailCommandTest {
     @Mock
     private Messages messages;
 
+    @Mock
+    private ValidationService validationService;
+
     @Test
     public void shouldRejectNonPlayerSender() {
         // given
@@ -59,7 +64,8 @@ public void shouldRejectNonPlayerSender() {
     public void shouldForwardData() {
         // given
         Player sender = mock(Player.class);
-        String email = "mail@example";
+        String email = "mail@example.com";
+        given(validationService.validateEmail(email)).willReturn(true);
 
         // when
         command.executeCommand(sender, Arrays.asList(email, email));
@@ -68,11 +74,27 @@ public void shouldForwardData() {
         verify(management).performAddEmail(sender, email);
     }
 
+    @Test
+    public void shouldFailForInvalidEmailFormat() {
+        // given
+        Player sender = mock(Player.class);
+        String email = "notanemail";
+        given(validationService.validateEmail(email)).willReturn(false);
+
+        // when
+        command.executeCommand(sender, Arrays.asList(email, email));
+
+        // then
+        verifyNoInteractions(management);
+        verify(commandService).send(sender, MessageKey.INVALID_EMAIL);
+    }
+
     @Test
     public void shouldFailForConfirmationMismatch() {
         // given
         Player sender = mock(Player.class);
         String email = "asdfasdf@example.com";
+        given(validationService.validateEmail(email)).willReturn(true);
 
         // when
         command.executeCommand(sender, Arrays.asList(email, "wrongConf"));

authme-paper-common/src/main/java/fr/xephi/authme/platform/PaperBrigadierCommandRegistrar.java

@@ -1,10 +1,12 @@
 package fr.xephi.authme.platform;
 
+import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.tree.CommandNode;
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.command.CommandArgumentDescription;
 import fr.xephi.authme.command.CommandDescription;
@@ -82,24 +84,43 @@ private LiteralArgumentBuilder<CommandSourceStack> buildLiteralNode(String label
 
     private void addArgumentChain(ArgumentBuilder<CommandSourceStack, ?> parent,
                                   List<CommandArgumentDescription> arguments) {
-        ArgumentBuilder<CommandSourceStack, ?> currentParent = parent;
-        for (int index = 0; index < arguments.size(); ++index) {
+        if (arguments.isEmpty()) {
+            return;
+        }
+        // Build from innermost argument outward: then(ArgumentBuilder) calls build() immediately
+        // in standard Brigadier, so intermediate nodes must have their children set before building.
+        CommandNode<CommandSourceStack> innerChain = null;
+        for (int index = arguments.size() - 1; index >= 0; --index) {
             CommandArgumentDescription argument = arguments.get(index);
             boolean isLastArgument = index == arguments.size() - 1;
-            RequiredArgumentBuilder<CommandSourceStack, String> argumentBuilder =
+            RequiredArgumentBuilder<CommandSourceStack, String> argBuilder =
                 RequiredArgumentBuilder.<CommandSourceStack, String>argument(argument.getName(),
-                    isLastArgument ? StringArgumentType.greedyString() : StringArgumentType.word())
+                    isLastArgument ? StringArgumentType.greedyString() : anyWord())
                     .executes(this::executeInput);
-            currentParent.then(argumentBuilder);
-            currentParent = argumentBuilder;
+            if (innerChain != null) {
+                argBuilder.then(innerChain);
+            }
+            innerChain = argBuilder.build();
         }
+        parent.then(innerChain);
     }
 
     private RequiredArgumentBuilder<CommandSourceStack, String> createFallbackArgument(String name) {
         return RequiredArgumentBuilder.<CommandSourceStack, String>argument(name, StringArgumentType.greedyString())
             .executes(this::executeInput);
     }
 
+    /** Reads any non-whitespace characters — unlike {@code word()}, accepts {@code @}, {@code #}, etc. */
+    private static ArgumentType<String> anyWord() {
+        return reader -> {
+            int start = reader.getCursor();
+            while (reader.canRead() && reader.peek() != ' ') {
+                reader.skip();
+            }
+            return reader.getString().substring(start, reader.getCursor());
+        };
+    }
+
     private int executeInput(CommandContext<CommandSourceStack> context) {
         commandExecutor.apply(context.getSource().getSender(), CommandUtils.splitInput(context.getInput()));
         return COMMAND_SUCCESS;

authme-paper-common/src/test/java/fr/xephi/authme/platform/PaperBrigadierCommandRegistrarTest.java

@@ -100,6 +100,13 @@ public void shouldDelegateExtraArgumentsToExistingHandler() throws Exception {
         assertThat(executedCommands, contains(List.of("login", "password", "extra")));
     }
 
+    @Test
+    public void shouldHandleAtSignInNonLastArgument() throws Exception {
+        dispatcher.execute("authme register test@gmail.com myPassword", sourceStack);
+
+        assertThat(executedCommands, contains(List.of("authme", "register", "test@gmail.com", "myPassword")));
+    }
+
     @Test
     public void shouldRegisterChildAliasesInBrigadierTree() {
         assertThat(dispatcher.getCompletionSuggestions(dispatcher.parse("authme ", sourceStack)).join()