Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into explicit-getters-from-db

2017-04-29 08:19:30 +02:00
parent 82d74ca0a7 61c215d337
commit b7c35cb3a7
47 changed files with 786 additions and 306 deletions
@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList;
 import fr.xephi.authme.command.executable.HelpCommand;
 import fr.xephi.authme.command.executable.authme.AccountsCommand;
 import fr.xephi.authme.command.executable.authme.AuthMeCommand;
+import fr.xephi.authme.command.executable.authme.BackupCommand;
 import fr.xephi.authme.command.executable.authme.ChangePasswordAdminCommand;
 import fr.xephi.authme.command.executable.authme.ConverterCommand;
 import fr.xephi.authme.command.executable.authme.FirstSpawnCommand;
@@ -39,8 +40,8 @@ import fr.xephi.authme.command.executable.logout.LogoutCommand;
 import fr.xephi.authme.command.executable.register.RegisterCommand;
 import fr.xephi.authme.command.executable.unregister.UnregisterCommand;
 import fr.xephi.authme.permission.AdminPermission;
+import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.PlayerPermission;
-import fr.xephi.authme.permission.PlayerStatePermission;

 import java.util.Arrays;
 import java.util.Collection;
@@ -226,13 +227,23 @@ public class CommandInitializer {
            .parent(AUTHME_BASE)
            .labels("purge", "delete")
            .description("Purge old data")
-            .detailedDescription("Purge old AuthMeReloaded data longer than the specified amount of days ago.")
+            .detailedDescription("Purge old AuthMeReloaded data longer than the specified number of days ago.")
            .withArgument("days", "Number of days", false)
            .withArgument("all", "Add 'all' at the end to also purge players with lastlogin = 0", true)
            .permission(AdminPermission.PURGE)
            .executableCommand(PurgeCommand.class)
            .register();

+        // Backup command
+        CommandDescription.builder()
+            .parent(AUTHME_BASE)
+            .labels("backup")
+            .description("Perform a backup")
+            .detailedDescription("Creates a backup of the registered users.")
+            .permission(AdminPermission.BACKUP)
+            .executableCommand(BackupCommand.class)
+            .register();
+
        // Register the purgelastposition command
        CommandDescription.builder()
            .parent(AUTHME_BASE)
@@ -312,10 +323,9 @@ public class CommandInitializer {
            .description("Debug features")
            .detailedDescription("Allows various operations for debugging.")
            .withArgument("child", "The child to execute", true)
-            .withArgument(".", "meaning varies", true)
-            .withArgument(".", "meaning varies", true)
-            .withArgument(".", "meaning varies", true)
-            .permission(PlayerStatePermission.DEBUG_COMMAND)
+            .withArgument("arg", "argument (depends on debug section)", true)
+            .withArgument("arg", "argument (depends on debug section)", true)
+            .permission(DebugSectionPermissions.DEBUG_COMMAND)
            .executableCommand(DebugCommand.class)
            .register();

@@ -0,0 +1,23 @@
+package fr.xephi.authme.command.executable.authme;
+
+import fr.xephi.authme.command.ExecutableCommand;
+import fr.xephi.authme.service.BackupService;
+import fr.xephi.authme.service.BackupService.BackupCause;
+import org.bukkit.command.CommandSender;
+
+import javax.inject.Inject;
+import java.util.List;
+
+/**
+ * Command to perform a backup.
+ */
+public class BackupCommand implements ExecutableCommand {
+
+    @Inject
+    private BackupService backupService;
+
+    @Override
+    public void executeCommand(CommandSender sender, List<String> arguments) {
+        backupService.doBackup(BackupCause.COMMAND, sender);
+    }
+}
@@ -2,6 +2,8 @@ package fr.xephi.authme.command.executable.authme.debug;

 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.service.GeoIpService;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.settings.properties.ProtectionSettings;
@@ -54,6 +56,11 @@ class CountryLookup implements DebugSection {
        }
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.COUNTRY_LOOKUP;
+    }
+
    private void outputInfoForIpAddr(CommandSender sender, String ipAddr) {
        sender.sendMessage("IP '" + ipAddr + "' maps to country '" + geoIpService.getCountryCode(ipAddr)
            + "' (" + geoIpService.getCountryName(ipAddr) + ")");
@@ -8,6 +8,8 @@ import fr.xephi.authme.initialization.HasCleanup;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.initialization.SettingsDependent;
 import fr.xephi.authme.initialization.factory.SingletonStore;
+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import org.bukkit.command.CommandSender;

 import javax.inject.Inject;
@@ -52,6 +54,11 @@ class DataStatistics implements DebugSection {
        outputInjectorStats(sender);
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.DATA_STATISTICS;
+    }
+
    private void outputDatabaseStats(CommandSender sender) {
        sender.sendMessage("Total players in DB: " + dataSource.getAccountsRegistered());
        if (dataSource instanceof CacheDataSource) {
@@ -3,6 +3,8 @@ package fr.xephi.authme.command.executable.authme.debug;
 import com.google.common.collect.ImmutableSet;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.initialization.factory.Factory;
+import fr.xephi.authme.permission.PermissionsManager;
+import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

 import javax.inject.Inject;
@@ -24,27 +26,48 @@ public class DebugCommand implements ExecutableCommand {
    @Inject
    private Factory<DebugSection> debugSectionFactory;

+    @Inject
+    private PermissionsManager permissionsManager;
+
    private Map<String, DebugSection> sections;

    @Override
    public void executeCommand(CommandSender sender, List<String> arguments) {
-        DebugSection debugSection = getDebugSection(arguments);
+        DebugSection debugSection = findDebugSection(arguments);
        if (debugSection == null) {
-            sender.sendMessage("Available sections:");
-            getSections().values()
-                .forEach(e -> sender.sendMessage("- " + e.getName() + ": " + e.getDescription()));
+            sendAvailableSections(sender);
        } else {
-            debugSection.execute(sender, arguments.subList(1, arguments.size()));
+            executeSection(debugSection, sender, arguments);
        }
    }

-    private DebugSection getDebugSection(List<String> arguments) {
+    private DebugSection findDebugSection(List<String> arguments) {
        if (arguments.isEmpty()) {
            return null;
        }
        return getSections().get(arguments.get(0).toLowerCase());
    }

+    private void sendAvailableSections(CommandSender sender) {
+        sender.sendMessage("Sections available to you:");
+        long availableSections = getSections().values().stream()
+            .filter(section -> permissionsManager.hasPermission(sender, section.getRequiredPermission()))
+            .peek(e -> sender.sendMessage("- " + e.getName() + ": " + e.getDescription()))
+            .count();
+
+        if (availableSections == 0) {
+            sender.sendMessage(ChatColor.RED + "You don't have permission to view any debug section");
+        }
+    }
+
+    private void executeSection(DebugSection section, CommandSender sender, List<String> arguments) {
+        if (permissionsManager.hasPermission(sender, section.getRequiredPermission())) {
+            section.execute(sender, arguments.subList(1, arguments.size()));
+        } else {
+            sender.sendMessage(ChatColor.RED + "You don't have permission for this section. See /authme debug");
+        }
+    }
+
    // Lazy getter
    private Map<String, DebugSection> getSections() {
        if (sections == null) {
@@ -1,5 +1,6 @@
 package fr.xephi.authme.command.executable.authme.debug;

+import fr.xephi.authme.permission.PermissionNode;
 import org.bukkit.command.CommandSender;

 import java.util.List;
@@ -27,4 +28,9 @@ interface DebugSection {
     */
    void execute(CommandSender sender, List<String> arguments);

+    /**
+     * @return permission required to run this section
+     */
+    PermissionNode getRequiredPermission();
+
 }
@@ -2,6 +2,7 @@ package fr.xephi.authme.command.executable.authme.debug;

 import com.google.common.collect.ImmutableList;
 import fr.xephi.authme.permission.AdminPermission;
+import fr.xephi.authme.permission.DebugSectionPermissions;
 import fr.xephi.authme.permission.DefaultPermission;
 import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.permission.PermissionsManager;
@@ -25,8 +26,8 @@ import java.util.function.BiFunction;
 */
 class HasPermissionChecker implements DebugSection {

-    static final List<Class<? extends PermissionNode>> PERMISSION_NODE_CLASSES =
-        ImmutableList.of(AdminPermission.class, PlayerPermission.class, PlayerStatePermission.class);
+    static final List<Class<? extends PermissionNode>> PERMISSION_NODE_CLASSES = ImmutableList.of(
+        AdminPermission.class, PlayerPermission.class, PlayerStatePermission.class, DebugSectionPermissions.class);

    @Inject
    private PermissionsManager permissionsManager;
@@ -69,6 +70,11 @@ class HasPermissionChecker implements DebugSection {
        }
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.HAS_PERMISSION_CHECK;
+    }
+
    /**
     * Performs a permission check and informs the given sender of the result. {@code permissionChecker} is the
     * permission check to perform with the given {@code node} and the {@code player}.
@@ -90,7 +96,6 @@ class HasPermissionChecker implements DebugSection {
            sender.sendMessage(ChatColor.DARK_RED + "Check failed: player '" + player.getName()
                + "' does NOT have permission '" + node + "'");
        }
-
    }

    /**
@@ -3,6 +3,8 @@ package fr.xephi.authme.command.executable.authme.debug;
 import fr.xephi.authme.listener.FailedVerificationException;
 import fr.xephi.authme.listener.OnJoinVerifier;
 import fr.xephi.authme.message.Messages;
+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.service.ValidationService;
 import fr.xephi.authme.service.ValidationService.ValidationResult;
 import org.bukkit.ChatColor;
@@ -60,6 +62,11 @@ class InputValidator implements DebugSection {
        }
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.INPUT_VALIDATOR;
+    }
+
    private void displayUsageHint(CommandSender sender) {
        sender.sendMessage("You can define forbidden emails and passwords in your config.yml");
        sender.sendMessage("This command allows you to test some of the values:");
@@ -3,6 +3,8 @@ package fr.xephi.authme.command.executable.authme.debug;
 import fr.xephi.authme.data.limbo.LimboPlayer;
 import fr.xephi.authme.data.limbo.LimboService;
 import fr.xephi.authme.data.limbo.persistence.LimboPersistence;
+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.service.BukkitService;
 import org.bukkit.ChatColor;
@@ -71,6 +73,11 @@ class LimboPlayerViewer implements DebugSection {
            .sendEntry("Group", LimboPlayer::getGroup, permissionsManager::getPrimaryGroup);
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.LIMBO_PLAYER_VIEWER;
+    }
+
    /**
     * Displays the info for the given LimboPlayer and Player to the provided CommandSender.
     */
@@ -1,5 +1,7 @@
 package fr.xephi.authme.command.executable.authme.debug;

+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.permission.PermissionsManager;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -38,4 +40,9 @@ class PermissionGroups implements DebugSection {
            sender.sendMessage("Primary group is: " + permissionsManager.getGroups(player));
        }
    }
+
+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.PERM_GROUPS;
+    }
 }
@@ -2,6 +2,8 @@ package fr.xephi.authme.command.executable.authme.debug;

 import fr.xephi.authme.data.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.security.crypts.HashedPassword;
 import fr.xephi.authme.util.StringUtils;
 import org.bukkit.ChatColor;
@@ -50,6 +52,11 @@ class PlayerAuthViewer implements DebugSection {
        }
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.PLAYER_AUTH_VIEWER;
+    }
+
    /**
     * Outputs the PlayerAuth information to the given sender.
     *
@@ -1,5 +1,7 @@
 package fr.xephi.authme.command.executable.authme.debug;

+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.SpawnLoader;
@@ -49,6 +51,11 @@ class SpawnLocationViewer implements DebugSection {
        }
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.SPAWN_LOCATION;
+    }
+
    private void showGeneralInfo(CommandSender sender) {
        sender.sendMessage("Spawn priority: "
            + String.join(", ", settings.getProperty(RestrictionSettings.SPAWN_PRIORITY)));
@@ -4,6 +4,8 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.datasource.DataSourceResult;
 import fr.xephi.authme.mail.SendMailSsl;
+import fr.xephi.authme.permission.DebugSectionPermissions;
+import fr.xephi.authme.permission.PermissionNode;
 import fr.xephi.authme.util.StringUtils;
 import fr.xephi.authme.util.Utils;
 import org.apache.commons.mail.EmailException;
@@ -61,6 +63,11 @@ class TestEmailSender implements DebugSection {
        }
    }

+    @Override
+    public PermissionNode getRequiredPermission() {
+        return DebugSectionPermissions.TEST_EMAIL;
+    }
+
    private String getEmail(CommandSender sender, List<String> arguments) {
        if (arguments.isEmpty()) {
            DataSourceResult<String> emailResult = dataSource.getEmail(sender.getName());