#358 Replace usage of static PasswordSecurity methods

- Replace static methods to instance methods
- Use PlayerAuth builder instead of constructor

src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -138,17 +138,18 @@ public class AsynchronousLogin {
 
         String hash = pAuth.getHash();
         String email = pAuth.getEmail();
-        boolean passwordVerified = true;
-        if (!forceLogin)
-            try {
-                passwordVerified = PasswordSecurity.comparePasswordWithHash(password, hash, realName);
-            } catch (Exception ex) {
-                ConsoleLogger.showError(ex.getMessage());
-                m.send(player, MessageKey.ERROR);
-                return;
-            }
+        boolean passwordVerified = forceLogin || plugin.getPasswordSecurity().comparePassword(password, hash, realName);
+
         if (passwordVerified && player.isOnline()) {
-            PlayerAuth auth = new PlayerAuth(name, hash, getIP(), new Date().getTime(), email, realName);
+            PlayerAuth auth = PlayerAuth.builder()
+                .name(name)
+                .realName(realName)
+                .ip(getIP())
+                .lastLogin(new Date().getTime())
+                .email(email)
+                .hash(hash)
+                .salt(pAuth.getSalt())
+                .build();
             database.updateSession(auth);
 
             if (Settings.useCaptcha) {

src/main/java/fr/xephi/authme/process/register/AsyncRegister.java

@@ -8,7 +8,7 @@ import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.permission.PlayerPermission;
-import fr.xephi.authme.security.PasswordSecurity;
+import fr.xephi.authme.security.crypts.HashResult;
 import fr.xephi.authme.settings.Settings;
 import org.bukkit.entity.Player;
 
@@ -44,7 +44,10 @@ public class AsyncRegister {
         } else if (!Settings.isRegistrationEnabled) {
             m.send(player, MessageKey.REGISTRATION_DISABLED);
             return false;
-        } else if (passLow.contains("delete") || passLow.contains("where") || passLow.contains("insert") || passLow.contains("modify") || passLow.contains("from") || passLow.contains("select") || passLow.contains(";") || passLow.contains("null") || !passLow.matches(Settings.getPassRegex)) {
+        } else if (passLow.contains("delete") || passLow.contains("where") || passLow.contains("insert")
+            || passLow.contains("modify") || passLow.contains("from") || passLow.contains("select")
+            || passLow.contains(";") || passLow.contains("null") || !passLow.matches(Settings.getPassRegex)) {
+            // TODO #308: Remove check for SQL keywords
             m.send(player, MessageKey.PASSWORD_MATCH_ERROR);
             return false;
         } else if (passLow.equalsIgnoreCase(player.getName())) {
@@ -87,26 +90,25 @@ public class AsyncRegister {
         }
     }
 
-    private void emailRegister() throws Exception {
+    private void emailRegister() {
         if (Settings.getmaxRegPerEmail > 0
             && !plugin.getPermissionsManager().hasPermission(player, PlayerPermission.ALLOW_MULTIPLE_ACCOUNTS)
             && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
             m.send(player, MessageKey.MAX_REGISTER_EXCEEDED);
             return;
         }
-        final String hashNew = PasswordSecurity.getHash(Settings.getPasswordHash, password, name);
-        final String salt = PasswordSecurity.userSalt.get(name);
+        final HashResult hashResult = plugin.getPasswordSecurity().computeHash(password, name);
         PlayerAuth auth = PlayerAuth.builder()
             .name(name)
             .realName(player.getName())
-            .hash(hashNew)
+            .hash(hashResult.getHash())
+            .salt(hashResult.getSalt())
             .ip(ip)
             .locWorld(player.getLocation().getWorld().getName())
             .locX(player.getLocation().getX())
             .locY(player.getLocation().getY())
             .locZ(player.getLocation().getZ())
             .email(email)
-            .salt(salt != null ? salt : "")
             .build();
 
         if (!database.saveAuth(auth)) {
@@ -122,18 +124,17 @@ public class AsyncRegister {
     }
 
     private void passwordRegister() throws Exception {
-        final String hashNew = PasswordSecurity.getHash(Settings.getPasswordHash, password, name);
-        final String salt = PasswordSecurity.userSalt.get(name);
+        final HashResult hashResult = plugin.getPasswordSecurity().computeHash(password, name);
         PlayerAuth auth = PlayerAuth.builder()
             .name(name)
             .realName(player.getName())
-            .hash(hashNew)
+            .hash(hashResult.getHash())
+            .salt(hashResult.getSalt())
             .ip(ip)
             .locWorld(player.getLocation().getWorld().getName())
             .locX(player.getLocation().getX())
             .locY(player.getLocation().getY())
             .locZ(player.getLocation().getZ())
-            .salt(salt != null ? salt : "")
             .build();
 
         if (!database.saveAuth(auth)) {

src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java

@@ -62,55 +62,52 @@ public class AsynchronousUnregister {
     }
 
     public void process() {
-        try {
-            if (force || PasswordSecurity.comparePasswordWithHash(password, PlayerCache.getInstance().getAuth(name).getHash(), player.getName())) {
-                if (!plugin.database.removeAuth(name)) {
-                    m.send(player, MessageKey.ERROR);
-                    return;
+        if (force || plugin.getPasswordSecurity().comparePassword(password, PlayerCache.getInstance().getAuth(name).getHash(), player.getName())) {
+            if (!plugin.database.removeAuth(name)) {
+                m.send(player, MessageKey.ERROR);
+                return;
+            }
+            int timeOut = Settings.getRegistrationTimeout * 20;
+            if (Settings.isForcedRegistrationEnabled) {
+                Utils.teleportToSpawn(player);
+                player.saveData();
+                PlayerCache.getInstance().removePlayer(player.getName().toLowerCase());
+                if (!Settings.getRegisteredGroup.isEmpty()) {
+                    Utils.setGroup(player, GroupType.UNREGISTERED);
                 }
-                int timeOut = Settings.getRegistrationTimeout * 20;
-                if (Settings.isForcedRegistrationEnabled) {
-                    Utils.teleportToSpawn(player);
-                    player.saveData();
-                    PlayerCache.getInstance().removePlayer(player.getName().toLowerCase());
-                    if (!Settings.getRegisteredGroup.isEmpty()) {
-                        Utils.setGroup(player, GroupType.UNREGISTERED);
-                    }
-                    LimboCache.getInstance().addLimboPlayer(player);
-                    LimboPlayer limboPlayer = LimboCache.getInstance().getLimboPlayer(name);
-                    int interval = Settings.getWarnMessageInterval;
-                    BukkitScheduler scheduler = plugin.getServer().getScheduler();
-                    if (timeOut != 0) {
-                        BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin,
-                            new TimeoutTask(plugin, name, player), timeOut);
-                        limboPlayer.setTimeoutTaskId(id);
-                    }
-                    limboPlayer.setMessageTaskId(scheduler.runTaskAsynchronously(plugin,
-                            new MessageTask(plugin, name, m.retrieve(MessageKey.REGISTER_MESSAGE), interval)));
-                    m.send(player, MessageKey.UNREGISTERED_SUCCESS);
-                    ConsoleLogger.info(player.getDisplayName() + " unregistered himself");
-                    return;
-                }
-                if (!Settings.unRegisteredGroup.isEmpty()) {
-                    Utils.setGroup(player, Utils.GroupType.UNREGISTERED);
-                }
-                PlayerCache.getInstance().removePlayer(name);
-                // check if Player cache File Exist and delete it, preventing
-                // duplication of items
-                if (playerCache.doesCacheExist(player)) {
-                    playerCache.removeCache(player);
-                }
-                // Apply blind effect
-                if (Settings.applyBlindEffect) {
-                    player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeOut, 2));
+                LimboCache.getInstance().addLimboPlayer(player);
+                LimboPlayer limboPlayer = LimboCache.getInstance().getLimboPlayer(name);
+                int interval = Settings.getWarnMessageInterval;
+                BukkitScheduler scheduler = plugin.getServer().getScheduler();
+                if (timeOut != 0) {
+                    BukkitTask id = scheduler.runTaskLaterAsynchronously(plugin,
+                        new TimeoutTask(plugin, name, player), timeOut);
+                    limboPlayer.setTimeoutTaskId(id);
                 }
+                limboPlayer.setMessageTaskId(scheduler.runTaskAsynchronously(plugin,
+                        new MessageTask(plugin, name, m.retrieve(MessageKey.REGISTER_MESSAGE), interval)));
                 m.send(player, MessageKey.UNREGISTERED_SUCCESS);
                 ConsoleLogger.info(player.getDisplayName() + " unregistered himself");
-                Utils.teleportToSpawn(player);
-            } else {
-                m.send(player, MessageKey.WRONG_PASSWORD);
+                return;
             }
-        } catch (NoSuchAlgorithmException ignored) {
+            if (!Settings.unRegisteredGroup.isEmpty()) {
+                Utils.setGroup(player, Utils.GroupType.UNREGISTERED);
+            }
+            PlayerCache.getInstance().removePlayer(name);
+            // check if Player cache File Exist and delete it, preventing
+            // duplication of items
+            if (playerCache.doesCacheExist(player)) {
+                playerCache.removeCache(player);
+            }
+            // Apply blind effect
+            if (Settings.applyBlindEffect) {
+                player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeOut, 2));
+            }
+            m.send(player, MessageKey.UNREGISTERED_SUCCESS);
+            ConsoleLogger.info(player.getDisplayName() + " unregistered himself");
+            Utils.teleportToSpawn(player);
+        } else {
+            m.send(player, MessageKey.WRONG_PASSWORD);
         }
     }
 }