diff --git a/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java b/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java index 7dcf137c3..f7d9dc2ca 100644 --- a/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java +++ b/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java @@ -203,8 +203,7 @@ private Long getLastLoginMillis(String playerName) { * @return true if player is registered, false otherwise */ public boolean isRegistered(String playerName) { - String player = playerName.toLowerCase(); - return dataSource.isAuthAvailable(player); + return dataSource.isAuthAvailable(playerName); } /** @@ -227,13 +226,12 @@ public boolean checkPassword(String playerName, String passwordToCheck) { * @return true if the player was registered successfully */ public boolean registerPlayer(String playerName, String password) { - String name = playerName.toLowerCase(); - if (isRegistered(name)) { + if (isRegistered(playerName)) { return false; } - HashedPassword result = passwordSecurity.computeHash(password, name); + HashedPassword result = passwordSecurity.computeHash(password, playerName); PlayerAuth auth = PlayerAuth.builder() - .name(name) + .name(playerName) .password(result) .realName(playerName) .registrationDate(System.currentTimeMillis()) diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java index 9f24592f3..50320f8f1 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java @@ -46,26 +46,23 @@ public void run() { } }); } else { - bukkitService.runTaskAsynchronously(new Runnable() { - @Override - public void run() { - PlayerAuth auth = dataSource.getAuth(playerName.toLowerCase()); - if (auth == null) { - commonService.send(sender, MessageKey.UNKNOWN_USER); - return; - } else if (auth.getLastIp() == null) { - sender.sendMessage("No known last IP address for player"); - return; - } + bukkitService.runTaskAsynchronously(() -> { + PlayerAuth auth = dataSource.getAuth(playerName); + if (auth == null) { + commonService.send(sender, MessageKey.UNKNOWN_USER); + return; + } else if (auth.getLastIp() == null) { + sender.sendMessage("No known last IP address for player"); + return; + } - List accountList = dataSource.getAllAuthsByIp(auth.getLastIp()); - if (accountList.isEmpty()) { - commonService.send(sender, MessageKey.UNKNOWN_USER); - } else if (accountList.size() == 1) { - sender.sendMessage("[AuthMe] " + playerName + " is a single account player"); - } else { - outputAccountsList(sender, playerName, accountList); - } + List accountList = dataSource.getAllAuthsByIp(auth.getLastIp()); + if (accountList.isEmpty()) { + commonService.send(sender, MessageKey.UNKNOWN_USER); + } else if (accountList.size() == 1) { + sender.sendMessage("[AuthMe] " + playerName + " is a single account player"); + } else { + outputAccountsList(sender, playerName, accountList); } }); } diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java index 82b109cc3..b7707d2ea 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/PurgeBannedPlayersCommand.java @@ -29,7 +29,7 @@ public void executeCommand(CommandSender sender, List arguments) { Set bannedPlayers = bukkitService.getBannedPlayers(); Set namedBanned = new HashSet<>(bannedPlayers.size()); for (OfflinePlayer offlinePlayer : bannedPlayers) { - namedBanned.add(offlinePlayer.getName().toLowerCase()); + namedBanned.add(offlinePlayer.getName()); } purgeService.purgePlayers(sender, namedBanned, bannedPlayers.toArray(new OfflinePlayer[bannedPlayers.size()])); diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java index e05089da8..d0ab55753 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java @@ -42,7 +42,6 @@ public void executeCommand(final CommandSender sender, List arguments) { // Get the player name and password final String playerName = arguments.get(0); final String playerPass = arguments.get(1); - final String playerNameLowerCase = playerName.toLowerCase(); // Command logic ValidationResult passwordValidation = validationService.validatePassword(playerPass, playerName); @@ -52,13 +51,13 @@ public void executeCommand(final CommandSender sender, List arguments) { } bukkitService.runTaskOptionallyAsync(() -> { - if (dataSource.isAuthAvailable(playerNameLowerCase)) { + if (dataSource.isAuthAvailable(playerName)) { commonService.send(sender, MessageKey.NAME_ALREADY_REGISTERED); return; } - HashedPassword hashedPassword = passwordSecurity.computeHash(playerPass, playerNameLowerCase); + HashedPassword hashedPassword = passwordSecurity.computeHash(playerPass, playerName); PlayerAuth auth = PlayerAuth.builder() - .name(playerNameLowerCase) + .name(playerName) .realName(playerName) .password(hashedPassword) .registrationDate(System.currentTimeMillis()) diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java index a1cc4f034..290838d22 100644 --- a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java @@ -35,7 +35,7 @@ public class ChangePasswordCommand extends PlayerCommand { @Override public void runCommand(Player player, List arguments) { - String name = player.getName().toLowerCase(); + String name = player.getName(); if (!playerCache.isAuthenticated(name)) { commonService.send(player, MessageKey.NOT_LOGGED_IN); diff --git a/src/main/java/fr/xephi/authme/data/TempbanManager.java b/src/main/java/fr/xephi/authme/data/TempbanManager.java index fd2a0a3ed..61e508887 100644 --- a/src/main/java/fr/xephi/authme/data/TempbanManager.java +++ b/src/main/java/fr/xephi/authme/data/TempbanManager.java @@ -52,7 +52,7 @@ public void increaseCount(String address, String name) { if (isEnabled) { TimedCounter countsByName = ipLoginFailureCounts.computeIfAbsent( address, k -> new TimedCounter<>(resetThreshold, TimeUnit.MINUTES)); - countsByName.increment(name); + countsByName.increment(name.toLowerCase()); } } @@ -66,7 +66,7 @@ public void resetCount(String address, String name) { if (isEnabled) { TimedCounter counter = ipLoginFailureCounts.get(address); if (counter != null) { - counter.remove(name); + counter.remove(name.toLowerCase()); } } } diff --git a/src/main/java/fr/xephi/authme/data/auth/PlayerCache.java b/src/main/java/fr/xephi/authme/data/auth/PlayerCache.java index 46fafbf77..aef327242 100644 --- a/src/main/java/fr/xephi/authme/data/auth/PlayerCache.java +++ b/src/main/java/fr/xephi/authme/data/auth/PlayerCache.java @@ -20,7 +20,7 @@ public class PlayerCache { * @param auth the player auth object to save */ public void updatePlayer(PlayerAuth auth) { - cache.put(auth.getNickname().toLowerCase(), auth); + cache.put(auth.getNickname(), auth); } /** diff --git a/src/main/java/fr/xephi/authme/data/captcha/CaptchaCodeStorage.java b/src/main/java/fr/xephi/authme/data/captcha/CaptchaCodeStorage.java index 713edd69b..34a77597f 100644 --- a/src/main/java/fr/xephi/authme/data/captcha/CaptchaCodeStorage.java +++ b/src/main/java/fr/xephi/authme/data/captcha/CaptchaCodeStorage.java @@ -76,10 +76,10 @@ private String generateCode(String name) { * @return true if the code matches, false otherwise */ public boolean checkCode(String name, String code) { - String nameLowerCase = name.toLowerCase(); - String savedCode = captchaCodes.get(nameLowerCase); + String lowerCaseName = name.toLowerCase(); + String savedCode = captchaCodes.get(lowerCaseName); if (savedCode != null && savedCode.equalsIgnoreCase(code)) { - captchaCodes.remove(nameLowerCase); + captchaCodes.remove(lowerCaseName); return true; } else { generateCode(name); diff --git a/src/main/java/fr/xephi/authme/data/captcha/RegistrationCaptchaManager.java b/src/main/java/fr/xephi/authme/data/captcha/RegistrationCaptchaManager.java index 3b751247e..6299fe487 100644 --- a/src/main/java/fr/xephi/authme/data/captcha/RegistrationCaptchaManager.java +++ b/src/main/java/fr/xephi/authme/data/captcha/RegistrationCaptchaManager.java @@ -41,10 +41,10 @@ public String getCaptchaCodeOrGenerateNew(String name) { @Override public boolean checkCode(Player player, String code) { - String nameLower = player.getName().toLowerCase(); - boolean isCodeCorrect = captchaCodeStorage.checkCode(nameLower, code); + String name = player.getName(); + boolean isCodeCorrect = captchaCodeStorage.checkCode(name, code); if (isCodeCorrect) { - verifiedNamesForRegistration.add(nameLower); + verifiedNamesForRegistration.add(name.toLowerCase()); } return isCodeCorrect; } diff --git a/src/main/java/fr/xephi/authme/data/limbo/LimboService.java b/src/main/java/fr/xephi/authme/data/limbo/LimboService.java index fae9d44ed..3594fbe97 100644 --- a/src/main/java/fr/xephi/authme/data/limbo/LimboService.java +++ b/src/main/java/fr/xephi/authme/data/limbo/LimboService.java @@ -52,17 +52,17 @@ public class LimboService { * @param isRegistered whether or not the player is registered */ public void createLimboPlayer(Player player, boolean isRegistered) { - final String name = player.getName().toLowerCase(); + final String lowerCaseName = player.getName().toLowerCase(); LimboPlayer limboFromDisk = persistence.getLimboPlayer(player); if (limboFromDisk != null) { - ConsoleLogger.debug("LimboPlayer for `{0}` already exists on disk", name); + ConsoleLogger.debug("LimboPlayer for `{0}` already exists on disk", lowerCaseName); } - LimboPlayer existingLimbo = entries.remove(name); + LimboPlayer existingLimbo = entries.remove(lowerCaseName); if (existingLimbo != null) { existingLimbo.clearTasks(); - ConsoleLogger.debug("LimboPlayer for `{0}` already present in memory", name); + ConsoleLogger.debug("LimboPlayer for `{0}` already present in memory", lowerCaseName); } Location location = spawnLoader.getPlayerLocationOrSpawn(player); @@ -75,7 +75,7 @@ public void createLimboPlayer(Player player, boolean isRegistered) { helper.revokeLimboStates(player); authGroupHandler.setGroup(player, limboPlayer, isRegistered ? AuthGroupType.REGISTERED_UNAUTHENTICATED : AuthGroupType.UNREGISTERED); - entries.put(name, limboPlayer); + entries.put(lowerCaseName, limboPlayer); persistence.saveLimboPlayer(player, limboPlayer); } diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java index ec57cd57f..357691abc 100644 --- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java @@ -83,8 +83,7 @@ public boolean isAuthAvailable(String user) { @Override public HashedPassword getPassword(String user) { - user = user.toLowerCase(); - Optional pAuthOpt = cachedAuths.getIfPresent(user); + Optional pAuthOpt = cachedAuths.getIfPresent(user.toLowerCase()); if (pAuthOpt != null && pAuthOpt.isPresent()) { return pAuthOpt.get().getPassword(); } @@ -93,8 +92,7 @@ public HashedPassword getPassword(String user) { @Override public PlayerAuth getAuth(String user) { - user = user.toLowerCase(); - return cachedAuths.getUnchecked(user).orElse(null); + return cachedAuths.getUnchecked(user.toLowerCase()).orElse(null); } @Override @@ -117,10 +115,9 @@ public boolean updatePassword(PlayerAuth auth) { @Override public boolean updatePassword(String user, HashedPassword password) { - user = user.toLowerCase(); boolean result = source.updatePassword(user, password); if (result) { - cachedAuths.refresh(user); + cachedAuths.refresh(user.toLowerCase()); } return result; } @@ -150,10 +147,9 @@ public Set getRecordsToPurge(long until) { @Override public boolean removeAuth(String name) { - name = name.toLowerCase(); boolean result = source.removeAuth(name); if (result) { - cachedAuths.invalidate(name); + cachedAuths.invalidate(name.toLowerCase()); } return result; } @@ -207,12 +203,12 @@ public boolean isLogged(String user) { @Override public void setLogged(final String user) { - source.setLogged(user.toLowerCase()); + source.setLogged(user); } @Override public void setUnlogged(final String user) { - source.setUnlogged(user.toLowerCase()); + source.setUnlogged(user); } @Override diff --git a/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java index 13266a891..4d4c0b88a 100644 --- a/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/CrazyLoginConverter.java @@ -67,7 +67,7 @@ private void migrateAccount(String line) { String password = args[1]; if (password != null) { PlayerAuth auth = PlayerAuth.builder() - .name(playerName.toLowerCase()) + .name(playerName) .realName(playerName) .password(password, null) .build(); diff --git a/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java index d921ade82..9d3a4f43d 100644 --- a/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/RoyalAuthConverter.java @@ -31,8 +31,8 @@ public class RoyalAuthConverter implements Converter { public void execute(CommandSender sender) { for (OfflinePlayer player : plugin.getServer().getOfflinePlayers()) { try { - String name = player.getName().toLowerCase(); - File file = new File(makePath(".", "plugins", "RoyalAuth", "userdata", name + ".yml")); + String name = player.getName(); + File file = new File(makePath(".", "plugins", "RoyalAuth", "userdata", name.toLowerCase() + ".yml")); if (dataSource.isAuthAvailable(name) || !file.exists()) { continue; @@ -42,7 +42,7 @@ public void execute(CommandSender sender) { .name(name) .password(configuration.getString(PASSWORD_PATH), null) .lastLogin(configuration.getLong(LAST_LOGIN_PATH)) - .realName(player.getName()) + .realName(name) .build(); dataSource.saveAuth(auth); diff --git a/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java index c21be1375..c390b44ec 100644 --- a/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/VAuthConverter.java @@ -46,12 +46,12 @@ public void execute(CommandSender sender) { continue; } auth = PlayerAuth.builder() - .name(pname.toLowerCase()) + .name(pname) .realName(pname) .password(password, null).build(); } else { auth = PlayerAuth.builder() - .name(name.toLowerCase()) + .name(name) .realName(name) .password(password, null).build(); } diff --git a/src/main/java/fr/xephi/authme/datasource/converter/XAuthConverter.java b/src/main/java/fr/xephi/authme/datasource/converter/XAuthConverter.java index 928566583..45c7e4638 100644 --- a/src/main/java/fr/xephi/authme/datasource/converter/XAuthConverter.java +++ b/src/main/java/fr/xephi/authme/datasource/converter/XAuthConverter.java @@ -66,7 +66,7 @@ private void convert(CommandSender sender) { String psw = getPassword(id); if (psw != null && !psw.isEmpty() && pl != null) { PlayerAuth auth = PlayerAuth.builder() - .name(pl.toLowerCase()) + .name(pl) .realName(pl) .password(psw, null).build(); database.saveAuth(auth); @@ -89,7 +89,7 @@ private String getIdPlayer(int id) { if (!rs.next()) { return null; } - realPass = rs.getString("playername").toLowerCase(); + realPass = rs.getString("playername"); } catch (SQLException e) { xAuthLog.severe("Failed to retrieve name for account: " + id, e); return null; diff --git a/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java b/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java index 063948008..09b15318c 100644 --- a/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java +++ b/src/main/java/fr/xephi/authme/initialization/OnShutdownPlayerSaver.java @@ -52,7 +52,7 @@ public void saveAllPlayers() { } private void savePlayer(Player player) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); if (PlayerUtils.isNpc(player) || validationService.isUnrestricted(name)) { return; } @@ -68,7 +68,7 @@ private void saveLoggedinPlayer(Player player) { if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) { Location loc = spawnLoader.getPlayerLocationOrSpawn(player); final PlayerAuth auth = PlayerAuth.builder() - .name(player.getName().toLowerCase()) + .name(player.getName()) .realName(player.getName()) .location(loc).build(); dataSource.updateQuitLoc(auth); diff --git a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java index c1c30cf94..97b0dc9a1 100644 --- a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java +++ b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java @@ -157,7 +157,7 @@ public void checkNameCasing(String connectingName, PlayerAuth auth) throws Faile String realName = auth.getRealName(); // might be null or "Player" if (StringUtils.isEmpty(realName) || "Player".equals(realName)) { - dataSource.updateRealName(connectingName.toLowerCase(), connectingName); + dataSource.updateRealName(connectingName, connectingName); } else if (!realName.equals(connectingName)) { throw new FailedVerificationException(MessageKey.INVALID_NAME_CASE, realName, connectingName); } diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index 9c75ea963..57edf600a 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -197,13 +197,12 @@ public void onJoinMessage(PlayerJoinEvent event) { return; } - String name = player.getName().toLowerCase(); String joinMsg = event.getJoinMessage(); // Remove the join message while the player isn't logging in if (joinMsg != null) { event.setJoinMessage(null); - joinMessageService.putMessage(name, joinMsg); + joinMessageService.putMessage(player.getName().toLowerCase(), joinMsg); } } @@ -469,12 +468,12 @@ public void onPlayerRespawn(PlayerRespawnEvent event) { return; } Player player = event.getPlayer(); - String name = player.getName().toLowerCase(); + String name = player.getName(); Location spawn = spawnLoader.getSpawnLocation(player); if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && dataSource.isAuthAvailable(name)) { PlayerAuth auth = PlayerAuth.builder() .name(name) - .realName(player.getName()) + .realName(name) .location(spawn) .build(); dataSource.updateQuitLoc(auth); diff --git a/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java b/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java index 1caaa5c68..522bdced9 100644 --- a/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java +++ b/src/main/java/fr/xephi/authme/process/changepassword/AsyncChangePassword.java @@ -44,9 +44,9 @@ public class AsyncChangePassword implements AsynchronousProcess { * @param newPassword the new password chosen by the player */ public void changePassword(final Player player, String oldPassword, String newPassword) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); PlayerAuth auth = playerCache.getAuth(name); - if (passwordSecurity.comparePassword(oldPassword, auth.getPassword(), player.getName())) { + if (passwordSecurity.comparePassword(oldPassword, auth.getPassword(), name)) { HashedPassword hashedPassword = passwordSecurity.computeHash(newPassword, name); auth.setPassword(hashedPassword); @@ -72,30 +72,29 @@ public void changePassword(final Player player, String oldPassword, String newPa * @param newPassword the new password chosen for the player */ public void changePasswordAsAdmin(CommandSender sender, final String playerName, String newPassword) { - final String lowerCaseName = playerName.toLowerCase(); - if (!(playerCache.isAuthenticated(lowerCaseName) || dataSource.isAuthAvailable(lowerCaseName))) { + if (!(playerCache.isAuthenticated(playerName) || dataSource.isAuthAvailable(playerName))) { if (sender == null) { - ConsoleLogger.warning("Tried to change password for user " + lowerCaseName + " but it doesn't exist!"); + ConsoleLogger.warning("Tried to change password for user " + playerName + " but it doesn't exist!"); } else { commonService.send(sender, MessageKey.UNKNOWN_USER); } return; } - HashedPassword hashedPassword = passwordSecurity.computeHash(newPassword, lowerCaseName); - if (dataSource.updatePassword(lowerCaseName, hashedPassword)) { - bungeeSender.sendAuthMeBungeecordMessage(MessageType.REFRESH_PASSWORD, lowerCaseName); + HashedPassword hashedPassword = passwordSecurity.computeHash(newPassword, playerName); + if (dataSource.updatePassword(playerName, hashedPassword)) { + bungeeSender.sendAuthMeBungeecordMessage(MessageType.REFRESH_PASSWORD, playerName); if (sender != null) { commonService.send(sender, MessageKey.PASSWORD_CHANGED_SUCCESS); - ConsoleLogger.info(sender.getName() + " changed password of " + lowerCaseName); + ConsoleLogger.info(sender.getName() + " changed password of " + playerName); } else { - ConsoleLogger.info("Changed password of " + lowerCaseName); + ConsoleLogger.info("Changed password of " + playerName); } } else { if (sender != null) { commonService.send(sender, MessageKey.ERROR); } - ConsoleLogger.warning("An error occurred while changing password for user " + lowerCaseName + "!"); + ConsoleLogger.warning("An error occurred while changing password for user " + playerName + "!"); } } } diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java index 1896bfd3b..7c0423d7b 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncAddEmail.java @@ -49,7 +49,7 @@ public class AsyncAddEmail implements AsynchronousProcess { * @param email the email to add */ public void addEmail(Player player, String email) { - String playerName = player.getName().toLowerCase(); + String playerName = player.getName(); if (playerCache.isAuthenticated(playerName)) { PlayerAuth auth = playerCache.getAuth(playerName); diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java index df141c6cd..3d8d5f3b4 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java @@ -50,7 +50,7 @@ public class AsyncChangeEmail implements AsynchronousProcess { * @param newEmail provided new email */ public void changeEmail(Player player, String oldEmail, String newEmail) { - String playerName = player.getName().toLowerCase(); + String playerName = player.getName(); if (playerCache.isAuthenticated(playerName)) { PlayerAuth auth = playerCache.getAuth(playerName); final String currentEmail = auth.getEmail(); diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index 9924eef8e..984dcc2f1 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -78,10 +78,10 @@ public class AsynchronousJoin implements AsynchronousProcess { * @param player the player to process */ public void processJoin(final Player player) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); final String ip = PlayerUtils.getPlayerIp(player); - if (service.getProperty(RestrictionSettings.UNRESTRICTED_NAMES).contains(name)) { + if (validationService.isUnrestricted(name)) { return; } @@ -112,7 +112,7 @@ public void processJoin(final Player player) { isAsync -> new ProtectInventoryEvent(player, isAsync)); if (ev.isCancelled()) { player.updateInventory(); - ConsoleLogger.fine("ProtectInventoryEvent has been cancelled for " + player.getName() + "..."); + ConsoleLogger.fine("ProtectInventoryEvent has been cancelled for " + name + "..."); } } diff --git a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java index 2441ea283..161575473 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java @@ -124,7 +124,7 @@ public void forceLogin(Player player) { * (e.g. because he is already logged in) */ private PlayerAuth getPlayerAuth(Player player) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); if (playerCache.isAuthenticated(name)) { service.send(player, MessageKey.ALREADY_LOGGED_IN_ERROR); return null; @@ -169,7 +169,7 @@ private PlayerAuth getPlayerAuth(Player player) { * false otherwise */ private boolean checkPlayerInfo(Player player, PlayerAuth auth, String password) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); // If captcha is required send a message to the player and deny to log in if (loginCaptchaManager.isCaptchaRequired(name)) { @@ -183,7 +183,7 @@ private boolean checkPlayerInfo(Player player, PlayerAuth auth, String password) loginCaptchaManager.increaseLoginFailureCount(name); tempbanManager.increaseCount(ip, name); - if (passwordSecurity.comparePassword(password, auth.getPassword(), player.getName())) { + if (passwordSecurity.comparePassword(password, auth.getPassword(), name)) { return true; } else { handleWrongPassword(player, auth, ip); @@ -336,7 +336,7 @@ boolean hasReachedMaxLoggedInPlayersForIp(Player player, String ip) { for (Player onlinePlayer : bukkitService.getOnlinePlayers()) { if (ip.equalsIgnoreCase(PlayerUtils.getPlayerIp(onlinePlayer)) && !onlinePlayer.getName().equals(name) - && dataSource.isLogged(onlinePlayer.getName().toLowerCase())) { + && dataSource.isLogged(onlinePlayer.getName())) { ++count; } } diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java index 29bbe720d..5d07f63b1 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java @@ -76,7 +76,7 @@ private void restoreInventory(Player player) { * @param authsWithSameIp registered names with the same IP address as the player's */ public void processPlayerLogin(Player player, boolean isFirstLogin, List authsWithSameIp) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); final LimboPlayer limbo = limboService.getLimboPlayer(name); // Limbo contains the State of the Player before /login diff --git a/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java b/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java index 41cedf4bc..aadb6a093 100644 --- a/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/AsynchronousLogout.java @@ -51,7 +51,7 @@ public class AsynchronousLogout implements AsynchronousProcess { * @param player the player wanting to log out */ public void logout(Player player) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); if (!playerCache.isAuthenticated(name)) { service.send(player, MessageKey.NOT_LOGGED_IN); return; diff --git a/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java index b5643217f..c5087abf4 100644 --- a/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java +++ b/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java @@ -68,7 +68,7 @@ public void processQuit(Player player) { if (player == null || validationService.isUnrestricted(player.getName())) { return; } - final String name = player.getName().toLowerCase(); + final String name = player.getName(); final boolean wasLoggedIn = playerCache.isAuthenticated(name); if (wasLoggedIn) { diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java index 608267f00..cef35d38e 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -71,7 +71,7 @@ public

void register(RegistrationMethod

va * @return true if the checks are successful and the event hasn't marked the action as denied, false otherwise. */ private boolean preRegisterCheck(RegistrationMethod variant, Player player) { - final String name = player.getName().toLowerCase(); + final String name = player.getName(); if (playerCache.isAuthenticated(name)) { service.send(player, MessageKey.ALREADY_LOGGED_IN_ERROR); return false; diff --git a/src/main/java/fr/xephi/authme/process/register/executors/PlayerAuthBuilderHelper.java b/src/main/java/fr/xephi/authme/process/register/executors/PlayerAuthBuilderHelper.java index d8c6a5fcc..eee24b81a 100644 --- a/src/main/java/fr/xephi/authme/process/register/executors/PlayerAuthBuilderHelper.java +++ b/src/main/java/fr/xephi/authme/process/register/executors/PlayerAuthBuilderHelper.java @@ -23,7 +23,7 @@ private PlayerAuthBuilderHelper() { */ static PlayerAuth createPlayerAuth(Player player, HashedPassword hashedPassword, String email) { return PlayerAuth.builder() - .name(player.getName().toLowerCase()) + .name(player.getName()) .realName(player.getName()) .password(hashedPassword) .email(email) diff --git a/src/main/java/fr/xephi/authme/service/JoinMessageService.java b/src/main/java/fr/xephi/authme/service/JoinMessageService.java index 29f2caa04..8a899b2e2 100644 --- a/src/main/java/fr/xephi/authme/service/JoinMessageService.java +++ b/src/main/java/fr/xephi/authme/service/JoinMessageService.java @@ -28,7 +28,7 @@ public class JoinMessageService { * @param string the join message */ public void putMessage(String playerName, String string) { - joinMessages.put(playerName, string); + joinMessages.put(playerName.toLowerCase(), string); } /** @@ -37,7 +37,7 @@ public void putMessage(String playerName, String string) { * @param playerName the player name */ public void sendMessage(String playerName) { - String joinMessage = joinMessages.remove(playerName); + String joinMessage = joinMessages.remove(playerName.toLowerCase()); if (!StringUtils.isEmpty(joinMessage)) { bukkitService.broadcastMessage(joinMessage); } diff --git a/src/main/java/fr/xephi/authme/service/SessionService.java b/src/main/java/fr/xephi/authme/service/SessionService.java index f821a64b3..80c613795 100644 --- a/src/main/java/fr/xephi/authme/service/SessionService.java +++ b/src/main/java/fr/xephi/authme/service/SessionService.java @@ -88,12 +88,12 @@ private SessionState fetchSessionStatus(PlayerAuth auth, Player player) { public void grantSession(String name) { if (isEnabled) { - database.grantSession(name); + database.grantSession(name.toLowerCase()); } } public void revokeSession(String name) { - database.revokeSession(name); + database.revokeSession(name.toLowerCase()); } @Override diff --git a/src/main/java/fr/xephi/authme/task/purge/PurgeTask.java b/src/main/java/fr/xephi/authme/task/purge/PurgeTask.java index 06bf06f50..4282d88ff 100644 --- a/src/main/java/fr/xephi/authme/task/purge/PurgeTask.java +++ b/src/main/java/fr/xephi/authme/task/purge/PurgeTask.java @@ -90,7 +90,7 @@ public void run() { //we went through all offlineplayers but there are still names remaining for (String name : toPurge) { if (!permissionsManager.hasPermissionOffline(name, PlayerStatePermission.BYPASS_PURGE)) { - namePortion.add(name); + namePortion.add(name.toLowerCase()); } } toPurge.clear();