feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Prevent duplicate message fetching for kick in PLib (Fixes #212)

Browse Source
This commit is contained in:
games647
2018-06-27 18:59:40 +02:00
parent 9b0b8f5fcb
commit c172b1ec84
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
View File

@ -59,7 +59,7 @@ public class VerifyResponseTask implements Runnable {
try { try {
BukkitLoginSession session = plugin.getLoginSessions().get(player.getAddress().toString()); BukkitLoginSession session = plugin.getLoginSessions().get(player.getAddress().toString());
if (session == null) { if (session == null) {
disconnect(plugin.getCore().getMessage("invalid-request"), true disconnect("invalid-request", true
, "GameProfile {0} tried to send encryption response at invalid state", player.getAddress()); , "GameProfile {0} tried to send encryption response at invalid state", player.getAddress());
} else { } else {
verifyResponse(session); verifyResponse(session);
@ -120,7 +120,7 @@ public class VerifyResponseTask implements Runnable {
receiveFakeStartPacket(username); receiveFakeStartPacket(username);
} else { } else {
//user tried to fake a authentication //user tried to fake a authentication
disconnect(plugin.getCore().getMessage("invalid-session"), true disconnect("invalid-session", true
, "GameProfile {0} ({1}) tried to log in with an invalid session ServerId: {2}" , "GameProfile {0} ({1}) tried to log in with an invalid session ServerId: {2}"
, session.getUsername(), socketAddress, serverId); , session.getUsername(), socketAddress, serverId);
} }
@ -150,7 +150,7 @@ public class VerifyResponseTask implements Runnable {
//https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L182 //https://github.com/bergerkiller/CraftSource/blob/master/net.minecraft.server/LoginListener.java#L182
if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(cipher, privateKey, responseVerify))) { if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(cipher, privateKey, responseVerify))) {
//check if the verify token are equal to the server sent one //check if the verify token are equal to the server sent one
disconnect(plugin.getCore().getMessage("invalid-verify-token"), true disconnect("invalid-verify-token", true
, "GameProfile {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}" , "GameProfile {0} ({1}) tried to login with an invalid verify token. Server: {2} Client: {3}"
, session.getUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify); , session.getUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
return false; return false;
@ -189,14 +189,14 @@ public class VerifyResponseTask implements Runnable {
return true; return true;
} }
private void disconnect(String kickReason, boolean debug, String logMessage, Object... arguments) { private void disconnect(String reasonKey, boolean debug, String logMessage, Object... arguments) {
if (debug) { if (debug) {
plugin.getLog().debug(logMessage, arguments); plugin.getLog().debug(logMessage, arguments);
} else { } else {
plugin.getLog().error(logMessage, arguments); plugin.getLog().error(logMessage, arguments);
} }
kickPlayer(plugin.getCore().getMessage(kickReason)); kickPlayer(plugin.getCore().getMessage(reasonKey));
} }
private void kickPlayer(String reason) { private void kickPlayer(String reason) {