eaglercraft/ayunViaProxyEagUtils
1
0
Fork 0
mirror of https://github.com/ayunami2000/ayunViaProxyEagUtils.git synced 2024-09-16 07:26:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

push update

Browse Source
This commit is contained in:
ayunami2000 2024-06-21 10:08:15 -04:00
parent 790b33ad68
commit 757018828d
13 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -10,5 +10,5 @@ repositories {
}
dependencies {
implementation files("libs/ViaProxy-3.2.0-SNAPSHOT+java8.jar")
implementation files("libs/ViaProxy-3.3.0-SNAPSHOT+java8.jar")
}

12
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglerServerHandler.java
View File

@ -22,9 +22,9 @@ import net.raphimc.netminecraft.constants.MCPackets;
import net.raphimc.netminecraft.netty.connection.NetClient;
import net.raphimc.netminecraft.packet.PacketTypes;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import net.raphimc.vialegacy.protocols.release.protocol1_6_1to1_5_2.ClientboundPackets1_5_2;
import net.raphimc.vialegacy.protocols.release.protocol1_6_1to1_5_2.ServerboundPackets1_5_2;
import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.types.Types1_6_4;
import net.raphimc.vialegacy.protocol.release.r1_5_2tor1_6_1.packet.ClientboundPackets1_5_2;
import net.raphimc.vialegacy.protocol.release.r1_5_2tor1_6_1.packet.ServerboundPackets1_5_2;
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.types.Types1_6_4;
import net.raphimc.viaproxy.proxy.session.LegacyProxyConnection;
import net.raphimc.viaproxy.proxy.session.ProxyConnection;
import net.raphimc.viaproxy.proxy.util.ExceptionUtil;
@ -60,7 +60,7 @@ public class EaglerServerHandler extends MessageToMessageCodec<WebSocketFrame, B
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
private int handshakeState = 0;
@ -412,7 +412,7 @@ public class EaglerServerHandler extends MessageToMessageCodec<WebSocketFrame, B
handshakeState = 3;
ConnectionHandshake.attemptHandshake3(ctx.channel(), ByteBufUtil.getBytes(in.content()), (ProxyConnection) proxyConnection);
ByteBuf bb = ctx.alloc().buffer();
PacketTypes.writeVarInt(bb, MCPackets.S2C_LOGIN_SUCCESS.getId(version.getVersion()));
PacketTypes.writeVarInt(bb, MCPackets.S2C_LOGIN_GAME_PROFILE.getId(version.getVersion()));
PacketTypes.writeString(bb, ((ProxyConnection) proxyConnection).getGameProfile().getId().toString());
PacketTypes.writeString(bb, ((ProxyConnection) proxyConnection).getGameProfile().getName());
out.add(bb);
@ -421,7 +421,7 @@ public class EaglerServerHandler extends MessageToMessageCodec<WebSocketFrame, B
ConnectionHandshake.attemptHandshake4(ctx.channel(), ByteBufUtil.getBytes(in.content()), (ProxyConnection) proxyConnection);
out.add(Unpooled.EMPTY_BUFFER);
} else {
if (in.content().getByte(0) == MCPackets.S2C_LOGIN_SUCCESS.getId(version.getVersion()) && in.content().getByte(1) == 0 && in.content().getByte(2) == 2) {
if (in.content().getByte(0) == MCPackets.S2C_LOGIN_GAME_PROFILE.getId(version.getVersion()) && in.content().getByte(1) == 0 && in.content().getByte(2) == 2) {
out.add(Unpooled.EMPTY_BUFFER);
return;
}

4
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglerSkinHandler.java
View File

@ -6,7 +6,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.types.Types1_6_4;
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.types.Types1_6_4;
import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.proxy.util.ExceptionUtil;
@ -50,7 +50,7 @@ public class EaglerSkinHandler extends ChannelInboundHandlerAdapter {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
@Override

4
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglerVoiceHandler.java
View File

@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import net.raphimc.netminecraft.packet.PacketTypes;
import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.types.Types1_6_4;
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.types.Types1_6_4;
import net.raphimc.viaproxy.proxy.util.ExceptionUtil;
import java.io.*;
@ -34,7 +34,7 @@ public class EaglerVoiceHandler extends ChannelInboundHandlerAdapter {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
private static UUID nameToUUID(String name) {

2
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglerXLoginHandler.java
View File

@ -18,7 +18,7 @@ public class EaglerXLoginHandler extends ChannelOutboundHandlerAdapter {
@Override
@SuppressWarnings("deprecation")
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
@Override

2
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglerXSkinHandler.java
View File

@ -24,7 +24,7 @@ public class EaglerXSkinHandler extends ChannelInboundHandlerAdapter {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
@Override

10
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglercraftHandler.java
View File

@ -24,8 +24,8 @@ import net.raphimc.netminecraft.constants.MCPackets;
import net.raphimc.netminecraft.constants.MCPipeline;
import net.raphimc.netminecraft.packet.PacketTypes;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import net.raphimc.vialegacy.protocols.release.protocol1_6_1to1_5_2.ServerboundPackets1_5_2;
import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.types.Types1_6_4;
import net.raphimc.vialegacy.protocol.release.r1_5_2tor1_6_1.packet.ServerboundPackets1_5_2;
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.types.Types1_6_4;
import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.proxy.client2proxy.Client2ProxyChannelInitializer;
import net.raphimc.viaproxy.proxy.util.ExceptionUtil;
@ -258,7 +258,7 @@ public class EaglercraftHandler extends MessageToMessageCodec<WebSocketFrame, By
throw new IllegalArgumentException("Too much data in packet: " + data.readableBytes() + " bytes");
}
this.state = State.LOGIN_COMPLETE;
this.pluginMessageId = MCPackets.C2S_PLUGIN_MESSAGE.getId(this.version.getVersion());
this.pluginMessageId = MCPackets.C2S_CUSTOM_PAYLOAD.getId(this.version.getVersion());
if (this.pluginMessageId == -1) {
Logger.LOGGER.error("Unsupported protocol version: " + this.version.getVersion());
ctx.close();
@ -286,7 +286,7 @@ public class EaglercraftHandler extends MessageToMessageCodec<WebSocketFrame, By
break;
}
if (!ctx.channel().hasAttr(Main.secureWs) || ctx.channel().attr(Main.secureWs) == null) {
if (packetId == ServerboundPackets1_5_2.PLUGIN_MESSAGE.getId() && Types1_6_4.STRING.read(data).startsWith("EAG|")) {
if (packetId == ServerboundPackets1_5_2.CUSTOM_PAYLOAD.getId() && Types1_6_4.STRING.read(data).startsWith("EAG|")) {
break;
}
}
@ -364,7 +364,7 @@ public class EaglercraftHandler extends MessageToMessageCodec<WebSocketFrame, By
}
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
public enum State {

19
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglercraftInitialHandler.java
View File

@ -30,6 +30,7 @@ import java.util.function.Supplier;
public class EaglercraftInitialHandler extends ByteToMessageDecoder {
private static final Method initChannelMethod;
public static SslContext sslContext;
private static long lastTime = 0;
@Override
protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final List<Object> out) {
@ -40,10 +41,11 @@ public class EaglercraftInitialHandler extends ByteToMessageDecoder {
return;
}
if (in.readableBytes() >= 3 || in.getByte(0) != 71) {
boolean ssl = EaglercraftInitialHandler.sslContext != null && in.readableBytes() >= 3 && in.getByte(0) == 22;
renewCerts();
boolean ssl = sslContext != null && in.readableBytes() >= 3 && in.getByte(0) == 22;
if (ssl || (in.readableBytes() >= 3 && in.getCharSequence(0, 3, StandardCharsets.UTF_8).equals("GET")) || (in.readableBytes() >= 4 && in.getCharSequence(0, 4, StandardCharsets.UTF_8).equals("POST"))) {
if (ssl) {
ctx.pipeline().addBefore("eaglercraft-initial-handler", "ws-ssl-handler", EaglercraftInitialHandler.sslContext.newHandler(ctx.alloc()));
ctx.pipeline().addBefore("eaglercraft-initial-handler", "ws-ssl-handler", sslContext.newHandler(ctx.alloc()));
}
ctx.pipeline().addBefore("eaglercraft-initial-handler", "ws-http-codec", new HttpServerCodec());
ctx.pipeline().addBefore("eaglercraft-initial-handler", "ws-http-aggregator", new HttpObjectAggregator(65535, true));
@ -98,15 +100,22 @@ public class EaglercraftInitialHandler extends ByteToMessageDecoder {
}
}
static {
public static void renewCerts() {
final long currTime = System.currentTimeMillis();
if (currTime - lastTime <= 1000 * 60 * 60) return;
lastTime = currTime;
final File certFolder = new File("certs");
if (certFolder.exists()) {
try {
EaglercraftInitialHandler.sslContext = SslContextBuilder.forServer(new File(certFolder, "fullchain.pem"), new File(certFolder, "privkey.pem")).build();
sslContext = SslContextBuilder.forServer(new File(certFolder, "fullchain.pem"), new File(certFolder, "privkey.pem")).build();
} catch (Throwable e) {
throw new RuntimeException("Failed to load SSL context", e);
}
}
}
static {
renewCerts();
try {
initChannelMethod = PassthroughClient2ProxyChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
initChannelMethod.setAccessible(true);
@ -121,6 +130,6 @@ public class EaglercraftInitialHandler extends ByteToMessageDecoder {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
}

3
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/FunnyConfig.java
View File

@ -7,6 +7,7 @@ import java.net.URL;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
public class FunnyConfig extends Config {
public static boolean premiumSkins = false;
@ -15,7 +16,7 @@ public class FunnyConfig extends Config {
public static int eaglerServerMode = 0;
protected FunnyConfig(File configFile) {
super(configFile);
super(configFile, Logger.getLogger("FunnyConfig"));
}
@Override

8
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/Main.java
View File

@ -18,7 +18,7 @@ import io.netty.util.AttributeKey;
import net.lenni0451.lambdaevents.EventHandler;
import net.raphimc.netminecraft.constants.MCPipeline;
import net.raphimc.netminecraft.netty.connection.NetClient;
import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.types.Types1_6_4;
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.types.Types1_6_4;
import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.plugins.ViaProxyPlugin;
import net.raphimc.viaproxy.plugins.events.Client2ProxyChannelInitializeEvent;
@ -175,7 +175,7 @@ public class Main extends ViaProxyPlugin {
@Override
public void channelInactive(ChannelHandlerContext ctx) {
if (this.handshakeFuture().cause() != null) {
ExceptionUtil.handleNettyException(ctx, this.handshakeFuture().cause(), null);
ExceptionUtil.handleNettyException(ctx, this.handshakeFuture().cause(), null, true);
}
super.closeOutbound();
}
@ -226,7 +226,7 @@ public class Main extends ViaProxyPlugin {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
}
@ -255,7 +255,7 @@ public class Main extends ViaProxyPlugin {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
}
}

2
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/SkinService.java
View File

@ -25,7 +25,7 @@ public class SkinService {
private static void sendData(final ChannelHandlerContext ctx, final byte[] data) {
final ByteBuf bb = ctx.alloc().buffer();
PacketTypes.writeVarInt(bb, MCPackets.S2C_PLUGIN_MESSAGE.getId((((EaglercraftHandler) ctx.pipeline().get("eaglercraft-handler")).version).getVersion()));
PacketTypes.writeVarInt(bb, MCPackets.S2C_CUSTOM_PAYLOAD.getId((((EaglercraftHandler) ctx.pipeline().get("eaglercraft-handler")).version).getVersion()));
PacketTypes.writeString(bb, "EAG|Skins-1.8");
bb.writeBytes(data);
ctx.writeAndFlush(new BinaryWebSocketFrame(bb));

4
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/VoiceServerImpl.java
View File

@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
import net.raphimc.netminecraft.constants.MCPackets;
import net.raphimc.netminecraft.packet.PacketTypes;
import net.raphimc.vialegacy.protocols.release.protocol1_7_2_5to1_6_4.types.Types1_6_4;
import net.raphimc.vialegacy.protocol.release.r1_6_4tor1_7_2_5.types.Types1_6_4;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@ -165,7 +165,7 @@ public class VoiceServerImpl {
bb.setShort(21, bb.writerIndex() - 23);
} else {
if (pluginMessageId <= 0) {
pluginMessageId = MCPackets.S2C_PLUGIN_MESSAGE.getId((((EaglercraftHandler) ctx.pipeline().get("eaglercraft-handler")).version).getVersion());
pluginMessageId = MCPackets.S2C_CUSTOM_PAYLOAD.getId((((EaglercraftHandler) ctx.pipeline().get("eaglercraft-handler")).version).getVersion());
}
PacketTypes.writeVarInt(bb, pluginMessageId);
PacketTypes.writeString(bb, "EAG|Voice-1.8");

2
src/main/java/me/ayunami2000/ayunViaProxyEagUtils/WebSocketActiveNotifier.java
View File

@ -21,6 +21,6 @@ public class WebSocketActiveNotifier extends ChannelInboundHandlerAdapter {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
ExceptionUtil.handleNettyException(ctx, cause, null);
ExceptionUtil.handleNettyException(ctx, cause, null, true);
}
}