mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-07-05 19:04:43 +02:00
85c0a35f0b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 6613aaea Add test fix for library classes being visible to non-dependent plugins 53ce6b93 #3200: Fix protocol for 21w40a d8e29384 #2466: Use switch in "BungeeCord" plugin message handling 5cf869df #3198: Remove terminally deprecated SecurityManager f26f7d88 Add optional 1.18 (21w40a) snapshot protocol support
34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
From eb08195f059ee1135c1eee1bc86089a83b6d2f95 Mon Sep 17 00:00:00 2001
|
|
From: Tux <write@imaginarycode.com>
|
|
Date: Tue, 25 Oct 2016 12:34:41 -0400
|
|
Subject: [PATCH] Validate that chat messages are non-blank
|
|
|
|
|
|
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 30623743..c769976f 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
|
|
@@ -147,6 +147,7 @@ public class UpstreamBridge extends PacketHandler
|
|
@Override
|
|
public void handle(Chat chat) throws Exception
|
|
{
|
|
+ boolean empty = true;
|
|
for ( int index = 0, length = chat.getMessage().length(); index < length; index++ )
|
|
{
|
|
char c = chat.getMessage().charAt( index );
|
|
@@ -154,8 +155,11 @@ public class UpstreamBridge extends PacketHandler
|
|
{
|
|
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
|
|
throw CancelSendSignal.INSTANCE;
|
|
+ } else if (empty && !Character.isWhitespace(c)) {
|
|
+ empty = false;
|
|
}
|
|
}
|
|
+ Preconditions.checkArgument(!empty, "Chat message is empty");
|
|
|
|
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
|
|
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
|
|
--
|
|
2.30.1 (Apple Git-130)
|
|
|