core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dangling sout

This commit is contained in:
Shane Freeder 2021-04-18 22:12:09 +01:00
parent 23afda1795
commit 5e4b88e956
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-Server-Patches/0703-Validate-bungee-forwarded-hostname.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Validate bungee forwarded hostname
Seriously, fix your firewalls. -.- Seriously, fix your firewalls. -.-
diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java diff --git a/src/main/java/net/minecraft/server/network/HandshakeListener.java b/src/main/java/net/minecraft/server/network/HandshakeListener.java
index b97d289afdff81d9959e238639f4e3e186f8e9c8..e13ed3a17866ce3ef0b2ac1dbcb17fb726c89fa8 100644 index b97d289afdff81d9959e238639f4e3e186f8e9c8..423696df365ceb20b673a87714b753d7b3b7a3af 100644
--- a/src/main/java/net/minecraft/server/network/HandshakeListener.java --- a/src/main/java/net/minecraft/server/network/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/network/HandshakeListener.java
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
@ -31,17 +31,17 @@ index b97d289afdff81d9959e238639f4e3e186f8e9c8..e13ed3a17866ce3ef0b2ac1dbcb17fb7
String[] split = packethandshakinginsetprotocol.hostname.split("\00"); String[] split = packethandshakinginsetprotocol.hostname.split("\00");
if ( split.length == 3 || split.length == 4 ) { if ( split.length == 3 || split.length == 4 ) {
+ // Paper start + // Paper start
+ if (!BYPASS_HOSTCHECK && !validate(split[0])) { + if (!BYPASS_HOSTCHECK && !validate(split[1])) {
+ final ChatMessage message = new ChatMessage("Invalid hostname"); + final ChatMessage message = new ChatMessage("Invalid hostname");
+ this.c.sendPacket(new PacketLoginOutDisconnect(message)); + this.getNetworkManager().sendPacket(new PacketLoginOutDisconnect(message));
+ this.c.close(message); + this.getNetworkManager().close(message);
+ return; + return;
+ } + }
+ // Paper end + // Paper end
packethandshakinginsetprotocol.hostname = split[0]; packethandshakinginsetprotocol.hostname = split[0];
c.socketAddress = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) c.getSocketAddress()).getPort()); c.socketAddress = new java.net.InetSocketAddress(split[1], ((java.net.InetSocketAddress) c.getSocketAddress()).getPort());
c.spoofedUUID = com.mojang.util.UUIDTypeAdapter.fromString( split[2] ); c.spoofedUUID = com.mojang.util.UUIDTypeAdapter.fromString( split[2] );
@@ -158,4 +170,10 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -158,4 +170,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
public NetworkManager a() { public NetworkManager a() {
return this.c; return this.c;
} }
@ -51,4 +51,5 @@ index b97d289afdff81d9959e238639f4e3e186f8e9c8..e13ed3a17866ce3ef0b2ac1dbcb17fb7
+ //noinspection UnstableApiUsage + //noinspection UnstableApiUsage
+ return InetAddresses.isUriInetAddress(hostname); + return InetAddresses.isUriInetAddress(hostname);
+ } + }
+ // Paper end
} }