get client address

Author: valaphee

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

@@ -233,7 +233,7 @@ private ServerBootstrap createBootstrap() {
             .childHandler(serverInitializer);
     }
 
-    public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
+    public boolean onConnectionRequest(InetSocketAddress inetSocketAddress, InetSocketAddress clientAddress) {
         List<String> allowedProxyIPs = geyser.config().advanced().bedrock().haproxyProtocolWhitelistedIps();
         if (geyser.config().advanced().bedrock().useHaproxyProtocol() && !allowedProxyIPs.isEmpty()) {
             boolean isWhitelistedIP = false;
@@ -250,11 +250,11 @@ public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
             }
         }
 
-        String ip = geyser.config().logPlayerIpAddresses() ? inetSocketAddress.toString() : "<IP address withheld>";
+        String ip = geyser.config().logPlayerIpAddresses() ? clientAddress.toString() : "<IP address withheld>";
 
         ConnectionRequestEvent requestEvent = new ConnectionRequestEvent(
-            inetSocketAddress,
-            null // TODO
+            clientAddress,
+            geyser.config().advanced().bedrock().useHaproxyProtocol() ? inetSocketAddress : null
         );
         geyser.eventBus().fire(requestEvent);
         if (requestEvent.isCancelled()) {
@@ -268,9 +268,9 @@ public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
         return true;
     }
 
-    public BedrockPong onQuery(Channel channel, InetSocketAddress inetSocketAddress) {
+    public BedrockPong onQuery(Channel channel, InetSocketAddress inetSocketAddress, InetSocketAddress clientAddress) {
         if (geyser.config().debugMode() && PRINT_DEBUG_PINGS) {
-            String ip = geyser.config().logPlayerIpAddresses() ? inetSocketAddress.toString() : "<IP address withheld>";
+            String ip = geyser.config().logPlayerIpAddresses() ? clientAddress.toString() : "<IP address withheld>";
             geyser.getLogger().debug(GeyserLocale.getLocaleStringLog("geyser.network.pinged", ip));
         }
 

core/src/main/java/org/geysermc/geyser/network/netty/handler/RakConnectionRequestHandler.java

@@ -33,6 +33,7 @@
 import io.netty.channel.socket.DatagramPacket;
 import lombok.RequiredArgsConstructor;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.cloudburstmc.netty.channel.raknet.RakServerChannel;
 import org.cloudburstmc.netty.channel.raknet.config.RakChannelOption;
 import org.geysermc.geyser.network.netty.GeyserServer;
 
@@ -84,8 +85,10 @@ public void channelRead(@NonNull ChannelHandlerContext ctx, @NonNull Object msg)
         ByteBuf magicBuf = ctx.channel().config().getOption(RakChannelOption.RAK_UNCONNECTED_MAGIC);
         long guid = ctx.channel().config().getOption(RakChannelOption.RAK_GUID);
 
-        if (!this.server.onConnectionRequest(packet.sender())) {
-            this.sendConnectionBanned(ctx, packet.sender(), magicBuf, guid);
+        InetSocketAddress address = packet.sender();
+        InetSocketAddress clientAddress = ((RakServerChannel) ctx.channel()).getClientAddress(address);
+        if (!this.server.onConnectionRequest(address, clientAddress)) {
+            this.sendConnectionBanned(ctx, address, magicBuf, guid);
         } else {
             ctx.fireChannelRead(msg);
         }

core/src/main/java/org/geysermc/geyser/network/netty/handler/RakPingHandler.java

@@ -31,9 +31,12 @@
 import lombok.RequiredArgsConstructor;
 import org.cloudburstmc.netty.channel.raknet.RakPing;
 import org.cloudburstmc.netty.channel.raknet.RakPong;
+import org.cloudburstmc.netty.channel.raknet.RakServerChannel;
 import org.cloudburstmc.netty.channel.raknet.config.RakChannelOption;
 import org.geysermc.geyser.network.netty.GeyserServer;
 
+import java.net.InetSocketAddress;
+
 @ChannelHandler.Sharable
 @RequiredArgsConstructor
 public class RakPingHandler extends SimpleChannelInboundHandler<RakPing> {
@@ -45,7 +48,9 @@ public class RakPingHandler extends SimpleChannelInboundHandler<RakPing> {
     protected void channelRead0(ChannelHandlerContext ctx, RakPing msg) {
         long guid = ctx.channel().config().getOption(RakChannelOption.RAK_GUID);
 
-        RakPong pong = msg.reply(guid, this.server.onQuery(ctx.channel(), msg.getSender()).toByteBuf());
+        InetSocketAddress address = msg.getSender();
+        InetSocketAddress clientAddress = ((RakServerChannel) ctx.channel()).getClientAddress(address);
+        RakPong pong = msg.reply(guid, this.server.onQuery(ctx.channel(), address, clientAddress).toByteBuf());
         ctx.writeAndFlush(pong);
     }
 }