From afb191a6312cfb90f906c022dae35fcb9000ae7d Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 4 Jul 2022 17:56:48 +0200 Subject: Implement timestamp scrambler --- .../com/aizistral/nochatreports/NoChatReports.java | 1 + .../nochatreports/core/NoReportsConfig.java | 9 ++++- .../nochatreports/core/TimestampScrambler.java | 44 ++++++++++++++++++++++ .../nochatreports/mixins/MixinLocalPlayer.java | 11 +++++- .../nochatreports/mixins/MixinMessageSigner.java | 26 +++++++++++++ .../mixins/MixinServerboundChatPacket.java | 7 +++- src/main/resources/nochatreports.mixins.json | 3 +- 7 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java (limited to 'src/main') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index 4ac9c22..05c4ae4 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -15,6 +15,7 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.multiplayer.chat.LoggedChat; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.login.ServerboundHelloPacket; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index d1ce3b6..bc37e7c 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -14,6 +14,8 @@ import javax.annotation.Nullable; import com.aizistral.nochatreports.NoChatReports; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; @@ -25,7 +27,8 @@ public class NoReportsConfig { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; private boolean demandOnClient, demandOnServer, enableDebugLog, convertToGameMessage = true, - forceAllowMultiplayer = true, showServerSafety = true, suppressMessageTrustIndicators = true; + forceAllowMultiplayer = true, showServerSafety = true, suppressMessageTrustIndicators = true, + scrambleTimestamps = true; private List whitelistedServers; private static NoReportsConfig getInstance() { @@ -114,4 +117,8 @@ public class NoReportsConfig { return getInstance().enableDebugLog; } + public static boolean scrambleTimestamps() { + return getInstance().scrambleTimestamps; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java b/src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java new file mode 100644 index 0000000..f5dbfaa --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java @@ -0,0 +1,44 @@ +package com.aizistral.nochatreports.core; + +import java.time.Instant; +import java.util.Random; + +import com.aizistral.nochatreports.NoChatReports; + +import net.minecraft.network.chat.MessageSigner; + +/** + * My implementation is independent, but I credit + * {@link Delayed Reports} + * for the idea. + * + * @author Aizistral + */ + +public class TimestampScrambler { + private static final Random THEY_SEE_ME_ROLLIN = new Random(); + private static final int MIN_OFFSET = -270, MAX_OFFSET = 90; + private static Instant lastTimestamp = Instant.now().plusSeconds(MIN_OFFSET); + + private TimestampScrambler() { + throw new IllegalStateException("Can't touch this"); + } + + public static MessageSigner randomizeTimestamp(MessageSigner original) { + return new MessageSigner(original.sender(), randomizeTimestamp(original.timeStamp()), original.salt()); + } + + public static Instant randomizeTimestamp(Instant original) { + long diff = -(original.getEpochSecond() - lastTimestamp.getEpochSecond()); + long offset = between(diff < MIN_OFFSET ? MIN_OFFSET : diff, MAX_OFFSET); + + NoChatReports.LOGGER.info("Offset: " + offset); + + return lastTimestamp = original.plusSeconds(offset); + } + + private static long between(long one, long two) { + return one + THEY_SEE_ME_ROLLIN.nextLong(two - one); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java index 3856337..05ee513 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java @@ -1,18 +1,27 @@ package com.aizistral.nochatreports.mixins; +import com.aizistral.nochatreports.core.NoReportsConfig; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.TimestampScrambler; import com.mojang.brigadier.ParseResults; + +import net.minecraft.Util; import net.minecraft.client.player.LocalPlayer; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.commands.arguments.ArgumentSignatures; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MessageSignature; import net.minecraft.network.chat.MessageSigner; +import net.minecraft.util.Crypt; +import net.minecraft.util.Crypt.SaltSignaturePair; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.time.Instant; + import javax.annotation.Nullable; @Mixin(LocalPlayer.class) @@ -28,7 +37,7 @@ public class MixinLocalPlayer { @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable info) { if (!ServerSafetyState.forceSignedMessages()) { - info.setReturnValue(MessageSignature.unsigned()); + info.setReturnValue(new MessageSignature(Util.NIL_UUID, signer.timeStamp(), SaltSignaturePair.EMPTY)); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java new file mode 100644 index 0000000..46aaaa8 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java @@ -0,0 +1,26 @@ +package com.aizistral.nochatreports.mixins; + +import java.util.UUID; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.core.NoReportsConfig; +import com.aizistral.nochatreports.core.TimestampScrambler; + +import net.minecraft.network.chat.MessageSigner; + +@Mixin(MessageSigner.class) +public class MixinMessageSigner { + + @Inject(method = "create", at = @At("RETURN"), cancellable = true) + private static void onCreate(UUID id, CallbackInfoReturnable info) { + if (NoReportsConfig.scrambleTimestamps()) { + info.setReturnValue(TimestampScrambler.randomizeTimestamp(info.getReturnValue())); + } + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java index 2ab37a0..cb8f8ad 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java @@ -1,7 +1,10 @@ package com.aizistral.nochatreports.mixins; +import net.minecraft.Util; import net.minecraft.network.chat.MessageSignature; import net.minecraft.network.protocol.game.ServerboundChatPacket; +import net.minecraft.util.Crypt.SaltSignaturePair; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -20,9 +23,9 @@ public class MixinServerboundChatPacket { * @author Aven (Inject) */ - @Inject(method = "getSignature", at = @At("HEAD"), cancellable = true) + @Inject(method = "getSignature", at = @At("RETURN"), cancellable = true) private void onGetSignature(UUID id, CallbackInfoReturnable info) { - info.setReturnValue(MessageSignature.unsigned()); + info.setReturnValue(new MessageSignature(Util.NIL_UUID, info.getReturnValue().timeStamp(), SaltSignaturePair.EMPTY)); } } diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index dc3c798..7299a79 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -23,7 +23,8 @@ "MixinConnectScreen", "MixinClientboundHelloPacket", "MixinScreen", - "MixinJoinMultiplayerScreen" + "MixinJoinMultiplayerScreen", + "MixinMessageSigner" ], "server": [ "MixinDedicatedServer" -- cgit v1.2.3