twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 22:52:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Put signed message decoding through the message chain

Browse Source 
While this disrupts signed command handling a bit, general behavior stays the same, and most importantly chat can continue to be handled off-main. It is necessary for the message decoding to happen in order, which previously was not guaranteed with the method call being in the netty event loop for chat and on main for signed commands.
This commit is contained in:
Nassim Jahnke
2025-05-23 14:44:01 +02:00
parent a033e3b9ef
commit 5f210bb2d6
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
View File

@@ -1395,7 +1395,7 @@
throw new IllegalArgumentException("Expected packet sequence nr >= 0"); throw new IllegalArgumentException("Expected packet sequence nr >= 0");
} else { } else {
this.ackBlockChangesUpTo = Math.max(sequence, this.ackBlockChangesUpTo); this.ackBlockChangesUpTo = Math.max(sequence, this.ackBlockChangesUpTo);
@@ -1356,20 +_,38 @@ @@ -1356,23 +_,41 @@
@Override @Override
public void handleSetCarriedItem(ServerboundSetCarriedItemPacket packet) { public void handleSetCarriedItem(ServerboundSetCarriedItemPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
@@ -1433,7 +1433,11 @@
+ // CraftBukkit end + // CraftBukkit end
Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages()); Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages());
if (!optional.isEmpty()) { if (!optional.isEmpty()) {
this.tryHandleChat(packet.message(), () -> { - this.tryHandleChat(packet.message(), () -> {
+ this.tryHandleChat(packet.message(), () -> this.chatMessageChain.append(() -> { // Paper - async chat; make sure signed message decoding happens in order
PlayerChatMessage signedMessage;
try {
signedMessage = this.getSignedMessage(packet, optional.get());
@@ -1381,25 +_,45 @@ @@ -1381,25 +_,45 @@
return; return;
} }
@@ -1450,7 +1454,7 @@
this.broadcastChatMessage(playerChatMessage); this.broadcastChatMessage(playerChatMessage);
}); });
- }); - });
+ }, false); // CraftBukkit - async chat + }), false); // Paper - async chat
} }
} }
@@ -1487,7 +1491,7 @@
ParseResults<CommandSourceStack> parseResults = this.parseCommand(command); ParseResults<CommandSourceStack> parseResults = this.parseCommand(command);
if (this.server.enforceSecureProfile() && SignableCommand.hasSignableArguments(parseResults)) { if (this.server.enforceSecureProfile() && SignableCommand.hasSignableArguments(parseResults)) {
LOGGER.error( LOGGER.error(
@@ -1416,28 +_,57 @@ @@ -1416,15 +_,37 @@
Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages()); Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(packet.lastSeenMessages());
if (!optional.isEmpty()) { if (!optional.isEmpty()) {
this.tryHandleChat(packet.command(), () -> { this.tryHandleChat(packet.command(), () -> {
@@ -1505,46 +1509,51 @@
} }
private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, LastSeenMessages lastSeenMessages) { private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, LastSeenMessages lastSeenMessages) {
+ // CraftBukkit start + // Paper start - async chat; make sure signed message decoding happens in order
+ String command = "/" + packet.command(); + final String slashCommand = "/" + packet.command();
+ if (org.spigotmc.SpigotConfig.logCommands) { // Paper - Add missing SpigotConfig logCommands check + if (org.spigotmc.SpigotConfig.logCommands) {
+ LOGGER.info("{} issued server command: {}", this.player.getScoreboardName(), command); + LOGGER.info("{} issued server command: {}", this.player.getScoreboardName(), slashCommand);
+ } // Paper - Add missing SpigotConfig logCommands check + }
+ +
+ PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(this.getCraftPlayer(), command, new org.bukkit.craftbukkit.util.LazyPlayerSet(this.server)); + final org.bukkit.event.player.PlayerCommandPreprocessEvent event = new org.bukkit.event.player.PlayerCommandPreprocessEvent(this.getCraftPlayer(), slashCommand, new org.bukkit.craftbukkit.util.LazyPlayerSet(this.server));
+ this.cserver.getPluginManager().callEvent(event); + event.callEvent();
+ command = event.getMessage().substring(1);
+ +
ParseResults<CommandSourceStack> parseResults = this.parseCommand(packet.command()); ParseResults<CommandSourceStack> parseResults = this.parseCommand(packet.command());
+ // Decode the signed arguments through the message chain to guarantee correct order with chat, then go back to main.
+ // Always parse the original command to add to the chat chain first, only then can we cancel further processing.
+ final String updatedCommand = event.getMessage().substring(1);
+ this.chatMessageChain.append(() -> this.performSignedChatCommand(packet, lastSeenMessages, parseResults, updatedCommand, event.isCancelled()));
+ }
+
+ private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, LastSeenMessages lastSeenMessages, ParseResults<CommandSourceStack> parseResults, String command, boolean cancelled) {
+ // Paper end - async chat; make sure signed message decoding happens in order
Map<String, PlayerChatMessage> map; Map<String, PlayerChatMessage> map;
try { try {
+ // Paper - Always parse the original command to add to the chat chain
map = this.collectSignedArguments(packet, SignableCommand.of(parseResults), lastSeenMessages); map = this.collectSignedArguments(packet, SignableCommand.of(parseResults), lastSeenMessages);
} catch (SignedMessageChain.DecodeException var6) { @@ -1433,11 +_,24 @@
this.handleMessageDecodeFailure(var6);
return; return;
} }
+ // Paper start - Fix cancellation and message changing + // Paper start - async chat; make sure signed message decoding happens in order
+ if (event.isCancelled()) { + if (!cancelled) {
+ // Only now are we actually good to return + this.server.execute(() -> this.performSignedChatCommand(packet, parseResults, command, map));
+ return;
+ } + }
+ }
+ +
+ private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, ParseResults<CommandSourceStack> parseResults, String command, Map<String, PlayerChatMessage> map) {
+ // Remove signed parts if the command was changed + // Remove signed parts if the command was changed
+ if (!command.equals(packet.command())) { + if (!command.equals(packet.command())) {
+ parseResults = this.parseCommand(command); + parseResults = this.parseCommand(command);
+ map = Collections.emptyMap(); + map = Collections.emptyMap();
+ } + }
+ // Paper end - Fix cancellation and message changing + // Paper end - async chat; make sure signed message decoding happens in order
+
CommandSigningContext commandSigningContext = new CommandSigningContext.SignedArguments(map); CommandSigningContext commandSigningContext = new CommandSigningContext.SignedArguments(map);
parseResults = Commands.mapSource( parseResults = Commands.mapSource(
parseResults, commandSourceStack -> commandSourceStack.withSigningContext(commandSigningContext, this.chatMessageChain) parseResults, commandSourceStack -> commandSourceStack.withSigningContext(commandSigningContext, this.chatMessageChain)
); );
- this.server.getCommands().performCommand(parseResults, packet.command()); - this.server.getCommands().performCommand(parseResults, packet.command());
+ this.server.getCommands().performCommand(parseResults, command); // CraftBukkit + this.server.getCommands().performCommand(parseResults, command); // Paper
} }
private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) { private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) {