TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-31 19:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always log invalid state messages

Browse Source 
Related #803
Related #806
This commit is contained in:
games647
2022-06-07 18:24:27 +02:00
parent 82d8b4d2be
commit 0ae18f3ac6
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,8 +95,9 @@ public class VerifyResponseTask implements Runnable {
try { try {
BukkitLoginSession session = plugin.getSession(player.getAddress()); BukkitLoginSession session = plugin.getSession(player.getAddress());
if (session == null) { if (session == null) {
disconnect("invalid-request", true disconnect("invalid-request",
, "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);
} }
@@ -117,7 +118,7 @@ public class VerifyResponseTask implements Runnable {
try { try {
loginKey = EncryptionUtil.decryptSharedKey(privateKey, sharedSecret); loginKey = EncryptionUtil.decryptSharedKey(privateKey, sharedSecret);
} catch (GeneralSecurityException securityEx) { } catch (GeneralSecurityException securityEx) {
disconnect("error-kick", false, "Cannot decrypt received contents", securityEx); disconnect("error-kick", "Cannot decrypt received contents", securityEx);
return; return;
} }
@@ -126,7 +127,7 @@ public class VerifyResponseTask implements Runnable {
return; return;
} }
} catch (Exception ex) { } catch (Exception ex) {
disconnect("error-kick", false, "Cannot decrypt received contents", ex); disconnect("error-kick", "Cannot decrypt received contents", ex);
return; return;
} }
@@ -143,7 +144,7 @@ public class VerifyResponseTask implements Runnable {
plugin.getLog().info("Profile {} has a verified premium account", requestedUsername); plugin.getLog().info("Profile {} has a verified premium account", requestedUsername);
String realUsername = verification.getName(); String realUsername = verification.getName();
if (realUsername == null) { if (realUsername == null) {
disconnect("invalid-session", true, "Username field null for {}", requestedUsername); disconnect("invalid-session", "Username field null for {}", requestedUsername);
return; return;
} }
@@ -160,12 +161,12 @@ public class VerifyResponseTask implements Runnable {
receiveFakeStartPacket(realUsername); receiveFakeStartPacket(realUsername);
} else { } else {
//user tried to fake an authentication //user tried to fake an authentication
disconnect("invalid-session", true disconnect("invalid-session",
, "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.getRequestUsername(), socketAddress, serverId); session.getRequestUsername(), socketAddress, serverId);
} }
} catch (IOException ioEx) { } catch (IOException ioEx) {
disconnect("error-kick", false, "Failed to connect to session server", ioEx); disconnect("error-kick", "Failed to connect to session server", ioEx);
} }
} }
@@ -189,9 +190,9 @@ 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(serverKey.getPrivate(), responseVerify))) { if (!Arrays.equals(requestVerify, EncryptionUtil.decrypt(serverKey.getPrivate(), 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("invalid-verify-token", true disconnect("invalid-verify-token",
, "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.getRequestUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify); session.getRequestUsername(), packetEvent.getPlayer().getAddress(), requestVerify, responseVerify);
return false; return false;
} }
@@ -245,20 +246,15 @@ public class VerifyResponseTask implements Runnable {
encryptMethod.invoke(networkManager, decryptionCipher, encryptionCipher); encryptMethod.invoke(networkManager, decryptionCipher, encryptionCipher);
} }
} catch (Exception ex) { } catch (Exception ex) {
disconnect("error-kick", false, "Couldn't enable encryption", ex); disconnect("error-kick", "Couldn't enable encryption", ex);
return false; return false;
} }
return true; return true;
} }
private void disconnect(String reasonKey, boolean debug, String logMessage, Object... arguments) { private void disconnect(String reasonKey, String logMessage, Object... arguments) {
if (debug) {
plugin.getLog().debug(logMessage, arguments);
} else {
plugin.getLog().error(logMessage, arguments); plugin.getLog().error(logMessage, arguments);
}
kickPlayer(plugin.getCore().getMessage(reasonKey)); kickPlayer(plugin.getCore().getMessage(reasonKey));
} }