Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#747 - display captcha immediately after the failed login attempt

Browse Source
This commit is contained in:
Gnat008 2016-06-11 21:23:53 -04:00
parent 0cc5dd2cd5
commit f0e42b61c5
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java
View File

@ -71,18 +71,17 @@ public class AsynchronousLogin implements AsynchronousProcess {
AsynchronousLogin() { } AsynchronousLogin() { }
/**
* Queries the {@link fr.xephi.authme.cache.CaptchaManager} to
* see if a captcha needs to be entered in order to log in.
*
* @param player The player to check
* @return True if a captcha needs to be entered
*/
private boolean needsCaptcha(Player player) { private boolean needsCaptcha(Player player) {
final String playerName = player.getName(); final String playerName = player.getName();
if (captchaManager.isCaptchaRequired(playerName)) {
service.send(player, MessageKey.USAGE_CAPTCHA, captchaManager.getCaptchaCodeOrGenerateNew(playerName)); return captchaManager.isCaptchaRequired(playerName);
return true;
} else {
// Increase the count here before knowing the result of the login.
// If login is successful, we clear the count for the player
captchaManager.increaseCount(playerName);
}
return false;
} }
/** /**
@ -144,7 +143,13 @@ public class AsynchronousLogin implements AsynchronousProcess {
return; return;
} }
final String name = player.getName().toLowerCase();
final String ip = Utils.getPlayerIp(player); final String ip = Utils.getPlayerIp(player);
// Increase the count here before knowing the result of the login.
// If the login is successful, we clear the count for the player.
captchaManager.increaseCount(name);
if ("127.0.0.1".equals(pAuth.getIp()) && !pAuth.getIp().equals(ip)) { if ("127.0.0.1".equals(pAuth.getIp()) && !pAuth.getIp().equals(ip)) {
pAuth.setIp(ip); pAuth.setIp(ip);
database.updateIp(pAuth.getNickname(), ip); database.updateIp(pAuth.getNickname(), ip);
@ -153,8 +158,6 @@ public class AsynchronousLogin implements AsynchronousProcess {
String email = pAuth.getEmail(); String email = pAuth.getEmail();
boolean passwordVerified = forceLogin || passwordSecurity.comparePassword( boolean passwordVerified = forceLogin || passwordSecurity.comparePassword(
password, pAuth.getPassword(), player.getName()); password, pAuth.getPassword(), player.getName());
final String name = player.getName().toLowerCase();
if (passwordVerified && player.isOnline()) { if (passwordVerified && player.isOnline()) {
PlayerAuth auth = PlayerAuth.builder() PlayerAuth auth = PlayerAuth.builder()
.name(name) .name(name)
@ -213,6 +216,11 @@ public class AsynchronousLogin implements AsynchronousProcess {
}); });
} else { } else {
service.send(player, MessageKey.WRONG_PASSWORD); service.send(player, MessageKey.WRONG_PASSWORD);
// Check again if a captcha is required to log in
if (needsCaptcha(player)) {
service.send(player, MessageKey.USAGE_CAPTCHA, captchaManager.getCaptchaCodeOrGenerateNew(name));
}
} }
} else { } else {
ConsoleLogger.showError("Player " + name + " wasn't online during login process, aborted... "); ConsoleLogger.showError("Player " + name + " wasn't online during login process, aborted... ");