aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0291-Book-Size-Limits.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0291-Book-Size-Limits.patch')
-rw-r--r--patches/server/0291-Book-Size-Limits.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/patches/server/0291-Book-Size-Limits.patch b/patches/server/0291-Book-Size-Limits.patch
new file mode 100644
index 0000000000..94aa39a5b0
--- /dev/null
+++ b/patches/server/0291-Book-Size-Limits.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+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
+index 36719c689a24c63e7d9a5b40f8c262c182a31b21..83bf428abd3be89e34cf42638bd1357a708ea0e3 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -369,6 +369,13 @@ public class PaperConfig {
+ }
+ }
+
++ public static int maxBookPageSize = 2560;
++ public static double maxBookTotalSizeMultiplier = 0.98D;
++ private static void maxBookSize() {
++ maxBookPageSize = Math.min(8192, getInt("settings.book-size.page-max", maxBookPageSize));
++ maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
++ }
++
+ public static boolean asyncChunks = false;
+ private static void asyncChunks() {
+ ConfigurationSection section;
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 7241418074dbd8e0e81e2b679bd317d98fea2e27..d8135a0e644b67ed47972eb3bda517323561a93d 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -1012,6 +1012,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+
+ @Override
+ public void handleEditBook(ServerboundEditBookPacket packet) {
++ // Paper start
++ if (!this.cserver.isPrimaryThread()) {
++ List<String> pageList = packet.getPages();
++ 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 (String testString : pageList) {
++ int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
++ if (byteLength > 256 * 4) {
++ ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
++ server.scheduleOnMain(() -> this.disconnect("Book too large!"));
++ return;
++ }
++ byteTotal += byteLength;
++ int length = testString.length();
++ int multibytes = 0;
++ if (byteLength != length) {
++ for (char c : testString.toCharArray()) {
++ if (c > 127) {
++ multibytes++;
++ }
++ }
++ }
++ byteAllowed += (maxBookPageSize * Math.min(1, Math.max(0.1D, (double) length / 255D))) * multiplier;
++
++ if (multibytes > 1) {
++ // penalize MB
++ byteAllowed -= multibytes;
++ }
++ }
++
++ if (byteTotal > byteAllowed) {
++ ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());
++ server.scheduleOnMain(() -> this.disconnect("Book too large!"));
++ return;
++ }
++ }
++ // Paper end
+ // CraftBukkit start
+ if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
+ this.disconnect("Book edited too quickly!");