From 0f2425f4faffb37bc2c7fe3577741c078859b48e Mon Sep 17 00:00:00 2001
From: ayunami2000 <spwilliamsiam@gmail.com>
Date: Fri, 6 Oct 2023 15:39:02 -0400
Subject: [PATCH] Add Eaglercraft header passthrough

---
 .../ayunami2000/ayunViaProxyEagUtils/EaglercraftHandler.java   | 3 +++
 src/main/java/me/ayunami2000/ayunViaProxyEagUtils/Main.java    | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglercraftHandler.java b/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglercraftHandler.java
index cd49bf9..eea6da7 100644
--- a/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglercraftHandler.java
+++ b/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/EaglercraftHandler.java
@@ -11,6 +11,7 @@ import com.viaversion.viaversion.protocols.base.ServerboundStatusPackets;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageCodec;
+import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
@@ -49,6 +50,7 @@ public class EaglercraftHandler extends MessageToMessageCodec<WebSocketFrame, By
         }
     }
     public static final AttributeKey<ProfileData> profileDataKey = AttributeKey.newInstance("eagx-profile-data");
+    public static final AttributeKey<HttpHeaders> httpHeadersKey = AttributeKey.newInstance("eag-http-headers");
     private HostAndPort host;
     public State state;
     public VersionEnum version;
@@ -332,6 +334,7 @@ public class EaglercraftHandler extends MessageToMessageCodec<WebSocketFrame, By
                 return;
             }
             this.host = HostAndPort.fromString(handshake.requestHeaders().get("Host").replaceAll("__", ".")).withDefaultPort(80);
+            ctx.channel().attr(httpHeadersKey).set(handshake.requestHeaders());
         }
         super.userEventTriggered(ctx, evt);
     }
diff --git a/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/Main.java b/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/Main.java
index 7f90351..a9341f6 100644
--- a/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/Main.java
+++ b/src/main/java/me/ayunami2000/ayunViaProxyEagUtils/Main.java
@@ -174,9 +174,8 @@ public class Main extends ViaProxyPlugin {
             url.append("/").append(path);
         }
         URI uri = new URI(url.toString());
-        HttpHeaders headers = new DefaultHttpHeaders();
+        HttpHeaders headers = c2p.hasAttr(EaglercraftHandler.httpHeadersKey) ? c2p.attr(EaglercraftHandler.httpHeadersKey).get() : new DefaultHttpHeaders().set(HttpHeaderNames.ORIGIN, "via.shhnowisnottheti.me");
         headers.set(HttpHeaderNames.HOST, uri.getHost() + (addPort ? ":" + uri.getPort() : ""));
-        headers.set(HttpHeaderNames.ORIGIN, "via.shhnowisnottheti.me");
         ch.pipeline().addAfter("eag-server-http-codec", "eag-server-http-aggregator", new HttpObjectAggregator(2097152, true));
         ch.pipeline().addAfter("eag-server-http-aggregator", "eag-server-ws-compression", WebSocketClientCompressionHandler.INSTANCE);
         ch.pipeline().addAfter("eag-server-ws-compression", "eag-server-ws-handshaker", new WebSocketClientProtocolHandler(WebSocketClientHandshakerFactory.newHandshaker(uri, WebSocketVersion.V13, null, true, headers, 2097152)));