diff options
Diffstat (limited to 'src/main/java')
11 files changed, 163 insertions, 35 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 35e7d66..b94e2f2 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -96,7 +96,7 @@ public final class NoChatReportsClient implements ClientModInitializer { || (disconnectReason.getContents() instanceof TranslatableContents translatable && KEY_DISCONNECT_REASONS.contains(translatable.getKey()))) { if (ServerSafetyState.getLastServerAddress() != null) { - if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) { + if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress())) { if (NCRConfig.getCommon().enableDebugLog()) { NoChatReports.LOGGER.info("Server {} evaluated as unsafe and is not whitelisted, displaying warning screen.", ServerSafetyState.getLastServerAddress().getHost() + ":" + ServerSafetyState.getLastServerAddress().getPort()); diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java index a0b88b2..8139fca 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -3,6 +3,8 @@ package com.aizistral.nochatreports.config; import java.util.ArrayList; import java.util.List; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.gui.FontHelper; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; @@ -174,7 +176,10 @@ public final class ModMenuIntegration implements ModMenuApi { technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod) .setDefaultValue(true) .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().enableMod = newValue) + .setSaveConsumer(newValue -> { + NCRConfig.getClient().enableMod = newValue; + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); + }) .build()); // Set an option for reconnectAwaitSeconds diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java index 71ca2f6..ec552b2 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java @@ -18,7 +18,7 @@ import net.minecraft.util.StringUtil; public class NCRConfigEncryption extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json"; protected boolean skipWarning = false, enableEncryption = false, encryptPublic = true, - showEncryptionButton = true; + showEncryptionButton = true, showEncryptionIndicators = true; protected String encryptionKey = Encryption.AES_CFB8.getDefaultKey(), encryptionPassphrase = "", algorithmName = Encryption.AES_CFB8.getName(); protected List<String> encryptableCommands = List.of("msg:1", "w:1", "whisper:1", "tell:1", "r:0", "dm:1", @@ -103,6 +103,10 @@ public class NCRConfigEncryption extends JSONConfig { return this.encryptPublic; } + public boolean showEncryptionIndicators() { + return this.showEncryptionIndicators; + } + public boolean isEnabledAndValid() { return this.isEnabled() && this.isValid(); } diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java index 48658e7..5d36cf5 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java @@ -42,7 +42,8 @@ public class NCRServerWhitelist extends JSONConfig { */ public boolean isWhitelisted(ServerAddress address) { - return this.getList().contains(address.getHost() + ":" + address.getPort()); + return NCRConfig.getClient().whitelistAllServers() || + this.getList().contains(address.getHost() + ":" + address.getPort()); } } diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 6494dbc..586d828 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -44,10 +44,16 @@ public enum ServerSafetyLevel { REALMS, /** + * Reserved for when mod is toggled mid-session and cannot evaluate safety status. + */ + + UNKNOWN, + + /** * Transient status for when evaluation of safety level is not yet complete for current server. */ - UNKNOWN; + UNDEFINED; @Environment(EnvType.CLIENT) public Component getTooltip() { diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index 0d5b591..21f8f75 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -21,7 +21,7 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress; @Environment(EnvType.CLIENT) public final class ServerSafetyState { - private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN; + private static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; private static ServerAddress lastServerAddress = null; private static ServerData lastServerData = null; private static AtomicBoolean allowUnsafeServer = new AtomicBoolean(false), @@ -102,7 +102,7 @@ public final class ServerSafetyState { } public static void reset() { - current = ServerSafetyLevel.UNKNOWN; + current = ServerSafetyLevel.UNDEFINED; allowUnsafeServer.set(false); sessionRequestedKey.set(false); isOnServer.set(false); diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java index 67124ff..d7ec841 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java @@ -24,6 +24,7 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; +import net.minecraft.SharedConstants; import net.minecraft.util.Tuple; public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> { @@ -77,10 +78,10 @@ public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> this.encryptor.init(ENCRYPT_MODE, this.key, tuple.getA()); byte[] encrypted = this.encryptor.doFinal(toBytes(message)); - return encodeBase64(ByteBuffer.allocate(encrypted.length + tuple.getB().length).put(tuple.getB()) + return encodeBase64R(ByteBuffer.allocate(encrypted.length + tuple.getB().length).put(tuple.getB()) .put(encrypted).array()); } else - return encodeBase64(this.encryptor.doFinal(toBytes(message))); + return encodeBase64R(this.encryptor.doFinal(toBytes(message))); } catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) { throw new RuntimeException(ex); } @@ -90,12 +91,12 @@ public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> public String decrypt(String message) { try { if (this.useIV) { - var tuple = this.splitIV(decodeBase64Bytes(message)); + var tuple = this.splitIV(decodeBase64RBytes(message)); this.decryptor.init(DECRYPT_MODE, this.key, tuple.getA()); return fromBytes(this.decryptor.doFinal(tuple.getB())); } else - return fromBytes(this.decryptor.doFinal(decodeBase64Bytes(message))); + return fromBytes(this.decryptor.doFinal(decodeBase64RBytes(message))); } catch (AEADBadTagException ex) { return "???"; } catch (IllegalBlockSizeException | BadPaddingException | InvalidKeyException | InvalidAlgorithmParameterException ex) { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java index f95d346..7ced16a 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java @@ -7,9 +7,16 @@ import java.security.SecureRandom; import java.util.Arrays; import java.util.Base64; import java.util.List; +import java.util.Map; + +import it.unimi.dsi.fastutil.chars.Char2CharArrayMap; +import it.unimi.dsi.fastutil.chars.Char2CharMap; +import it.unimi.dsi.fastutil.chars.Char2CharMaps; public abstract class Encryptor<T extends Encryption> { protected static final SecureRandom RANDOM = new SecureRandom(); + protected static final Char2CharMap BASE64R_SHIFTS = createBase64RShifts(); + protected static final Char2CharMap BASE64R_SHIFTS_REVERSE = createBase64RShiftsReverse(); protected Encryptor() { // NO-OP @@ -23,6 +30,26 @@ public abstract class Encryptor<T extends Encryption> { public abstract String getKey(); + protected static String shiftBase64R(String string) { + char[] chars = ensureUTF8(string).toCharArray(); + + for (int i = 0; i < chars.length; i++) { + chars[i] = BASE64R_SHIFTS.get(chars[i]); + } + + return new String(chars); + } + + protected static String unshiftBase64R(String string) { + char[] chars = ensureUTF8(string).toCharArray(); + + for (int i = 0; i < chars.length; i++) { + chars[i] = BASE64R_SHIFTS_REVERSE.get(chars[i]); + } + + return new String(chars); + } + protected static byte[] toBytes(String string) { return string.getBytes(StandardCharsets.UTF_8); } @@ -35,24 +62,24 @@ public abstract class Encryptor<T extends Encryption> { return fromBytes(toBytes(string)); } - protected static String encodeBase64(String string) { - return encodeBase64(toBytes(string)); + protected static String encodeBase64R(String string) { + return encodeBase64R(toBytes(string)); } - protected static String encodeBase64(byte[] bytes) { - return fromBytes(Encryption.BASE64_ENCODER.encode(bytes)).replace('/', '\\'); + protected static String encodeBase64R(byte[] bytes) { + return shiftBase64R(fromBytes(Encryption.BASE64_ENCODER.encode(bytes))); } - protected static byte[] encodeBase64Bytes(String string) { - return toBytes(encodeBase64(toBytes(string))); + protected static byte[] encodeBase64RBytes(String string) { + return toBytes(encodeBase64R(toBytes(string))); } - protected static String decodeBase64(String string) { - return fromBytes(decodeBase64Bytes(string)); + protected static String decodeBase64R(String string) { + return fromBytes(decodeBase64RBytes(string)); } - protected static byte[] decodeBase64Bytes(String string) { - return Encryption.BASE64_DECODER.decode(toBytes(string.replace('\\', '/'))); + protected static byte[] decodeBase64RBytes(String string) { + return Encryption.BASE64_DECODER.decode(toBytes(unshiftBase64R(string))); } protected static String encodeBinaryKey(byte[] key) { @@ -73,4 +100,87 @@ public abstract class Encryptor<T extends Encryption> { return result; } + private static Char2CharMap createBase64RShiftsReverse() { + Char2CharMap map = createBase64RShifts(); + Char2CharMap reverse = new Char2CharArrayMap(64); + + for (char ch : map.keySet()) { + reverse.put(map.get(ch), ch); + } + + return Char2CharMaps.unmodifiable(reverse); + } + + private static Char2CharMap createBase64RShifts() { + Char2CharMap map = new Char2CharArrayMap(64); + + map.put('A', '!'); + map.put('B', '"'); + map.put('C', '#'); + map.put('D', '$'); + map.put('E', '%'); + map.put('F', '&'); + map.put('G', '\''); + map.put('H', '('); + map.put('I', ')'); + map.put('J', ','); + map.put('K', '-'); + map.put('L', '.'); + map.put('M', ':'); + map.put('N', ';'); + map.put('O', '<'); + map.put('P', '='); + map.put('Q', '>'); + map.put('R', '?'); + map.put('S', '@'); + map.put('T', '['); + map.put('U', '\\'); + map.put('V', ']'); + map.put('W', '^'); + map.put('X', '_'); + map.put('Y', '`'); + map.put('Z', '{'); + map.put('a', '|'); + map.put('b', '}'); + map.put('c', '~'); + map.put('d', '¡'); + map.put('e', '¢'); + map.put('f', '£'); + map.put('g', '¤'); + map.put('h', '¥'); + map.put('i', '¦'); + map.put('j', '¨'); + map.put('k', '©'); + map.put('l', 'ª'); + map.put('m', '«'); + map.put('n', '¬'); + map.put('o', '®'); + map.put('p', '¯'); + map.put('q', '°'); + map.put('r', '±'); + map.put('s', '²'); + map.put('t', '³'); + map.put('u', 'µ'); + map.put('v', '¶'); + map.put('w', '·'); + map.put('x', '¸'); + map.put('y', '¹'); + map.put('z', 'º'); + map.put('0', '0'); + map.put('1', '1'); + map.put('2', '2'); + map.put('3', '3'); + map.put('4', '4'); + map.put('5', '5'); + map.put('6', '6'); + map.put('7', '7'); + map.put('8', '8'); + map.put('9', '9'); + map.put('+', '+'); + map.put('/', '»'); + map.put('=', '¿'); + + return Char2CharMaps.unmodifiable(map); + } + } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java index ce6d522..cad93cd 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java @@ -47,18 +47,17 @@ public class MixinChatComponent { + "wrapComponents(Lnet/minecraft/network/chat/FormattedText;ILnet/minecraft/client/gui/Font;" + ")Ljava/util/List;", ordinal = 0, shift = Shift.AFTER), argsOnly = true) private synchronized GuiMessageTag modifyGUITag(GuiMessageTag tag) { - if (this.lastMessageEncrypted) { - this.lastMessageEncrypted = false; - Component tooltip = Component.empty().append(Component.translatable("tag.nochatreports.encrypted", - Component.literal(NCRConfig.getEncryption().getAlgorithm().getName()) - .withStyle(ChatFormatting.BOLD))).append(CommonComponents.NEW_LINE).append( - Component.translatable("tag.nochatreports.encrypted_original", - this.lastMessageOriginal)); - - //System.out.println("Last message original: " + last); - return new GuiMessageTag(0x8B3EC7, ENCRYPTED_ICON, tooltip, "Encrypted"); - } else + if (!NCRConfig.getEncryption().showEncryptionIndicators() || !this.lastMessageEncrypted) return tag; + + this.lastMessageEncrypted = false; + Component tooltip = Component.empty().append(Component.translatable("tag.nochatreports.encrypted", + Component.literal(NCRConfig.getEncryption().getAlgorithm().getName()) + .withStyle(ChatFormatting.BOLD))).append(CommonComponents.NEW_LINE).append( + Component.translatable("tag.nochatreports.encrypted_original", + this.lastMessageOriginal)); + + return new GuiMessageTag(0x8B3EC7, ENCRYPTED_ICON, tooltip, "Encrypted"); } @ModifyArg(index = 0, method = "addMessage(Lnet/minecraft/network/chat/Component;" 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 a05152c..7b69957 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -57,7 +57,7 @@ public abstract class MixinChatScreen extends Screen { String message = info.getReturnValue(); NCRConfig.getEncryption().setLastMessage(message); - if (!message.isEmpty() && NCRConfig.getEncryption().shouldEncrypt(message)) { + if (!message.isEmpty() && !Screen.hasControlDown() && NCRConfig.getEncryption().shouldEncrypt(message)) { NCRConfig.getEncryption().getEncryptor().ifPresent(e -> { int index = NCRConfig.getEncryption().getEncryptionStartIndex(message); String noencrypt = message.substring(0, index); @@ -127,9 +127,11 @@ public abstract class MixinChatScreen extends Screen { private int getXOffset(ServerSafetyLevel level) { return switch (level) { case SECURE -> 21; - case UNINTRUSIVE, UNKNOWN -> 42; + case UNINTRUSIVE -> 42; case INSECURE -> 0; case REALMS -> 63; + case UNKNOWN -> 84; + case UNDEFINED -> 105; }; } 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 86101bf..947729d 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -33,7 +33,7 @@ public class MixinConnectScreen { if (!NCRConfig.getClient().enableMod()) return; - ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); // just to be 100% sure + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNDEFINED); // just to be 100% sure ServerSafetyState.setLastConnectedServer(serverAddress, serverData); if (NCRConfig.getServerWhitelist().isWhitelisted(serverAddress)) { |
