2021-10-09 11:43:12 +02:00
|
|
|
From eb08195f059ee1135c1eee1bc86089a83b6d2f95 Mon Sep 17 00:00:00 2001
|
2016-05-28 18:34:39 +02:00
|
|
|
From: Tux <write@imaginarycode.com>
|
2016-10-25 18:57:11 +02:00
|
|
|
Date: Tue, 25 Oct 2016 12:34:41 -0400
|
2016-05-28 18:34:39 +02:00
|
|
|
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
|
2021-09-29 04:37:21 +02:00
|
|
|
index 30623743..c769976f 100644
|
2016-05-28 18:34:39 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
2021-09-29 04:37:21 +02:00
|
|
|
@@ -147,6 +147,7 @@ public class UpstreamBridge extends PacketHandler
|
2021-07-03 01:00:48 +02:00
|
|
|
@Override
|
|
|
|
public void handle(Chat chat) throws Exception
|
2016-05-28 18:34:39 +02:00
|
|
|
{
|
2021-07-03 01:00:48 +02:00
|
|
|
+ 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
|
|
|
|
{
|
2021-09-29 04:37:21 +02:00
|
|
|
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
|
2021-07-03 01:00:48 +02:00
|
|
|
throw CancelSendSignal.INSTANCE;
|
|
|
|
+ } else if (empty && !Character.isWhitespace(c)) {
|
|
|
|
+ empty = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ Preconditions.checkArgument(!empty, "Chat message is empty");
|
2016-05-28 18:34:39 +02:00
|
|
|
|
2016-11-01 16:51:42 +01:00
|
|
|
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
|
|
|
|
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
|
2016-05-28 18:34:39 +02:00
|
|
|
--
|
2021-10-09 11:43:12 +02:00
|
|
|
2.30.1 (Apple Git-130)
|
2016-05-28 18:34:39 +02:00
|
|
|
|