summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorfestino2023-09-27 22:18:50 +0300
committerGitHub2023-09-27 21:18:50 +0200
commit1338d91f086641659fed5160c74b4811d98c228f (patch)
tree35ed8a9315350d7e406f4cdaa5a13aecb9ccae56 /src
parent4fe56c095ac4a8de90b0c77c3aa654ac9d50c331 (diff)
Fix long encrypted string causing EncoderException (#429)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java
index 3203d33..f94c8a6 100644
--- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java
@@ -13,6 +13,7 @@ import com.aizistral.nochatreports.common.config.NCRConfig;
import com.aizistral.nochatreports.common.core.ServerSafetyLevel;
import com.aizistral.nochatreports.common.core.ServerSafetyState;
import com.aizistral.nochatreports.common.core.SigningMode;
+import com.aizistral.nochatreports.common.encryption.Encryptor;
import com.aizistral.nochatreports.common.gui.AdvancedImageButton;
import com.aizistral.nochatreports.common.gui.AdvancedTooltip;
import com.aizistral.nochatreports.common.gui.EncryptionButton;
@@ -45,6 +46,7 @@ import net.minecraft.resources.ResourceLocation;
@Mixin(ChatScreen.class)
public abstract class MixinChatScreen extends Screen {
+ private static final int MESSAGE_MAX_LENGTH = 256;
private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons_extended.png");
private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png");
private AdvancedImageButton safetyStatusButton;
@@ -96,11 +98,24 @@ public abstract class MixinChatScreen extends Screen {
String encrypt = message.substring(index, message.length());
if (encrypt.length() > 0) {
- info.setReturnValue(noencrypt + e.encrypt("#%" + encrypt));
+ int maxEncryptedLength = MESSAGE_MAX_LENGTH - noencrypt.length();
+ info.setReturnValue(noencrypt + getEncrypted(e, encrypt, maxEncryptedLength));
}
});
}
}
+
+ private String getEncrypted(Encryptor<?> e, String encrypt, int maxLength) {
+ while (encrypt.length() > 0) {
+ String encrypted = e.encrypt("#%" + encrypt);
+ if (encrypted.length() <= maxLength)
+ return encrypted;
+
+ encrypt = encrypt.substring(0, encrypt.length() - 1);
+ }
+
+ return "";
+ }
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {