aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0301-Limit-Client-Sign-length-more.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0301-Limit-Client-Sign-length-more.patch')
-rw-r--r--patches/server/0301-Limit-Client-Sign-length-more.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/patches/server/0301-Limit-Client-Sign-length-more.patch b/patches/server/0301-Limit-Client-Sign-length-more.patch
new file mode 100644
index 0000000000..9a8c695108
--- /dev/null
+++ b/patches/server/0301-Limit-Client-Sign-length-more.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 27 Feb 2019 22:18:40 -0500
+Subject: [PATCH] Limit Client Sign length more
+
+modified clients can send more data from the client
+to the server and it would get stored on the sign as sent.
+
+Mojang has a limit of 384 which is much higher than reasonable.
+
+the client can barely render around 16 characters as-is, but formatting
+codes can get it to be more than 16 actual length.
+
+Set a limit of 80 which should give an average of 16 characters 2
+sets of legacy formatting codes which should be plenty for all uses.
+
+This does not strip any existing data from the NBT as plugins
+may use this for storing data out of the rendered area.
+
+it only impacts data sent from the client.
+
+Set -DPaper.maxSignLength=XX to change limit or -1 to disable
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 43bd11679d881b1039db4ed57e70d1ae4d49a107..d1c5e6672068b83a22602fecd891d62c15edd55d 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+ private int aboveGroundVehicleTickCount;
+ private int receivedMovePacketCount;
+ private int knownMovePacketCount;
++ private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80);
+ private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
+
+ public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
+@@ -2889,6 +2890,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+
+ for (int i = 0; i < signText.size(); ++i) {
+ TextFilter.FilteredText currentLine = signText.get(i);
++ // Paper start - cap line length - modified clients can send longer data than normal
++ if (MAX_SIGN_LINE_LENGTH > 0 && currentLine.getRaw().length() > MAX_SIGN_LINE_LENGTH) {
++ // This handles multibyte characters as 1
++ int offset = currentLine.getRaw().codePoints().limit(MAX_SIGN_LINE_LENGTH).map(Character::charCount).sum();
++ if (offset < currentLine.getRaw().length()) {
++ signText.set(i, currentLine = net.minecraft.server.network.TextFilter.FilteredText.passThrough(currentLine.getRaw().substring(0, offset))); // this will break any filtering, but filtering is NYI as of 1.17
++ }
++ }
++ // Paper end
+
+ if (this.player.isTextFilteringEnabled()) {
+ lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(currentLine.getFiltered())));