From 3acb4606b9be8b7c25b967581de19f02e6d7093a Mon Sep 17 00:00:00 2001 From: JFronny Date: Mon, 20 Jun 2022 14:39:37 +0200 Subject: Implement serverside bypass for signature checking by using a system chat packet --- .../nochatreports/handlers/NoReportsConfig.java | 39 +++++++++++----------- .../nochatreports/mixins/MixinOptions.java | 5 ++- .../nochatreports/mixins/MixinServerPlayer.java | 39 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java (limited to 'src/main/java/com/aizistral') diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java index 6612ac4..2bb04ec 100644 --- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java @@ -1,24 +1,21 @@ package com.aizistral.nochatreports.handlers; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.util.Optional; - -import javax.annotation.Nullable; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; - import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.Minecraft; + +import javax.annotation.Nullable; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; public class NoReportsConfig { - private static final File CONFIG_FOLDER = FabricLoader.getInstance().getConfigDir().toFile(); - private static final File CONFIG_FILE = new File(CONFIG_FOLDER, "NoChatReports.json"); + private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; - private boolean demandOnClient, demandOnServer; + private boolean demandOnClient, demandOnServer, convertToGameMessage; public static void loadConfig() { INSTANCE = readFile(); @@ -33,21 +30,19 @@ public class NoReportsConfig { @Nullable private static NoReportsConfig readFile() { - if (!CONFIG_FILE.exists() || !CONFIG_FILE.isFile()) + if (!Files.isRegularFile(CONFIG_FILE)) return null; - try (FileReader reader = new FileReader(CONFIG_FILE)) { - NoReportsConfig transience = new Gson().fromJson(reader, NoReportsConfig.class); - return transience; + try (BufferedReader reader = Files.newBufferedReader(CONFIG_FILE)) { + return GSON.fromJson(reader, NoReportsConfig.class); } catch (IOException ex) { throw new RuntimeException(ex); } } private static void writeFile(NoReportsConfig instance) { - try (FileWriter writer = new FileWriter(CONFIG_FILE)) { - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - gson.toJson(instance, writer); + try (BufferedWriter writer = Files.newBufferedWriter(CONFIG_FILE)) { + GSON.toJson(instance, writer); } catch (Exception ex) { throw new RuntimeException(ex); } @@ -61,4 +56,8 @@ public class NoReportsConfig { return INSTANCE.demandOnServer; } + public static boolean convertsToGameMessage() { + return INSTANCE.convertToGameMessage; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java index 78c0343..0c53d51 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java @@ -25,9 +25,8 @@ public class MixinOptions { if (this.alternativeOption == null) { this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat", OptionInstance.cachedConstantTooltip(Component.translatable("gui.nochatreport.secureChat")), - (component, value) -> { - return value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF; - }, new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), false, (value) -> {}); + (component, value) -> value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, + new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), false, (value) -> {}); } return this.alternativeOption; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java new file mode 100644 index 0000000..a96d69d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java @@ -0,0 +1,39 @@ +package com.aizistral.nochatreports.mixins; + +import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.handlers.NoReportsConfig; +import net.minecraft.network.chat.ChatDecoration; +import net.minecraft.network.chat.ChatType; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; +import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; +import net.minecraft.resources.ResourceKey; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +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.Redirect; + +@Mixin(ServerPlayer.class) +public abstract class MixinServerPlayer { + + @Shadow + protected abstract int resolveChatTypeId(ResourceKey resourceKey); + + @Redirect(method = "sendChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/ChatSender;Lnet/minecraft/resources/ResourceKey;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) + void extractChatMessage(ServerGamePacketListenerImpl listener, Packet packet) { + if (NoReportsConfig.convertsToGameMessage()) { + if (packet instanceof ClientboundPlayerChatPacket chat) { + Component component = chat.unsignedContent().orElse(chat.signedContent()); + component = ChatDecoration.withSender("chat.type.text").decorate(component, chat.sender()); + packet = new ClientboundSystemChatPacket(component, resolveChatTypeId(ChatType.SYSTEM)); + } else { + NoChatReports.LOGGER.warn("Unexpected packet type in sendChatMessage, skipping"); + } + } + listener.send(packet); + } + +} -- cgit v1.2.3 From 6a8dc21a6d3dbabe821a384052eb82392b1a5de9 Mon Sep 17 00:00:00 2001 From: JFronny Date: Mon, 20 Jun 2022 14:43:45 +0200 Subject: Attempt to replicate original code style --- .../nochatreports/handlers/NoReportsConfig.java | 12 +++++---- .../nochatreports/mixins/MixinServerPlayer.java | 30 +++++++++++----------- 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'src/main/java/com/aizistral') diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java index 2bb04ec..0a9734e 100644 --- a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java @@ -1,16 +1,18 @@ package com.aizistral.nochatreports.handlers; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.fabricmc.loader.api.FabricLoader; - -import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import javax.annotation.Nullable; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.fabricmc.loader.api.FabricLoader; + public class NoReportsConfig { private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java index a96d69d..68749f6 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerPlayer.java @@ -19,21 +19,21 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ServerPlayer.class) public abstract class MixinServerPlayer { - @Shadow - protected abstract int resolveChatTypeId(ResourceKey resourceKey); + @Shadow + protected abstract int resolveChatTypeId(ResourceKey resourceKey); - @Redirect(method = "sendChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/ChatSender;Lnet/minecraft/resources/ResourceKey;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) - void extractChatMessage(ServerGamePacketListenerImpl listener, Packet packet) { - if (NoReportsConfig.convertsToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat) { - Component component = chat.unsignedContent().orElse(chat.signedContent()); - component = ChatDecoration.withSender("chat.type.text").decorate(component, chat.sender()); - packet = new ClientboundSystemChatPacket(component, resolveChatTypeId(ChatType.SYSTEM)); - } else { - NoChatReports.LOGGER.warn("Unexpected packet type in sendChatMessage, skipping"); - } - } - listener.send(packet); - } + @Redirect(method = "sendChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/ChatSender;Lnet/minecraft/resources/ResourceKey;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) + void extractChatMessage(ServerGamePacketListenerImpl listener, Packet packet) { + if (NoReportsConfig.convertsToGameMessage()) { + if (packet instanceof ClientboundPlayerChatPacket chat) { + Component component = chat.unsignedContent().orElse(chat.signedContent()); + component = ChatDecoration.withSender("chat.type.text").decorate(component, chat.sender()); + packet = new ClientboundSystemChatPacket(component, resolveChatTypeId(ChatType.SYSTEM)); + } else { + NoChatReports.LOGGER.warn("Unexpected packet type in sendChatMessage, skipping"); + } + } + listener.send(packet); + } } -- cgit v1.2.3