remove HAProxy handling

Author: valaphee

core/src/main/java/org/geysermc/geyser/network/GeyserServerInitializer.java

@@ -63,13 +63,6 @@ protected void preInitChannel(Channel channel) throws Exception {
     @Override
     public void initSession(@NonNull BedrockServerSession bedrockServerSession) {
         try {
-            if (this.geyser.getGeyserServer().getProxiedAddresses() != null) {
-                InetSocketAddress address = this.geyser.getGeyserServer().getProxiedAddresses().get((InetSocketAddress) bedrockServerSession.getSocketAddress());
-                if (address != null) {
-                    ((GeyserBedrockPeer) bedrockServerSession.getPeer()).setProxiedAddress(address);
-                }
-            }
-
             bedrockServerSession.setLogging(this.geyser.config().debugMode());
             GeyserSession session = new GeyserSession(this.geyser, bedrockServerSession, this.eventLoopGroup.next());
 

core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java

@@ -200,11 +200,6 @@ public PacketSignal handle(LoginPacket loginPacket) {
         }
         receivedLoginPacket = true;
 
-        if (geyser.getSessionManager().reachedMaxConnectionsPerAddress(session)) {
-            session.disconnect("Too many connections are originating from this location!");
-            return PacketSignal.HANDLED;
-        }
-
         LoginEncryptionUtils.encryptPlayerConnection(session, loginPacket);
 
         if (session.isClosed()) {

core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java

@@ -54,9 +54,7 @@
 import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.network.GeyserServerInitializer;
 import org.geysermc.geyser.network.netty.handler.RakConnectionRequestHandler;
-import org.geysermc.geyser.network.netty.handler.RakGeyserRateLimiter;
 import org.geysermc.geyser.network.netty.handler.RakPingHandler;
-import org.geysermc.geyser.network.netty.proxy.ProxyServerHandler;
 import org.geysermc.geyser.ping.GeyserPingInfo;
 import org.geysermc.geyser.ping.IGeyserPingPassthrough;
 import org.geysermc.geyser.skin.SkinProvider;
@@ -107,8 +105,6 @@ public final class GeyserServer {
     private final ServerBootstrap bootstrap;
     private EventLoopGroup playerGroup;
 
-    @Getter
-    private final ExpiringMap<InetSocketAddress, InetSocketAddress> proxiedAddresses;
     private int listenCount;
 
     private ChannelFuture[] bootstrapFutures;
@@ -136,14 +132,6 @@ public GeyserServer(GeyserImpl geyser, int threadCount) {
             this.listenCount = 1;
         }
 
-        if (this.geyser.config().advanced().bedrock().useHaproxyProtocol() || this.geyser.config().advanced().bedrock().useWaterdogpeForwarding()) {
-            this.proxiedAddresses = ExpiringMap.builder()
-                    .expiration(30 + 1, TimeUnit.MINUTES)
-                    .expirationPolicy(ExpirationPolicy.ACCESSED).build();
-        } else {
-            this.proxiedAddresses = null;
-        }
-
         this.broadcastPort = geyser.config().advanced().bedrock().broadcastPort();
     }
 
@@ -171,19 +159,9 @@ private void modifyHandlers(ChannelFuture future) {
                 .addFirst(RakConnectionRequestHandler.NAME, new RakConnectionRequestHandler(this))
                 .addAfter(RakServerOfflineHandler.NAME, RakPingHandler.NAME, new RakPingHandler(this));
 
-            // Add proxy handler
-            boolean isProxyProtocol = this.geyser.config().advanced().bedrock().useHaproxyProtocol();
-            if (isProxyProtocol) {
-                channel.pipeline().addFirst("proxy-protocol-decoder", new ProxyServerHandler());
-            }
-
-            boolean isWhitelistedProxyProtocol = isProxyProtocol && !this.geyser.config().advanced().bedrock().haproxyProtocolWhitelistedIps().isEmpty();
-            if (Boolean.parseBoolean(System.getProperty("Geyser.RakRateLimitingDisabled", "false")) || isWhitelistedProxyProtocol) {
+            if (Boolean.parseBoolean(System.getProperty("Geyser.RakRateLimitingDisabled", "false"))) {
                 // We would already block any non-whitelisted IP addresses in onConnectionRequest so we can remove the rate limiter
                 channel.pipeline().remove(RakServerRateLimiter.NAME);
-            } else {
-                // Use our own rate limiter to allow multiple players from the same IP
-                channel.pipeline().replace(RakServerRateLimiter.NAME, RakGeyserRateLimiter.NAME, new RakGeyserRateLimiter(channel));
             }
         });
     }
@@ -228,6 +206,9 @@ private ServerBootstrap createBootstrap() {
 
         this.geyser.getLogger().debug("Setting MTU to " + this.geyser.config().advanced().bedrock().mtu());
 
+        int rakMaxConnectionPerIp =  positivePropOrDefault("Geyser.RakPacketLimit", 10);
+        this.geyser.getLogger().debug("Setting RakNet max connection per ip " + rakMaxConnectionPerIp);
+
         int rakPacketLimit = positivePropOrDefault("Geyser.RakPacketLimit", DEFAULT_PACKET_LIMIT);
         this.geyser.getLogger().debug("Setting RakNet packet limit to " + rakPacketLimit);
 
@@ -245,9 +226,11 @@ private ServerBootstrap createBootstrap() {
             .group(group, childGroup)
             .option(RakChannelOption.RAK_HANDLE_PING, true)
             .option(RakChannelOption.RAK_MAX_MTU, this.geyser.config().advanced().bedrock().mtu())
+            .option(RakChannelOption.RAK_MAX_CONNECTIONS, rakMaxConnectionPerIp)
             .option(RakChannelOption.RAK_PACKET_LIMIT, rakPacketLimit)
             .option(RakChannelOption.RAK_GLOBAL_PACKET_LIMIT, rakGlobalPacketLimit)
             .option(RakChannelOption.RAK_SERVER_COOKIE_MODE, rakSendCookie ? RakServerCookieMode.ACTIVE : RakServerCookieMode.INVALID)
+            .option(RakChannelOption.PROXY_PROTOCOL, this.geyser.config().advanced().bedrock().useHaproxyProtocol())
             .childHandler(serverInitializer);
     }
 
@@ -268,20 +251,11 @@ public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
             }
         }
 
-        String ip;
-        if (geyser.config().logPlayerIpAddresses()) {
-            if (this.proxiedAddresses != null) {
-                ip = this.proxiedAddresses.getOrDefault(inetSocketAddress, inetSocketAddress).toString();
-            } else {
-                ip = inetSocketAddress.toString();
-            }
-        } else {
-            ip = "<IP address withheld>";
-        }
+        String ip = geyser.config().logPlayerIpAddresses() ? inetSocketAddress.toString() : "<IP address withheld>";
 
         ConnectionRequestEvent requestEvent = new ConnectionRequestEvent(
-            inetSocketAddress, 
-            this.proxiedAddresses != null ? this.proxiedAddresses.get(inetSocketAddress) : null
+            inetSocketAddress,
+            null // TODO
         );
         geyser.eventBus().fire(requestEvent);
         if (requestEvent.isCancelled()) {
@@ -297,16 +271,7 @@ public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
 
     public BedrockPong onQuery(Channel channel, InetSocketAddress inetSocketAddress) {
         if (geyser.config().debugMode() && PRINT_DEBUG_PINGS) {
-            String ip;
-            if (geyser.config().logPlayerIpAddresses()) {
-                if (this.proxiedAddresses != null) {
-                    ip = this.proxiedAddresses.getOrDefault(inetSocketAddress, inetSocketAddress).toString();
-                } else {
-                    ip = inetSocketAddress.toString();
-                }
-            } else {
-                ip = "<IP address withheld>";
-            }
+            String ip = geyser.config().logPlayerIpAddresses() ? inetSocketAddress.toString() : "<IP address withheld>";
             geyser.getLogger().debug(GeyserLocale.getLocaleStringLog("geyser.network.pinged", ip));
         }