mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
4e58ab3809
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@4ce97c1d [ci/skip] Update occurences of version numbers to 1.21.5 (#1658) PurpurMC/Purpur@7f5c4036 Updated Upstream (Paper) PurpurMC/Purpur@4fdf1d11 Updated Upstream (Paper)
35 lines
1.9 KiB
Diff
35 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sat, 1 Feb 2025 19:28:34 +0300
|
|
Subject: [PATCH] Block Log4Shell exploit
|
|
|
|
|
|
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index aecce706f3814b458cf152afd88e3378b3f93d0c..49c7c016ef2060a0ae97a3e62ad3c3269e219998 100644
|
|
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2480,6 +2480,7 @@ public class ServerGamePacketListenerImpl
|
|
}
|
|
|
|
private void tryHandleChat(String message, Runnable handler, boolean sync) { // CraftBukkit
|
|
+ if (ServerGamePacketListenerImpl.isLog4ShellExploit(message)) return; // DivineMC - Block Log4Shell exploit
|
|
if (isChatMessageIllegal(message)) {
|
|
this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect
|
|
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
|
|
@@ -2512,6 +2513,15 @@ public class ServerGamePacketListenerImpl
|
|
}
|
|
}
|
|
|
|
+ // DivineMC start - Block Log4Shell exploit
|
|
+ public static boolean isLog4ShellExploit(String message) {
|
|
+ java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(".*\\$\\{[^}]*}.*");
|
|
+ java.util.regex.Matcher matcher = pattern.matcher(message);
|
|
+
|
|
+ return matcher.find();
|
|
+ }
|
|
+ // DivineMC end - Block Log4Shell exploit
|
|
+
|
|
public static boolean isChatMessageIllegal(String message) {
|
|
for (int i = 0; i < message.length(); i++) {
|
|
if (!StringUtil.isAllowedChatCharacter(message.charAt(i))) {
|