summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAizistral2022-10-09 03:18:59 +0200
committerAizistral2022-10-09 03:18:59 +0200
commit0869a789901c80037dcf8985f0975bf3629ca2b7 (patch)
tree77e5e4ba1d3688366484b6ecc3ededd3d5227c36 /src/main
parentad0af9e61d560bda0202d69fec961d60e40049f5 (diff)
Add signing check interval for whitelisted servers
Closes #222
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java23
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java7
3 files changed, 31 insertions, 1 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 7c020f4..35e7d66 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -104,6 +104,8 @@ public final class NoChatReportsClient implements ClientModInitializer {
client.setScreen(new UnsafeServerScreen());
} else {
+ NCRConfig.getClient().updateSigningCheck(ServerSafetyState.getLastServerAddress());
+
if (ServerSafetyState.getReconnectCount() <= 0) {
ServerSafetyState.setAllowsUnsafeServer(true);
client.setScreen(new AwaitConnectionScreen(new JoinMultiplayerScreen(new TitleScreen())));
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index 963e9a3..09496b1 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -1,8 +1,11 @@
package com.aizistral.nochatreports.config;
import java.security.InvalidKeyException;
+import java.time.Instant;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
@@ -12,6 +15,7 @@ import com.aizistral.nochatreports.gui.UnsafeServerScreen;
import com.aizistral.nochatreports.mixins.client.MixinChatListener;
import com.aizistral.nochatreports.mixins.client.MixinToastComponent;
+import net.minecraft.Util;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraft.util.StringUtil;
@@ -24,7 +28,9 @@ public final class NCRConfigClient extends JSONConfig {
whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true,
enableMod = true, skipRealmsWarning = false;
protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0, reconnectAwaitSeconds = 4,
- postDisconnectAwaitSeconds = 10;
+ postDisconnectAwaitSeconds = 10, signingCheckDelaySeconds = 43200;
+
+ protected Map<String, Long> serverSigningChecks = new HashMap<>();
protected NCRConfigClient() {
super(FILE_NAME);
@@ -231,4 +237,19 @@ public final class NCRConfigClient extends JSONConfig {
this.skipRealmsWarning = skipRealmsWarning;
}
+ public boolean doSigningCheck(ServerAddress serverAddress) {
+ String server = serverAddress.getHost() + ":" + serverAddress.getPort();
+
+ if (!this.serverSigningChecks.containsKey(server))
+ return true;
+ else
+ return Instant.now().getEpochSecond() - this.serverSigningChecks.get(server) >= this.signingCheckDelaySeconds;
+ }
+
+ public void updateSigningCheck(ServerAddress serverAddress) {
+ String server = serverAddress.getHost() + ":" + serverAddress.getPort();
+ this.serverSigningChecks.put(server, Instant.now().getEpochSecond());
+ this.saveFile();
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
index 804f06b..86101bf 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
@@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.aizistral.nochatreports.NoChatReports;
import com.aizistral.nochatreports.config.NCRConfig;
+import com.aizistral.nochatreports.config.NCRConfigClient;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
@@ -35,6 +36,12 @@ public class MixinConnectScreen {
ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure
ServerSafetyState.setLastConnectedServer(serverAddress, serverData);
+ if (NCRConfig.getServerWhitelist().isWhitelisted(serverAddress)) {
+ if (!NCRConfig.getClient().doSigningCheck(serverAddress)) {
+ ServerSafetyState.setAllowsUnsafeServer(true);
+ }
+ }
+
if (NCRConfig.getCommon().enableDebugLog()) {
NoChatReports.LOGGER.info("Connecting to: {}, will expose public key: {}",
serverAddress.getHost() + ":" + serverAddress.getPort(),