2022-05-24 06:56:58 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PanSzelescik <panszelescik@gmail.com>
Date: Thu, 7 Apr 2022 16:13:39 +0200
Subject: [PATCH] Add support for Proxy Protocol
2022-06-08 15:59:48 +02:00
diff --git a/build.gradle.kts b/build.gradle.kts
2024-06-24 00:29:50 +02:00
index 6b98b7589e7673ad08c6cbcaee529a7b2f971d1e..71188b9e59cb155ba007ec8ac65d48d984528204 100644
2022-06-08 15:59:48 +02:00
--- a/build.gradle.kts
+++ b/build.gradle.kts
2024-05-16 02:06:59 +02:00
@@ -28,6 +28,7 @@ dependencies {
2023-07-02 07:00:46 +02:00
log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Paper - Needed to generate meta for our Log4j plugins
runtimeOnly(log4jPlugins.output)
alsoShade(log4jPlugins.output)
2023-10-15 16:41:17 +02:00
+ implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
2022-06-08 15:59:48 +02:00
// Paper end
2024-04-24 22:32:38 +02:00
implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
2024-04-06 21:53:39 +02:00
implementation("org.ow2.asm:asm-commons:9.7")
2022-05-24 06:56:58 +02:00
diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
2024-04-24 22:32:38 +02:00
index c63c194c44646e6bc1a59426552787011fc2ced5..96355e1da8feb6687ea0069dda4a82fcd7e25e8a 100644
2022-05-24 06:56:58 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
2024-04-24 22:32:38 +02:00
@@ -123,6 +123,29 @@ public class ServerConnectionListener {
2023-03-14 22:10:53 +01:00
Connection object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND); // CraftBukkit - decompile error
2022-05-24 06:56:58 +02:00
2023-09-22 17:24:59 +02:00
//ServerConnectionListener.this.connections.add(object); // Paper
2022-05-24 06:56:58 +02:00
+ // Paper start - Add support for Proxy Protocol
2022-06-09 10:51:45 +02:00
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.proxyProtocol) {
2022-05-24 06:56:58 +02:00
+ channel.pipeline().addAfter("timeout", "haproxy-decoder", new io.netty.handler.codec.haproxy.HAProxyMessageDecoder());
+ channel.pipeline().addAfter("haproxy-decoder", "haproxy-handler", new ChannelInboundHandlerAdapter() {
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ if (msg instanceof io.netty.handler.codec.haproxy.HAProxyMessage message) {
2022-06-01 23:58:22 +02:00
+ if (message.command() == io.netty.handler.codec.haproxy.HAProxyCommand.PROXY) {
+ String realaddress = message.sourceAddress();
+ int realport = message.sourcePort();
2022-05-24 06:56:58 +02:00
+
2022-06-01 23:58:22 +02:00
+ SocketAddress socketaddr = new java.net.InetSocketAddress(realaddress, realport);
2022-05-24 06:56:58 +02:00
+
2022-06-01 23:58:22 +02:00
+ Connection connection = (Connection) channel.pipeline().get("packet_handler");
+ connection.address = socketaddr;
+ }
2022-05-24 06:56:58 +02:00
+ } else {
+ super.channelRead(ctx, msg);
+ }
+ }
+ });
+ }
2024-01-18 18:52:00 +01:00
+ // Paper end - Add support for proxy protocol
2024-01-22 19:01:10 +01:00
pending.add(object); // Paper - prevent blocking on adding a new connection while the server is ticking
2023-09-22 17:24:59 +02:00
((Connection) object).configurePacketHandler(channelpipeline);
((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));