Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Potential fix for true IP for floodgate players

Browse Source
This commit is contained in:
Lixfel
2025-01-04 21:25:32 +01:00
parent a3490b801e
commit 088965df59
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/listeners/IPSanitizer.java
+16 -4
View File
@@ -20,6 +20,7 @@
package de.steamwar.velocitycore.listeners; package de.steamwar.velocitycore.listeners;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.DisconnectEvent;
import com.velocitypowered.api.event.connection.PreLoginEvent; import com.velocitypowered.api.event.connection.PreLoginEvent;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.proxy.connection.MinecraftConnection; import com.velocitypowered.proxy.connection.MinecraftConnection;
@@ -32,21 +33,32 @@ import de.steamwar.velocitycore.mods.Hostname;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
public class IPSanitizer extends BasicListener { public class IPSanitizer extends BasicListener {
private static final Reflection.Field<MinecraftConnection, SocketAddress> remoteAddress = new Reflection.Field<>(MinecraftConnection.class, "remoteAddress"); private static final Map<UUID, InetAddress> trueAddress = new HashMap<>(); // Will likely slightly leak over time
public static InetAddress getTrueAddress(Player player) { public static InetAddress getTrueAddress(Player player) {
return ((InetSocketAddress) ((ConnectedPlayer)player).getConnection().getChannel().remoteAddress()).getAddress(); return trueAddress.getOrDefault(player.getUniqueId(), ((InetSocketAddress) ((ConnectedPlayer)player).getConnection().getChannel().remoteAddress()).getAddress());
} }
private final InetSocketAddress sanitized = new InetSocketAddress("127.127.127.127", 25565); private static final Reflection.Field<MinecraftConnection, SocketAddress> remoteAddress = new Reflection.Field<>(MinecraftConnection.class, "remoteAddress");
private static final InetSocketAddress sanitized = new InetSocketAddress("127.127.127.127", 25565);
@Subscribe @Subscribe
public void loginEvent(PreLoginEvent e) { public void loginEvent(PreLoginEvent e) {
VelocityCore.getLogger().log(Level.INFO, "%s has logged in with user name %s".formatted(e.getConnection().getRemoteAddress(), e.getUsername())); InetSocketAddress address = e.getConnection().getRemoteAddress();
VelocityCore.getLogger().log(Level.INFO, "%s has logged in with user name %s".formatted(address, e.getUsername()));
trueAddress.put(e.getUniqueId(), address.getAddress());
remoteAddress.set(Hostname.getInitialInboundConnection((LoginInboundConnection) e.getConnection()).getConnection(), sanitized); remoteAddress.set(Hostname.getInitialInboundConnection((LoginInboundConnection) e.getConnection()).getConnection(), sanitized);
} }
@Subscribe
public void disconnectEvent(DisconnectEvent e) {
trueAddress.remove(e.getPlayer().getUniqueId());
}
} }