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
2023-10-15 16:41:17 +02:00
index c545e94e4d045bc698b45e6b602ff481419fad52..a79461457ea19339f47572c70705d655ebc55276 100644
2022-06-08 15:59:48 +02:00
--- a/build.gradle.kts
+++ b/build.gradle.kts
2023-07-02 07:00:46 +02:00
@@ -30,6 +30,7 @@ dependencies {
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
2022-12-07 22:57:15 +01:00
implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
2023-09-21 18:48:55 +02:00
implementation("org.ow2.asm:asm:9.5")
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
2023-09-23 03:45:34 +02:00
index 54c7f34ba3dc8466223e589702d0c93af8cf52a0..79326308f6126f84a3cbb3d5a33302de048d8a50 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
2023-09-23 03:45:34 +02:00
@@ -111,6 +111,12 @@ public class ServerConnectionListener {
2022-05-24 06:56:58 +02:00
ServerConnectionListener.LOGGER.info("Paper: Using " + com.velocitypowered.natives.util.Natives.cipher.getLoadedVariant() + " cipher from Velocity.");
// Paper end
+ // Paper start - indicate Proxy Protocol usage
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
+ ServerConnectionListener.LOGGER.info("Paper: Using Proxy Protocol");
+ }
+ // Paper end
+
this.channels.add(((ServerBootstrap) ((ServerBootstrap) (new ServerBootstrap()).channel(oclass)).childHandler(new ChannelInitializer<Channel>() {
protected void initChannel(Channel channel) {
2023-09-22 17:24:59 +02:00
Connection.setInitialProtocolAttributes(channel);
2023-09-23 03:45:34 +02:00
@@ -129,6 +135,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);
+ }
+ }
+ });
+ }
+ // Paper end
2023-03-14 22:10:53 +01:00
pending.add(object); // Paper
2023-09-22 17:24:59 +02:00
((Connection) object).configurePacketHandler(channelpipeline);
((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));