GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Make a difference between a decrypt error and an exception

Browse Source
This commit is contained in:
Tim203
2021-09-17 12:44:35 +02:00
parent 1d7009395d
commit 4fd6f7eda4
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java
View File

@@ -128,6 +128,10 @@ public class BungeeProxyDataHandler extends ChannelInboundHandlerAdapter {
switch (result.getResultType()) {
case EXCEPTION:
ctx.channel().attr(kickMessageAttribute)
.set(Constants.INTERNAL_ERROR_MESSAGE);
break;
case DECRYPT_ERROR:
ctx.channel().attr(kickMessageAttribute)
.set(config.getDisconnect().getInvalidKey());
break;

5
common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
View File

@@ -180,7 +180,7 @@ public final class FloodgateHandshakeHandler {
formatException.printStackTrace();
throw callHandlerAndReturnResult(
ResultType.EXCEPTION,
ResultType.DECRYPT_ERROR,
channel, null, hostname
);
} catch (Exception exception) {
@@ -203,6 +203,8 @@ public final class FloodgateHandshakeHandler {
return (HandshakeResult) error;
}
error.printStackTrace();
return callHandlerAndReturnResult(
ResultType.EXCEPTION,
channel, null, hostname
@@ -298,6 +300,7 @@ public final class FloodgateHandshakeHandler {
public enum ResultType {
EXCEPTION,
NOT_FLOODGATE_DATA,
DECRYPT_ERROR,
INVALID_DATA_LENGTH,
TIMESTAMP_DENIED,
SUCCESS

3
common/src/main/java/org/geysermc/floodgate/util/Constants.java
View File

@@ -52,6 +52,9 @@ public final class Constants {
public static final String TIMESTAMP_DENIED_MESSAGE =
"Something isn't right with this data." +
" Try logging in again or contact a server administrator if the issue persists.";
public static final String INTERNAL_ERROR_MESSAGE =
"An internal error happened while handling Floodgate data." +
" Try logging in again or contact a server administrator if the issue persists.";
public static final int HANDSHAKE_PACKET_ID = 0;

4
spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
View File

@@ -94,6 +94,10 @@ public final class SpigotDataHandler extends ChannelInboundHandlerAdapter {
case SUCCESS:
break;
case EXCEPTION:
logger.info(Constants.INTERNAL_ERROR_MESSAGE);
ctx.close();
return true;
case DECRYPT_ERROR:
logger.info(config.getDisconnect().getInvalidKey());
ctx.close();
return true;

4
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
View File

@@ -128,6 +128,10 @@ public final class VelocityProxyDataHandler extends ChannelInboundHandlerAdapter
case SUCCESS:
break;
case EXCEPTION:
ctx.channel().attr(kickMessageAttribute)
.set(Constants.INTERNAL_ERROR_MESSAGE);
return;
case DECRYPT_ERROR:
ctx.channel().attr(kickMessageAttribute)
.set(config.getDisconnect().getInvalidKey());
return;