2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-11-17 05:10:45 +01:00
From: Aikar <aikar@aikar.co>
Date: Fri, 16 Nov 2018 23:08:50 -0500
Subject: [PATCH] Book Size Limits
Puts some limits on the size of books.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2020-11-18 04:45:18 +01:00
index ba7fdf482ef8536074fcc3867d7fc142fcfe8ce8..2aca8cc2be963b2b015e52cdec6b3843011f1ccb 100644
2018-11-17 05:10:45 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2020-11-09 01:09:37 +01:00
@@ -334,4 +334,11 @@ public class PaperConfig {
2018-11-17 05:10:45 +01:00
velocitySecretKey = secret.getBytes(StandardCharsets.UTF_8);
}
}
+
2018-11-17 06:34:58 +01:00
+ public static int maxBookPageSize = 2560;
+ public static double maxBookTotalSizeMultiplier = 0.98D;
2018-11-17 05:10:45 +01:00
+ private static void maxBookSize() {
+ maxBookPageSize = getInt("settings.book-size.page-max", maxBookPageSize);
+ maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
+ }
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2020-12-08 08:51:55 +01:00
index cc141f02d5a2b1a5c50e5583d3537d5883762db1..8a322537f8418627d7fc6db2f1411bf5ca252dcc 100644
2018-11-17 05:10:45 +01:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2020-11-03 03:22:15 +01:00
@@ -20,6 +20,7 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
2020-06-25 16:09:55 +02:00
import java.util.stream.Stream;
2019-01-12 14:59:06 +01:00
import javax.annotation.Nullable;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
2020-12-08 08:51:55 +01:00
@@ -850,6 +851,42 @@ public class PlayerConnection implements PacketListenerPlayIn {
2018-11-17 05:10:45 +01:00
2019-05-05 13:12:32 +02:00
@Override
2018-11-17 05:10:45 +01:00
public void a(PacketPlayInBEdit packetplayinbedit) {
+ // Paper start
2020-11-03 03:22:15 +01:00
+ ItemStack testStack = packetplayinbedit.b(); // TODO(Proximyst): Add obfhelper here
2018-11-17 05:10:45 +01:00
+ if (!server.isPrimaryThread() && !testStack.isEmpty() && testStack.getTag() != null) {
+ NBTTagList pageList = testStack.getTag().getList("pages", 8);
+ long byteTotal = 0;
+ int maxBookPageSize = com.destroystokyo.paper.PaperConfig.maxBookPageSize;
+ double multiplier = Math.max(0.3D, Math.min(1D, com.destroystokyo.paper.PaperConfig.maxBookTotalSizeMultiplier));
+ long byteAllowed = maxBookPageSize;
+ for (int i = 0; i < pageList.size(); ++i) {
+ String testString = pageList.getString(i);
2018-11-17 06:38:35 +01:00
+ int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
2018-11-17 05:10:45 +01:00
+ byteTotal += byteLength;
2018-11-17 06:34:58 +01:00
+ int length = testString.length();
2019-01-12 14:59:06 +01:00
+ int multibytes = 0;
+ if (byteLength != length) {
+ for (char c : testString.toCharArray()) {
+ if (c > 127) {
+ multibytes++;
+ }
+ }
2018-11-17 06:34:58 +01:00
+ }
+ byteAllowed += (maxBookPageSize * Math.min(1, Math.max(0.1D, (double) length / 255D))) * multiplier;
+
+ if (multibytes > 1) {
2019-01-12 14:59:06 +01:00
+ // penalize MB
+ byteAllowed -= multibytes;
2018-11-17 06:34:58 +01:00
+ }
2018-11-17 05:10:45 +01:00
+ }
2019-01-12 14:59:06 +01:00
+
+ if (byteTotal > byteAllowed) {
+ PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());
2019-05-10 19:42:33 +02:00
+ minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
2019-01-12 14:59:06 +01:00
+ return;
+ }
2018-11-17 05:10:45 +01:00
+ }
+ // Paper end
2019-12-12 17:20:43 +01:00
// CraftBukkit start
2018-11-17 05:10:45 +01:00
if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
2020-11-03 03:22:15 +01:00
this.disconnect("Book edited too quickly!");