From 15e9c3a0969c0fb45708f6cb4923eca362b25b90 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 4 Nov 2022 12:11:17 +0100 Subject: Detect unsigned commands Fixes #260 --- .../mixins/client/MixinChatScreen.java | 4 --- .../mixins/client/MixinClientPacketListener.java | 42 ++++++++++++++++++++++ src/main/resources/nochatreports.mixins.json | 3 +- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java (limited to 'src/main') diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java index 16d23bf..219d917 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -60,10 +60,6 @@ public abstract class MixinChatScreen extends Screen { String message = info.getReturnValue(); NCRConfig.getEncryption().setLastMessage(message); - if (!ServerSafetyState.allowChatSigning() && !ServerSafetyState.isDetermined()) { - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); // asume unintrusive until further notice - } - if (!message.isEmpty() && !Screen.hasControlDown() && NCRConfig.getEncryption().shouldEncrypt(message)) { NCRConfig.getEncryption().getEncryptor().ifPresent(e -> { int index = NCRConfig.getEncryption().getEncryptionStartIndex(message); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java new file mode 100644 index 0000000..0452a76 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java @@ -0,0 +1,42 @@ +package com.aizistral.nochatreports.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.mojang.brigadier.ParseResults; + +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.network.chat.SignableCommand; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; +import net.minecraft.network.protocol.game.ServerboundChatPacket; + +@Mixin(ClientPacketListener.class) +public abstract class MixinClientPacketListener { + + @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD")) + private void onSend(Packet packet, CallbackInfo info) { + if (!ServerSafetyState.allowChatSigning() && !ServerSafetyState.isDetermined()) { + if (packet instanceof ServerboundChatPacket chat) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); // asume unintrusive until further notice + } else if (packet instanceof ServerboundChatCommandPacket command) { + if (!SignableCommand.of(this.parseCommand(command.command())).arguments().isEmpty()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); + } + } + } + } + + @Shadow + private ParseResults parseCommand(String command) { + throw new IllegalStateException("@Shadow transformation failed"); + } + +} diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index b148627..f91d75a 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -29,7 +29,8 @@ "client.MixinChatComponent", "client.MixinGuiMessageTagIcon", "client.MixinTitleScreen", - "client.MixinMinecraft" + "client.MixinMinecraft", + "client.MixinClientPacketListener" ], "server": [ "server.MixinDedicatedServer" -- cgit v1.2.3