summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAizistral2022-07-02 16:52:27 +0200
committerAizistral2022-07-02 16:52:27 +0200
commit0f05789b045ea73e4eb18c7b2ab7398d72df76b0 (patch)
tree5d1d90e81b134fc6c8f8c3d26e0e3207a645ce5b /src
parent99031e07bfdf1478ade447ac189b3ab00ee5411e (diff)
Fix assumptions about whitelisted servers
Fixes #43
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java37
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java11
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java22
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java1
-rw-r--r--src/main/resources/nochatreports.mixins.json2
12 files changed, 113 insertions, 52 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index 5a06ce3..4ac9c22 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -16,6 +16,7 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.login.ServerboundHelloPacket;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -38,6 +39,8 @@ public class NoChatReports implements ModInitializer {
if (NoReportsConfig.demandsOnClient() && !ServerPlayNetworking.canSend(handler, CHANNEL)) {
handler.disconnect(Component.literal("You do not have No Chat Reports, and this server is configured to require it on client!"));
}
+
+ //handler.disconnect(Component.translatable("multiplayer.disconnect.missing_public_key"));
});
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 1586756..ccd931d 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -53,20 +53,29 @@ public class NoChatReportsClient implements ClientModInitializer {
if (screenOverride)
return;
+ screenOverride = true;
if (dsc.getReason().getContents() instanceof TranslatableContents contents) {
if (ServerSafetyState.allowsUnsafeServer()) {
- screenOverride = true;
screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()),
CommonComponents.CONNECT_FAILED, dsc.getReason());
client.setScreen(screen);
- screenOverride = false;
return;
} else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) {
- screenOverride = true;
- client.setScreen(new UnsafeServerScreen());
- screenOverride = false;
+ if (ServerSafetyState.getLastConnectedServer() != null) {
+ if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer())) {
+ client.setScreen(new UnsafeServerScreen());
+ } else {
+ if (ServerSafetyState.getReconnectCount() <= 0) {
+ ServerSafetyState.setAllowsUnsafeServer(true);
+ reconnectLastServer();
+ } else {
+ ServerSafetyState.setReconnectCount(0);
+ }
+ }
+ }
}
}
+ screenOverride = false;
}
}
@@ -76,22 +85,16 @@ public class NoChatReportsClient implements ClientModInitializer {
private void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client) {
client.execute(() -> {
+ ServerSafetyState.setReconnectCount(0);
+
if (!client.isLocalServer()) {
- String ip = ServerSafetyState.getLastConnectedServer().getHost() + ":"
- + ServerSafetyState.getLastConnectedServer().getPort();
boolean canSend = ClientPlayNetworking.canSend(NoChatReports.CHANNEL);
if (canSend) {
ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE);
} else {
- ServerSafetyState.updateCurrent(ServerSafetyState.allowsUnsafeServer() ?
+ ServerSafetyState.updateCurrent(ServerSafetyState.forceSignedMessages() ?
ServerSafetyLevel.INSECURE : ServerSafetyLevel.UNINTRUSIVE);
-
- if (ServerSafetyState.getCurrent() != ServerSafetyLevel.INSECURE) {
- ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE);
- } else {
- // NO-OP
- }
}
}
@@ -101,4 +104,10 @@ public class NoChatReportsClient implements ClientModInitializer {
});
}
+ public static void reconnectLastServer() {
+ ServerSafetyState.setReconnectCount(ServerSafetyState.getReconnectCount() + 1);
+ ConnectScreen.startConnecting(new JoinMultiplayerScreen(new TitleScreen()), Minecraft.getInstance(),
+ ServerSafetyState.getLastConnectedServer(), null);
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index d2f255d..64c5dd9 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -16,13 +16,14 @@ import com.google.gson.GsonBuilder;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.multiplayer.chat.ChatTrustLevel;
+import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraft.util.Tuple;
public class NoReportsConfig {
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, convertToGameMessage = true,
+ private boolean demandOnClient, demandOnServer, enableDebugLog, convertToGameMessage = true,
forceAllowMultiplayer = true, showServerSafety = true, suppressMessageTrustIndicators = true;
private List<String> whitelistedServers;
@@ -98,8 +99,16 @@ public class NoReportsConfig {
return getInstance().whitelistedServers;
}
+ public static boolean isWhitelistedServer(ServerAddress address) {
+ return getWhitelistedServers().contains(address.getHost() + ":" + address.getPort());
+ }
+
public static boolean suppressMessageTrustIndicators() {
return getInstance().suppressMessageTrustIndicators;
}
+ public static boolean isDebugLogEnabled() {
+ return getInstance().enableDebugLog;
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 8fbe357..9bff76b 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -5,13 +5,22 @@ import java.util.Map;
import javax.annotation.Nullable;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
+/**
+ * All this global state is questionable, but we have to...
+ * @author Aizistral
+ */
+
+@Environment(EnvType.CLIENT)
public class ServerSafetyState {
private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN;
private static ServerAddress lastConnectedServer = null;
- private static boolean allowUnsafeServer = false;
+ private static boolean allowUnsafeServer = false, sessionRequestedKey = false;
+ private static int reconnectCount = 0;
public static void updateCurrent(ServerSafetyLevel level) {
current = level;
@@ -29,6 +38,18 @@ public class ServerSafetyState {
allowUnsafeServer = allows;
}
+ public static void setSessionRequestedKey(boolean requested) {
+ sessionRequestedKey = requested;
+ }
+
+ public static boolean sessionRequestedKey() {
+ return current != ServerSafetyLevel.SECURE ? sessionRequestedKey : false;
+ }
+
+ public static boolean forceSignedMessages() {
+ return allowsUnsafeServer() && sessionRequestedKey();
+ }
+
@Nullable
public static ServerAddress getLastConnectedServer() {
return lastConnectedServer;
@@ -38,9 +59,17 @@ public class ServerSafetyState {
lastConnectedServer = address;
}
+ public static int getReconnectCount() {
+ return reconnectCount;
+ }
+
+ public static void setReconnectCount(int count) {
+ reconnectCount = count;
+ }
+
public static void reset() {
current = ServerSafetyLevel.UNKNOWN;
- allowUnsafeServer = false;
+ allowUnsafeServer = sessionRequestedKey = false;
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
index efccc4e..a51fc45 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java
@@ -2,6 +2,7 @@ package com.aizistral.nochatreports.gui;
import javax.print.attribute.standard.MediaSize.NA;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.core.NoReportsConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
@@ -42,11 +43,10 @@ public class UnsafeServerScreen extends WarningScreen {
if (this.stopShowing.selected()) {
NoReportsConfig.getWhitelistedServers().add(address.getHost() + ":" + address.getPort());
NoReportsConfig.saveConfig();
- } else {
- ServerSafetyState.setAllowsUnsafeServer(true);
}
- ConnectScreen.startConnecting(this, this.minecraft, address, null);
+ ServerSafetyState.setAllowsUnsafeServer(true);
+ NoChatReportsClient.reconnectLastServer();
}
}));
this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java
index f8adcea..5d90beb 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinChatListener.java
@@ -1,11 +1,14 @@
package com.aizistral.nochatreports.mixins;
+import java.util.Base64;
+
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
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 net.minecraft.client.multiplayer.PlayerInfo;
@@ -29,6 +32,14 @@ public class MixinChatListener {
if (NoReportsConfig.suppressMessageTrustIndicators()) {
info.setReturnValue(ChatTrustLevel.SECURE);
}
+
+ // Debug never dies
+ if (NoReportsConfig.isDebugLogEnabled()) {
+ NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}",
+ Component.Serializer.toStableJson(playerChatMessage.signedContent()),
+ chatSender.name().getString(),
+ Base64.getEncoder().encodeToString(playerChatMessage.signature().saltSignature().signature()));
+ }
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java
deleted file mode 100644
index a8adf92..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.aizistral.nochatreports.mixins;
-
-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.CallbackInfo;
-
-import com.aizistral.nochatreports.gui.UnsafeServerScreen;
-
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-
-@Mixin(ClientPacketListener.class)
-public class MixinClientPacketListener {
-
- @Inject(method = "<init>", at = @At("RETURN"))
- private void onConstructed(CallbackInfo info) {
- var self = (ClientPacketListener) (Object) this;
- if (self.callbackScreen instanceof UnsafeServerScreen) {
- self.callbackScreen = new JoinMultiplayerScreen(new TitleScreen());
- }
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java
new file mode 100644
index 0000000..b14c9bc
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientboundHelloPacket.java
@@ -0,0 +1,22 @@
+package com.aizistral.nochatreports.mixins;
+
+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.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.aizistral.nochatreports.core.ServerSafetyState;
+
+import net.minecraft.network.protocol.login.ClientLoginPacketListener;
+import net.minecraft.network.protocol.login.ClientboundHelloPacket;
+
+@Mixin(ClientboundHelloPacket.class)
+public class MixinClientboundHelloPacket {
+
+ @Inject(method = "handle", at = @At("HEAD"))
+ private void onHandle(ClientLoginPacketListener listener, CallbackInfo info) {
+ ServerSafetyState.setSessionRequestedKey(true);
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
index 751c762..92922b4 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinConnectScreen.java
@@ -6,6 +6,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import com.aizistral.nochatreports.NoChatReports;
import com.aizistral.nochatreports.core.NoReportsConfig;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
@@ -25,10 +26,11 @@ public class MixinConnectScreen {
ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure
ServerSafetyState.setLastConnectedServer(serverAddress);
- if (serverAddress != null)
- if (NoReportsConfig.getWhitelistedServers().contains(serverAddress.getHost() + ":" + serverAddress.getPort())) {
- ServerSafetyState.setAllowsUnsafeServer(true);
- }
+ if (NoReportsConfig.isDebugLogEnabled()) {
+ NoChatReports.LOGGER.info("Connecting to: {}, will expose public key: {}",
+ serverAddress.getHost() + ":" + serverAddress.getPort(),
+ ServerSafetyState.allowsUnsafeServer());
+ }
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
index 2fa727f..3856337 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
@@ -27,7 +27,7 @@ public class MixinLocalPlayer {
@Inject(method = "signMessage", at = @At("HEAD"), cancellable = true)
private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> info) {
- if (!ServerSafetyState.allowsUnsafeServer()) {
+ if (!ServerSafetyState.forceSignedMessages()) {
info.setReturnValue(MessageSignature.unsigned());
}
}
@@ -40,7 +40,7 @@ public class MixinLocalPlayer {
@Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true)
private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, CallbackInfoReturnable<ArgumentSignatures> info) {
- if (!ServerSafetyState.allowsUnsafeServer()) {
+ if (!ServerSafetyState.forceSignedMessages()) {
info.setReturnValue(ArgumentSignatures.empty());
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java
index f5ded0d..73734e9 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java
@@ -9,6 +9,7 @@ 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.ServerSafetyState;
import java.util.Optional;
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index d141f88..0c01248 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -21,7 +21,7 @@
"MixinChatScreen",
"AccessorDisconnectedScreen",
"MixinConnectScreen",
- "MixinClientPacketListener"
+ "MixinClientboundHelloPacket"
],
"server": [
"MixinDedicatedServer"