eaglercraft/eaglercraft-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1.0.4) Fixed JSON kick messages in handshake for EaglerXBungee

Browse Source
This commit is contained in:
LAX1DUDE 2023-01-10 17:48:30 -08:00
parent 8fcb476f64
commit ffc6fcf57b
5 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar
View File

Binary file not shown.

45
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/HttpWebSocketHandler.java
View File

@ -93,6 +93,7 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
private int clientLoginState = HandshakePacketTypes.STATE_OPENED; private int clientLoginState = HandshakePacketTypes.STATE_OPENED;
private int clientProtocolVersion = -1; private int clientProtocolVersion = -1;
private boolean isProtocolExchanged = false;
private int gameProtocolVersion = -1; private int gameProtocolVersion = -1;
private CharSequence clientBrandString; private CharSequence clientBrandString;
private CharSequence clientVersionString; private CharSequence clientVersionString;
@ -239,10 +240,10 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
return; return;
} }
}else if(eaglerLegacyProtocolVersion == 2) { }else if(eaglerLegacyProtocolVersion == 2) {
int minProtVers = Integer.MAX_VALUE; int minProtVers = Integer.MAX_VALUE;
int maxProtVers = -1; int maxProtVers = -1;
boolean hasV2InList = false; boolean hasV2InList = false;
boolean hasV3InList = false;
int minGameVers = Integer.MAX_VALUE; int minGameVers = Integer.MAX_VALUE;
int maxGameVers = -1; int maxGameVers = -1;
@ -254,6 +255,9 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
if(j == 2) { if(j == 2) {
hasV2InList = true; hasV2InList = true;
} }
if(j == 3) {
hasV3InList = true;
}
if(j > maxProtVers) { if(j > maxProtVers) {
maxProtVers = j; maxProtVers = j;
} }
@ -283,9 +287,9 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
boolean versMisMatch = false; boolean versMisMatch = false;
boolean isServerProbablyOutdated = false; boolean isServerProbablyOutdated = false;
boolean isClientProbablyOutdated = false; boolean isClientProbablyOutdated = false;
if(!hasV2InList) { if(!hasV2InList && !hasV3InList) {
versMisMatch = true; versMisMatch = true;
isServerProbablyOutdated = minProtVers > 2 && maxProtVers > 2; //make sure to update VersionQueryHandler too isServerProbablyOutdated = minProtVers > 3 && maxProtVers > 3; //make sure to update VersionQueryHandler too
isClientProbablyOutdated = minProtVers < 2 && maxProtVers < 2; isClientProbablyOutdated = minProtVers < 2 && maxProtVers < 2;
}else if(!has47InList) { }else if(!has47InList) {
versMisMatch = true; versMisMatch = true;
@ -293,13 +297,16 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
isClientProbablyOutdated = minGameVers < minecraftProtocolVersion && maxGameVers < minecraftProtocolVersion; isClientProbablyOutdated = minGameVers < minecraftProtocolVersion && maxGameVers < minecraftProtocolVersion;
} }
clientProtocolVersion = hasV3InList ? 3 : 2;
if(versMisMatch) { if(versMisMatch) {
clientLoginState = HandshakePacketTypes.STATE_CLIENT_COMPLETE; clientLoginState = HandshakePacketTypes.STATE_CLIENT_COMPLETE;
ByteBuf buf = Unpooled.buffer(); ByteBuf buf = Unpooled.buffer();
buf.writeByte(HandshakePacketTypes.PROTOCOL_VERSION_MISMATCH); buf.writeByte(HandshakePacketTypes.PROTOCOL_VERSION_MISMATCH);
buf.writeShort(1); buf.writeShort(2);
buf.writeShort(2); // want version 2 buf.writeShort(2); // want v2 or v3
buf.writeShort(3);
buf.writeShort(1); buf.writeShort(1);
buf.writeShort(minecraftProtocolVersion); // want game version 47 buf.writeShort(minecraftProtocolVersion); // want game version 47
@ -333,6 +340,7 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
boolean useSnapshotFallbackProtocol = false; boolean useSnapshotFallbackProtocol = false;
if(eaglerLegacyProtocolVersion == 1 && !authConfig.isEnableAuthentication()) { if(eaglerLegacyProtocolVersion == 1 && !authConfig.isEnableAuthentication()) {
clientProtocolVersion = 2;
useSnapshotFallbackProtocol = true; useSnapshotFallbackProtocol = true;
clientAuth = false; clientAuth = false;
clientAuthUsername = null; clientAuthUsername = null;
@ -348,11 +356,9 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
} }
} }
final int final_eaglerProtocolVersion = 2;
final boolean final_useSnapshotFallbackProtocol = useSnapshotFallbackProtocol; final boolean final_useSnapshotFallbackProtocol = useSnapshotFallbackProtocol;
Runnable continueThread = () -> { Runnable continueThread = () -> {
clientLoginState = HandshakePacketTypes.STATE_CLIENT_VERSION; clientLoginState = HandshakePacketTypes.STATE_CLIENT_VERSION;
clientProtocolVersion = final_eaglerProtocolVersion;
gameProtocolVersion = 47; gameProtocolVersion = 47;
clientBrandString = eaglerBrand; clientBrandString = eaglerBrand;
clientVersionString = eaglerVersionString; clientVersionString = eaglerVersionString;
@ -363,7 +369,7 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
if(final_useSnapshotFallbackProtocol) { if(final_useSnapshotFallbackProtocol) {
buf.writeByte(1); buf.writeByte(1);
}else { }else {
buf.writeShort(final_eaglerProtocolVersion); buf.writeShort(clientProtocolVersion);
buf.writeShort(minecraftProtocolVersion); buf.writeShort(minecraftProtocolVersion);
} }
@ -400,6 +406,7 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
} }
ctx.writeAndFlush(new BinaryWebSocketFrame(buf)); ctx.writeAndFlush(new BinaryWebSocketFrame(buf));
isProtocolExchanged = true;
}; };
authRequireEvent = null; authRequireEvent = null;
@ -996,12 +1003,21 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
} }
private ChannelFuture sendLoginDenied(ChannelHandlerContext ctx, String reason) { private ChannelFuture sendLoginDenied(ChannelHandlerContext ctx, String reason) {
if((!isProtocolExchanged || clientProtocolVersion == 2) && reason.length() > 255) {
reason = reason.substring(0, 256);
}else if(reason.length() > 65535) {
reason = reason.substring(0, 65536);
}
clientLoginState = HandshakePacketTypes.STATE_CLIENT_COMPLETE; clientLoginState = HandshakePacketTypes.STATE_CLIENT_COMPLETE;
connectionClosed = true; connectionClosed = true;
ByteBuf buf = Unpooled.buffer(); ByteBuf buf = Unpooled.buffer();
buf.writeByte(HandshakePacketTypes.PROTOCOL_SERVER_DENY_LOGIN); buf.writeByte(HandshakePacketTypes.PROTOCOL_SERVER_DENY_LOGIN);
byte[] msg = reason.getBytes(StandardCharsets.UTF_8); byte[] msg = reason.getBytes(StandardCharsets.UTF_8);
buf.writeByte(msg.length); if(!isProtocolExchanged || clientProtocolVersion == 2) {
buf.writeByte(msg.length);
}else {
buf.writeShort(msg.length);
}
buf.writeBytes(msg); buf.writeBytes(msg);
return ctx.writeAndFlush(new BinaryWebSocketFrame(buf)); return ctx.writeAndFlush(new BinaryWebSocketFrame(buf));
} }
@ -1011,13 +1027,22 @@ public class HttpWebSocketHandler extends ChannelInboundHandlerAdapter {
} }
private ChannelFuture sendErrorCode(ChannelHandlerContext ctx, int code, String str) { private ChannelFuture sendErrorCode(ChannelHandlerContext ctx, int code, String str) {
if((!isProtocolExchanged || clientProtocolVersion == 2) && str.length() > 255) {
str = str.substring(0, 256);
}else if(str.length() > 65535) {
str = str.substring(0, 65536);
}
clientLoginState = HandshakePacketTypes.STATE_CLIENT_COMPLETE; clientLoginState = HandshakePacketTypes.STATE_CLIENT_COMPLETE;
connectionClosed = true; connectionClosed = true;
ByteBuf buf = Unpooled.buffer(); ByteBuf buf = Unpooled.buffer();
buf.writeByte(HandshakePacketTypes.PROTOCOL_SERVER_ERROR); buf.writeByte(HandshakePacketTypes.PROTOCOL_SERVER_ERROR);
buf.writeByte(code); buf.writeByte(code);
byte[] msg = str.getBytes(StandardCharsets.UTF_8); byte[] msg = str.getBytes(StandardCharsets.UTF_8);
buf.writeByte(msg.length); if(!isProtocolExchanged || clientProtocolVersion == 2) {
buf.writeByte(msg.length);
}else {
buf.writeShort(msg.length);
}
buf.writeBytes(msg); buf.writeBytes(msg);
return ctx.writeAndFlush(new BinaryWebSocketFrame(buf)); return ctx.writeAndFlush(new BinaryWebSocketFrame(buf));
} }

1
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/VersionQueryHandler.java
View File

@ -26,6 +26,7 @@ public class VersionQueryHandler extends EaglerQuerySimpleHandler {
JsonObject responseObj = new JsonObject(); JsonObject responseObj = new JsonObject();
JsonArray handshakeVersions = new JsonArray(); JsonArray handshakeVersions = new JsonArray();
handshakeVersions.add(2); handshakeVersions.add(2);
handshakeVersions.add(3);
responseObj.add("handshakeVersions", handshakeVersions); responseObj.add("handshakeVersions", handshakeVersions);
JsonArray protocolVersions = new JsonArray(); JsonArray protocolVersions = new JsonArray();
protocolVersions.add(47); protocolVersions.add(47);

2
gateway/EaglercraftXBungee/src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: EaglercraftXBungee name: EaglercraftXBungee
main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee
version: 1.0.3 version: 1.0.4
description: Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks description: Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks
author: lax1dude author: lax1dude

2
gateway_version
View File

@ -1 +1 @@
1.0.3 1.0.4