From 47c4790542d5ca23264816e8ecad13518b8294e6 Mon Sep 17 00:00:00 2001 From: _tomcraft <936063+tomcraft@users.noreply.github.com> Date: Sun, 3 Jul 2022 17:06:31 +0200 Subject: [PATCH] Updated Upstream (BungeeCord) (#762) Co-authored-by: Thomas A --- BungeeCord | 2 +- BungeeCord-Patches/0001-POM-Changes.patch | 39 ++++++++++--- .../0010-Optimize-uuid-conversions.patch | 8 +-- ...019-Improve-server-list-ping-logging.patch | 10 ++-- ...perty-to-accept-invalid-ping-packets.patch | 8 +-- ...-to-the-player-s-LoginResult-on-Logi.patch | 8 +-- ...nally-log-InitialHandler-connections.patch | 8 +-- ...0050-Speed-up-some-common-exceptions.patch | 10 ++-- .../0055-Add-auth-url-option.patch | 10 ++-- ...onfigurable-plugin-messaging-limits.patch} | 8 +-- ...trip-hostname-from-InetSocketAddress.patch | 55 ------------------- ...1-ServerConnectRequest-sendFeedback.patch} | 6 +- ...ions-to-the-client-during-kicks-etc.patch} | 6 +- ...0063-Improve-login-state-transition.patch} | 10 ++-- ...version-to-packet-not-found-message.patch} | 4 +- ...-Expand-packet-decode-logging-usage.patch} | 4 +- 16 files changed, 82 insertions(+), 114 deletions(-) rename BungeeCord-Patches/{0061-Configurable-plugin-messaging-limits.patch => 0060-Configurable-plugin-messaging-limits.patch} (96%) delete mode 100644 BungeeCord-Patches/0060-Strip-hostname-from-InetSocketAddress.patch rename BungeeCord-Patches/{0062-ServerConnectRequest-sendFeedback.patch => 0061-ServerConnectRequest-sendFeedback.patch} (97%) rename BungeeCord-Patches/{0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch => 0062-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch} (91%) rename BungeeCord-Patches/{0064-Improve-login-state-transition.patch => 0063-Improve-login-state-transition.patch} (83%) rename BungeeCord-Patches/{0065-Add-protocol-version-to-packet-not-found-message.patch => 0064-Add-protocol-version-to-packet-not-found-message.patch} (94%) rename BungeeCord-Patches/{0066-Expand-packet-decode-logging-usage.patch => 0065-Expand-packet-decode-logging-usage.patch} (94%) diff --git a/BungeeCord b/BungeeCord index ff5727c..587fb37 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit ff5727c5ef9c0b56ad35f9816ae6bd660b622cf0 +Subproject commit 587fb37bdf3438708649c18c9271ec20bb36e74b diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index 9ac4b5a..2745b54 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From 51eef67f33ed5ea9b51cef40c7b6a0065950ef5b Mon Sep 17 00:00:00 2001 +From 2878cc18bda9fe2749a957a38f844167cd04c302 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 19:33:31 +0200 Subject: [PATCH] POM Changes @@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes - Deploy to papermc mvn repo diff --git a/api/pom.xml b/api/pom.xml -index 22735ae6..2004c741 100644 +index cb42d641..601c195d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,42 @@ @@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644 return; } diff --git a/chat/pom.xml b/chat/pom.xml -index a8a94a9c..3ac27114 100644 +index 4efc70d2..1a8b097d 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,19 +4,19 @@ @@ -175,7 +175,7 @@ index a8a94a9c..3ac27114 100644 diff --git a/config/pom.xml b/config/pom.xml -index 6557b88d..ac721ee3 100644 +index 87c66f57..0b48084a 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ @@ -319,6 +319,29 @@ index cb15b266..c4ad20de 100644 1.19-R0.1-SNAPSHOT jar +diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml +index a43919ef..17d3dc71 100644 +--- a/module/cmd-kick/pom.xml ++++ b/module/cmd-kick/pom.xml +@@ -4,14 +4,14 @@ + 4.0.0 + + +- net.md-5 +- bungeecord-module ++ io.github.waterfallmc ++ waterfall-module + 1.19-R0.1-SNAPSHOT + ../pom.xml + + +- net.md-5 +- bungeecord-module-cmd-kick ++ io.github.waterfallmc ++ waterfall-module-cmd-kick + 1.19-R0.1-SNAPSHOT + jar + diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml index 81a660bf..9e22202d 100644 --- a/module/cmd-list/pom.xml @@ -389,7 +412,7 @@ index f9de38c4..86faab24 100644 jar diff --git a/module/pom.xml b/module/pom.xml -index cbc26049..b4283e43 100644 +index 961560dc..0de7979e 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,19 +4,19 @@ @@ -418,7 +441,7 @@ index cbc26049..b4283e43 100644 cmd-alert -@@ -28,15 +28,15 @@ +@@ -29,15 +29,15 @@ @@ -749,7 +772,7 @@ index de6bd2e0..93ae5952 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index af8f76b2..a86eb68c 100644 +index 5fd3a2ec..a6737787 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -861,5 +884,5 @@ index 5ea69b24..72eb14e2 100644 compile -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch index fd7e23a..9f5114b 100644 --- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch +++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch @@ -1,4 +1,4 @@ -From 61b1a00d4692ae14d22c3afa416782d1a4ccb9e1 Mon Sep 17 00:00:00 2001 +From ded65c68dbb3e3e6142fe65ffa99b5f2fb34e03a Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 14 Mar 2016 15:40:44 -0700 Subject: [PATCH] Optimize uuid conversions @@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 100644 } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 62408738..8fedbe2f 100644 +index c5365630..ba0fafff 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -666,7 +666,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -686,7 +686,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getUUID() { @@ -263,5 +263,5 @@ index 62408738..8fedbe2f 100644 @Override -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch index 68021da..07ce354 100644 --- a/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From d2d96de49624a5acba2706ed3e3f82b35c28a488 Mon Sep 17 00:00:00 2001 +From 8c7873b4e4451e63fd767c13fecbd271fb0dc1aa Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Sat, 12 Dec 2015 23:43:30 +0100 Subject: [PATCH] Improve server list ping logging @@ -31,10 +31,10 @@ index a047c8b7..f8691bc4 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 8fedbe2f..92b4044a 100644 +index ba0fafff..8c20449b 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -672,20 +672,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -692,20 +692,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String toString() { @@ -57,7 +57,7 @@ index 8fedbe2f..92b4044a 100644 @Override diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java -index e6d5da03..58736e6f 100644 +index 147e5b20..d560cef6 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java @@ -313,6 +313,6 @@ public class UpstreamBridge extends PacketHandler @@ -69,5 +69,5 @@ index e6d5da03..58736e6f 100644 } } -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch index 87e7a38..0e834e2 100644 --- a/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch +++ b/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch @@ -1,4 +1,4 @@ -From f4aedd7b64a5bea3be53b9851f99dc99cdf76016 Mon Sep 17 00:00:00 2001 +From e23e1824d99060dac05dfa138a89cecf5920defd Mon Sep 17 00:00:00 2001 From: Techcable Date: Sun, 7 Feb 2016 00:01:19 -0700 Subject: [PATCH] Add a property to accept invalid ping packets @@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm Fixes #23 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 92b4044a..bb227151 100644 +index 8c20449b..8fbd820e 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -279,10 +279,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -299,10 +299,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.PING; } @@ -29,5 +29,5 @@ index 92b4044a..bb227151 100644 disconnect( "" ); } -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch index 2eae907..c379790 100644 --- a/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch +++ b/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch @@ -1,4 +1,4 @@ -From 024863bb9a8e05fd8a0f686789058d75ca352140 Mon Sep 17 00:00:00 2001 +From 4b919fbfee76c472739751674934fb94e60cb229 Mon Sep 17 00:00:00 2001 From: phenomax Date: Thu, 10 Aug 2017 18:41:17 +0200 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent @@ -52,10 +52,10 @@ similarity index 100% rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index bb227151..dd3f634b 100644 +index 8fbd820e..4346fb61 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -580,7 +580,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -600,7 +600,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection }; // fire login event @@ -65,5 +65,5 @@ index bb227151..dd3f634b 100644 @Override -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch index 88c9c86..b87aa15 100644 --- a/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch +++ b/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch @@ -1,4 +1,4 @@ -From 05d7b94ad0595d30841f876dec59c7860a5a6dac Mon Sep 17 00:00:00 2001 +From 663e69c551c1b12c383ea530e622702741deb2fc Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 8 Feb 2018 19:10:52 +0100 Subject: [PATCH] Optionally log InitialHandler connections @@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644 public String getGameVersion() { return gameVersion; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index dd3f634b..edd44135 100644 +index 4346fb61..28c799a8 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -333,7 +333,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -353,7 +353,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection break; case 2: // Login @@ -77,5 +77,5 @@ index dd3f634b..edd44135 100644 ch.setProtocol( Protocol.LOGIN ); -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch index 8b1a66f..2948dbc 100644 --- a/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch +++ b/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch @@ -1,4 +1,4 @@ -From 9ef43c2b8ed992ad9637f1fae53685c0d728a6e1 Mon Sep 17 00:00:00 2001 +From 5aa22408113b9c0b0ccce71033c9521faf8abd84 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 25 Nov 2019 19:54:06 +0000 Subject: [PATCH] Speed up some common exceptions @@ -67,7 +67,7 @@ index 6c0ef4df..f20104a2 100644 + // Waterfall end } diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java -index 9d7d4b9a..18e548df 100644 +index 5a330607..c4af6e76 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java @@ -19,6 +19,9 @@ import se.llbit.nbt.Tag; @@ -146,7 +146,7 @@ index b68b33a9..f5e414c1 100644 { if ( slice != null ) diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index edd44135..08af9d08 100644 +index 28c799a8..73291d98 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -15,6 +15,8 @@ import java.util.Set; @@ -158,7 +158,7 @@ index edd44135..08af9d08 100644 import lombok.Getter; import lombok.RequiredArgsConstructor; import net.md_5.bungee.BungeeCord; -@@ -445,6 +447,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -465,6 +467,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); @@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644 // Waterfall start -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0055-Add-auth-url-option.patch b/BungeeCord-Patches/0055-Add-auth-url-option.patch index 2b5edbc..2119c8b 100644 --- a/BungeeCord-Patches/0055-Add-auth-url-option.patch +++ b/BungeeCord-Patches/0055-Add-auth-url-option.patch @@ -1,14 +1,14 @@ -From b78de0f634a40113cb39413031632f37d1416477 Mon Sep 17 00:00:00 2001 +From 8be1b66e9dd818b0c2eae17c9fa689a421c9b4f3 Mon Sep 17 00:00:00 2001 From: theminecoder Date: Sun, 19 Jul 2020 10:18:23 +1000 Subject: [PATCH] Add auth url option diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 08af9d08..86d28d1c 100644 +index 73291d98..23331fef 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException; +@@ -75,6 +75,8 @@ import net.md_5.bungee.util.QuietException; public class InitialHandler extends PacketHandler implements PendingConnection { @@ -17,7 +17,7 @@ index 08af9d08..86d28d1c 100644 private final BungeeCord bungee; private ChannelWrapper ch; @Getter -@@ -473,7 +475,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -493,7 +495,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" ); String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : ""; @@ -27,5 +27,5 @@ index 08af9d08..86d28d1c 100644 Callback handler = new Callback() { -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch b/BungeeCord-Patches/0060-Configurable-plugin-messaging-limits.patch similarity index 96% rename from BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch rename to BungeeCord-Patches/0060-Configurable-plugin-messaging-limits.patch index 8c1eab8..952661b 100644 --- a/BungeeCord-Patches/0061-Configurable-plugin-messaging-limits.patch +++ b/BungeeCord-Patches/0060-Configurable-plugin-messaging-limits.patch @@ -1,4 +1,4 @@ -From 2e8fb2517d4ac85d3899e73004d2b8c9909d1eca Mon Sep 17 00:00:00 2001 +From e16ae67a7e63df323062bcfca6c0753c57817b3e Mon Sep 17 00:00:00 2001 From: FivePB Date: Tue, 16 Nov 2021 21:15:32 +0100 Subject: [PATCH] Configurable plugin messaging limits @@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 100644 + } } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 8da4708b..d55f2072 100644 +index 23331fef..045367d0 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -708,9 +708,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -728,9 +728,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection for ( String id : content.split( "\0" ) ) { @@ -101,5 +101,5 @@ index 8da4708b..d55f2072 100644 } } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) ) -- -2.36.1 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0060-Strip-hostname-from-InetSocketAddress.patch b/BungeeCord-Patches/0060-Strip-hostname-from-InetSocketAddress.patch deleted file mode 100644 index b7b1f10..0000000 --- a/BungeeCord-Patches/0060-Strip-hostname-from-InetSocketAddress.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b19515dd32b044235453e6e2f4342b6513ca81b1 Mon Sep 17 00:00:00 2001 -From: mibac138 <5672750+mibac138@users.noreply.github.com> -Date: Tue, 20 Jul 2021 00:47:59 +0200 -Subject: [PATCH] Strip hostname from InetSocketAddress - -Recently PaperSpigot added a host check that doesn't allow hostnames -in ip addresses and if a hostname is present then it kicks the player -with a configure ip forwarding in bungee to connect error message. -By default Bungee doesn't actually include the hostname (as to include -it you need to call getHostName which triggers reverse service lookups -that add the hostname info). However, the only thing a bungee plugin -needs to do is to call addr.getHostName() in PlayerLoginEvent to -trigger this and block the player from joining any recent paper servers. -This change strips the hostname from the ip address sent to the proxied -server thus fixing this issue. Example address sent before: -`123.123.123.123.ipv4.supernova.orange.pl` -after: -`123.123.123.123`. - -Context: -hi! i have a papermc 1.16.5 and bungeecord server. i updated papermc and -the server started rejecting me saying i need to configure If you wish -to use IP forwarding, please enable it in your BungeeCord config as -well but everything in config was good. so i started digging and -found out papermc added a host_check like this -Pattern HOST_PATTERN = Pattern.compile("[0-9a-f\\.:]{0,45}"); -If this pattern doesn't match the hostname in -PacketHandshakeSetProtocol, the server kicks the user with the above -message. In debug I saw that my hostname looks like this: -123.123.123.123.ipv4.supernova.orange.pl. I messaged papermc about this -and they said an dns resolved ip like this should not be possible. -I started digging in bungeecord and found out an innocent plugin that -called getConnection().getAddress().getHostName() caused the address to -gain the ipv4..... suffix (getHostName does that under the hood). -I once again contacted paper devs about this and was told this is a -bungeecord issue, and its not on their side. So, long story short, -when connecting to a proxied server you need to make sure not to send -the host name - -diff --git a/proxy/src/main/java/net/md_5/bungee/util/AddressUtil.java b/proxy/src/main/java/net/md_5/bungee/util/AddressUtil.java -index 03dabe01..464acc6c 100644 ---- a/proxy/src/main/java/net/md_5/bungee/util/AddressUtil.java -+++ b/proxy/src/main/java/net/md_5/bungee/util/AddressUtil.java -@@ -11,7 +11,7 @@ public class AddressUtil - - public static String sanitizeAddress(InetSocketAddress addr) - { -- String string = addr.getHostString(); -+ String string = addr.getAddress().getHostAddress(); // Waterfall - - // Remove IPv6 scope if present - if ( addr.getAddress() instanceof Inet6Address ) --- -2.30.1 (Apple Git-130) - diff --git a/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch b/BungeeCord-Patches/0061-ServerConnectRequest-sendFeedback.patch similarity index 97% rename from BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch rename to BungeeCord-Patches/0061-ServerConnectRequest-sendFeedback.patch index 224781a..6b5f493 100644 --- a/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch +++ b/BungeeCord-Patches/0061-ServerConnectRequest-sendFeedback.patch @@ -1,4 +1,4 @@ -From 81f33d0361fe054eb0b66be221ba133b2807bc7f Mon Sep 17 00:00:00 2001 +From e464662942d3aa32ab99b80a37586aec91fde652 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 16 Apr 2021 06:29:28 +0100 Subject: [PATCH] ServerConnectRequest#sendFeedback @@ -31,7 +31,7 @@ index c81b0a4e..d21370be 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index 9600381f..76ab395f 100644 +index 5961392a..eb236957 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer @@ -90,5 +90,5 @@ index 9600381f..76ab395f 100644 } } -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch b/BungeeCord-Patches/0062-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch similarity index 91% rename from BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch rename to BungeeCord-Patches/0062-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch index a0ad114..e13edcc 100644 --- a/BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch +++ b/BungeeCord-Patches/0062-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch @@ -1,4 +1,4 @@ -From b6efd29f61cc65d119459129bef01fa9c597f0ab Mon Sep 17 00:00:00 2001 +From bc5d7679dfba5cfbd19fe085d3d3ddeea12375d8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 22 Mar 2022 14:56:44 +0000 Subject: [PATCH] Don't send exceptions to the client during kicks, etc @@ -13,7 +13,7 @@ allows for retaining much of the overall context here, i.e. who was this exception assocated with? diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index 76ab395f..b7d363b8 100644 +index eb236957..b44d13e5 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -399,7 +399,8 @@ public final class UserConnection implements ProxiedPlayer @@ -27,5 +27,5 @@ index 76ab395f..b7d363b8 100644 @Override -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0064-Improve-login-state-transition.patch b/BungeeCord-Patches/0063-Improve-login-state-transition.patch similarity index 83% rename from BungeeCord-Patches/0064-Improve-login-state-transition.patch rename to BungeeCord-Patches/0063-Improve-login-state-transition.patch index b0c8d4f..264a05e 100644 --- a/BungeeCord-Patches/0064-Improve-login-state-transition.patch +++ b/BungeeCord-Patches/0063-Improve-login-state-transition.patch @@ -1,14 +1,14 @@ -From 1e23d498d1dfb7fde40e21640d9635781fa5cd87 Mon Sep 17 00:00:00 2001 +From 2e698622a4878492e35ab62f13a6cfc0ce6672bf Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 8 May 2022 12:04:30 +0100 Subject: [PATCH] Improve login state transition diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 51d5bde4..c973ca63 100644 +index 045367d0..24893418 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -447,6 +447,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -467,6 +467,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection { Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" ); Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" ); @@ -16,7 +16,7 @@ index 51d5bde4..c973ca63 100644 SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request ); // Waterfall start -@@ -501,7 +502,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -521,7 +522,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection } } }; @@ -26,5 +26,5 @@ index 51d5bde4..c973ca63 100644 } -- -2.35.3 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0065-Add-protocol-version-to-packet-not-found-message.patch b/BungeeCord-Patches/0064-Add-protocol-version-to-packet-not-found-message.patch similarity index 94% rename from BungeeCord-Patches/0065-Add-protocol-version-to-packet-not-found-message.patch rename to BungeeCord-Patches/0064-Add-protocol-version-to-packet-not-found-message.patch index 4c7bea5..11dcc45 100644 --- a/BungeeCord-Patches/0065-Add-protocol-version-to-packet-not-found-message.patch +++ b/BungeeCord-Patches/0064-Add-protocol-version-to-packet-not-found-message.patch @@ -1,4 +1,4 @@ -From 762364cf2a5d421d0cee0879b1ec4220e5d0198d Mon Sep 17 00:00:00 2001 +From d6845b93f7ca753a60b13ce6cae5bf6c4199461d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 12 Jun 2022 06:45:54 +0100 Subject: [PATCH] Add protocol version to packet not found message @@ -34,5 +34,5 @@ index 1b5189c1..f5a675a9 100644 } } -- -2.36.1 +2.32.1 (Apple Git-133) diff --git a/BungeeCord-Patches/0066-Expand-packet-decode-logging-usage.patch b/BungeeCord-Patches/0065-Expand-packet-decode-logging-usage.patch similarity index 94% rename from BungeeCord-Patches/0066-Expand-packet-decode-logging-usage.patch rename to BungeeCord-Patches/0065-Expand-packet-decode-logging-usage.patch index 6c6e9de..0945c27 100644 --- a/BungeeCord-Patches/0066-Expand-packet-decode-logging-usage.patch +++ b/BungeeCord-Patches/0065-Expand-packet-decode-logging-usage.patch @@ -1,4 +1,4 @@ -From ec009a979056edb2b9db738ba7925399362cd54a Mon Sep 17 00:00:00 2001 +From 89e029d78808f9db204b1552e22cdbb47cdf6da5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 19 Jun 2022 10:31:51 +0100 Subject: [PATCH] Expand packet-decode-logging usage @@ -24,5 +24,5 @@ index 33494237..29cf4b4f 100644 { ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[] -- -2.36.1 +2.32.1 (Apple Git-133)