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-08-14 01:32:51 +02:00
index a62f151047f90ef1db278192b29b3bd3213d4d46..fb98936bb8a5488db75d676c5bcb4060597fbbf8 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-01-14 19:53:32 +01:00
+ implementation("io.netty:netty-codec-haproxy:4.1.87.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-03-10 21:18:50 +01:00
implementation("org.ow2.asm:asm:9.4")
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-06-08 18:09:43 +02:00
index 2beddfc0532c3835d50724551e3d46cb0d7d2290..44d99e89226adb6234b9405f25ac9dab9bd84297 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-06-08 18:09:43 +02:00
@@ -108,6 +108,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) {
try {
2023-06-08 18:09:43 +02:00
@@ -123,6 +129,30 @@ public class ServerConnectionListener {
2022-05-24 06:56:58 +02:00
int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond();
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
+ // 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
//ServerConnectionListener.this.connections.add(object);
pending.add(object); // Paper
channelpipeline.addLast("packet_handler", (ChannelHandler) object);