Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into delay-commands-event

src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java

@@ -10,6 +10,7 @@ import fr.xephi.authme.output.LogLevel;
 import fr.xephi.authme.process.register.RegisterSecondaryArgument;
 import fr.xephi.authme.process.register.RegistrationType;
 import fr.xephi.authme.security.HashAlgorithm;
+import fr.xephi.authme.settings.properties.DatabaseSettings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
@@ -74,6 +75,7 @@ public class SettingsMigrationService extends PlainMigrationService {
             | convertToRegistrationType(resource)
             | mergeAndMovePermissionGroupSettings(resource)
             | moveDeprecatedHashAlgorithmIntoLegacySection(resource)
+            | moveSaltColumnConfigWithOtherColumnConfigs(resource)
             || hasDeprecatedProperties(resource);
     }
 
@@ -313,6 +315,18 @@ public class SettingsMigrationService extends PlainMigrationService {
         return false;
     }
 
+    /**
+     * Moves the property for the password salt column name to the same path as all other column name properties.
+     *
+     * @param resource The property resource
+     * @return True if the configuration has changed, false otherwise
+     */
+    private static boolean moveSaltColumnConfigWithOtherColumnConfigs(PropertyResource resource) {
+        Property<String> oldProperty = newProperty("ExternalBoardOptions.mySQLColumnSalt",
+            DatabaseSettings.MYSQL_COL_SALT.getDefaultValue());
+        return moveProperty(oldProperty, DatabaseSettings.MYSQL_COL_SALT, resource);
+    }
+
     /**
      * Retrieves the old config to run a command when alt accounts are detected and sets them to this instance
      * for further processing.

src/main/java/fr/xephi/authme/settings/SettingsWarner.java

@@ -4,12 +4,15 @@ import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.crypts.Argon2;
+import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.settings.properties.EmailSettings;
+import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
 
 import javax.inject.Inject;
+import java.util.Optional;
 
 /**
  * Logs warning messages in cases where the configured values suggest a misconfiguration.
@@ -26,6 +29,9 @@ public class SettingsWarner {
     @Inject
     private AuthMe authMe;
 
+    @Inject
+    private BukkitService bukkitService;
+
     SettingsWarner() {
     }
 
@@ -50,6 +56,14 @@ public class SettingsWarner {
             ConsoleLogger.warning("Warning: Session timeout needs to be positive in order to work!");
         }
 
+        // Warn if spigot.yml has settings.bungeecord set to true but config.yml has Hooks.bungeecord set to false
+        if (isTrue(bukkitService.isBungeeCordConfiguredForSpigot())
+            && !settings.getProperty(HooksSettings.BUNGEECORD)) {
+            ConsoleLogger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in"
+                + " bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the"
+                + " AuthMeBungee add-on to work properly you have to enable this option!");
+        }
+
         // Check if argon2 library is present and can be loaded
         if (settings.getProperty(SecuritySettings.PASSWORD_HASH).equals(HashAlgorithm.ARGON2)
             && !Argon2.isLibraryLoaded()) {
@@ -58,4 +72,8 @@ public class SettingsWarner {
             authMe.stopOrUnload();
         }
     }
+
+    private static boolean isTrue(Optional<Boolean> value) {
+        return value.isPresent() && value.get();
+    }
 }

src/main/java/fr/xephi/authme/settings/SpawnLoader.java

@@ -198,9 +198,11 @@ public class SpawnLoader implements Reloadable {
                     // ignore
             }
             if (spawnLoc != null) {
+                ConsoleLogger.debug("Spawn location determined as `{0}` for world `{1}`", spawnLoc, world.getName());
                 return spawnLoc;
             }
         }
+        ConsoleLogger.debug("Fall back to default world spawn location. World: `{0}`", world.getName());
         return world.getSpawnLocation(); // return default location
     }
 

src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java

@@ -1,11 +1,11 @@
 package fr.xephi.authme.settings.commandconfig;
 
 import ch.jalu.configme.SettingsManager;
-import ch.jalu.configme.resource.YamlFileResource;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.Reloadable;
 import fr.xephi.authme.service.BukkitService;
 import fr.xephi.authme.service.GeoIpService;
+import fr.xephi.authme.service.yaml.YamlFileResourceProvider;
 import fr.xephi.authme.util.FileUtils;
 import fr.xephi.authme.util.PlayerUtils;
 import fr.xephi.authme.util.lazytags.Tag;
@@ -151,7 +151,7 @@ public class CommandManager implements Reloadable {
         FileUtils.copyFileFromResource(file, "commands.yml");
 
         SettingsManager settingsManager = new SettingsManager(
-            new YamlFileResource(file), commandMigrationService, CommandSettingsHolder.class);
+            YamlFileResourceProvider.loadFromFile(file), commandMigrationService, CommandSettingsHolder.class);
         CommandConfig commandConfig = settingsManager.getProperty(CommandSettingsHolder.COMMANDS);
         onJoinCommands = newReplacer(commandConfig.getOnJoin());
         onLoginCommands = newOnLoginCmdReplacer(commandConfig.getOnLogin());

src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java

@@ -65,7 +65,7 @@ public final class DatabaseSettings implements SettingsHolder {
 
     @Comment("Column for storing players passwords salts")
     public static final Property<String> MYSQL_COL_SALT =
-        newProperty("ExternalBoardOptions.mySQLColumnSalt", "");
+        newProperty("DataSource.mySQLColumnSalt", "");
 
     @Comment("Column for storing players emails")
     public static final Property<String> MYSQL_COL_EMAIL =
@@ -79,6 +79,10 @@ public final class DatabaseSettings implements SettingsHolder {
     public static final Property<String> MYSQL_COL_HASSESSION =
         newProperty("DataSource.mySQLColumnHasSession", "hasSession");
 
+    @Comment("Column for storing a player's TOTP key (for two-factor authentication)")
+    public static final Property<String> MYSQL_COL_TOTP_KEY =
+        newProperty("DataSource.mySQLtotpKey", "totp");
+
     @Comment("Column for storing the player's last IP")
     public static final Property<String> MYSQL_COL_LAST_IP =
         newProperty("DataSource.mySQLColumnIp", "ip");

src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java

@@ -22,7 +22,7 @@ public final class ProtectionSettings implements SettingsHolder {
 
     @Comment({
         "Countries allowed to join the server and register. For country codes, see",
-        "http://dev.maxmind.com/geoip/legacy/codes/iso3166/",
+        "https://dev.maxmind.com/geoip/legacy/codes/iso3166/",
         "PLEASE USE QUOTES!"})
     public static final Property<List<String>> COUNTRIES_WHITELIST =
         newListProperty("Protection.countries", "US", "GB");
@@ -55,6 +55,10 @@ public final class ProtectionSettings implements SettingsHolder {
     public static final Property<Integer> ANTIBOT_DELAY =
         newProperty("Protection.antiBotDelay", 60);
 
+    @Comment("Kicks the player that issued a command before the defined time after the join process")
+    public static final Property<Integer> QUICK_COMMANDS_DENIED_BEFORE_MILLISECONDS =
+        newProperty("Protection.quickCommands.denyCommandsBeforeMilliseconds", 1000);
+
     private ProtectionSettings() {
     }
 

src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java

@@ -26,7 +26,7 @@ public final class RestrictionSettings implements SettingsHolder {
     @Comment("Allowed commands for unauthenticated players")
     public static final Property<List<String>> ALLOW_COMMANDS =
         newLowercaseListProperty("settings.restrictions.allowCommands",
-            "/login", "/register", "/l", "/reg", "/email", "/captcha");
+            "/login", "/register", "/l", "/reg", "/email", "/captcha", "/2fa", "/totp");
 
     @Comment({
         "Max number of allowed registrations per IP",