Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-02 23:23:42 +01:00
Code Issues Projects Releases Wiki Activity

Do not print exceptions for empty chat packets

Browse Source
This commit is contained in:
Shane Freeder 2023-03-31 20:10:50 +01:00
parent fb7c739566
commit 60ca8a096d
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BungeeCord-Patches/0023-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,11 +1,11 @@
From 1ad7c256df61501135b1778df071ad335a9cd86c Mon Sep 17 00:00:00 2001 From e497a697d54e977d9ee969852cd84011c70bf435 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400 Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank 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 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 c30093d7..d72208e7 100644 index c30093d7..7fb79bfd 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -188,6 +188,7 @@ public class UpstreamBridge extends PacketHandler @@ -188,6 +188,7 @@ public class UpstreamBridge extends PacketHandler
@ -16,7 +16,7 @@ index c30093d7..d72208e7 100644
for ( int index = 0, length = message.length(); index < length; index++ ) for ( int index = 0, length = message.length(); index < length; index++ )
{ {
char c = message.charAt( index ); char c = message.charAt( index );
@@ -195,8 +196,11 @@ public class UpstreamBridge extends PacketHandler @@ -195,8 +196,14 @@ public class UpstreamBridge extends PacketHandler
{ {
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) ); con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE; throw CancelSendSignal.INSTANCE;
@ -24,10 +24,13 @@ index c30093d7..d72208e7 100644
+ empty = false; + empty = false;
} }
} }
+ Preconditions.checkArgument(!empty, "Chat message is empty"); + if (empty) {
+ con.disconnect("Chat message is empty");
+ throw CancelSendSignal.INSTANCE;
+ }
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message ); ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() ) if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
-- --
2.38.1 2.40.0