firstdarkdev/sdlink-core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix encryption key trying to load before it's present and more variation of key length

Browse Source
This commit is contained in:
HypherionSA
2023-06-22 22:15:42 +02:00
parent 24e6d84527
commit 39cd2fa7b8
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/hypherionmc/sdlink/core/util/EncryptionUtil.java
View File

@@ -6,6 +6,7 @@ package com.hypherionmc.sdlink.core.util;
import com.hypherionmc.sdlink.core.discord.BotController;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
import org.jasypt.exceptions.EncryptionOperationNotPossibleException;
@@ -46,9 +47,8 @@ public final class EncryptionUtil {
File encKey = new File(storageDir.getAbsolutePath() + File.separator + "sdlink.enc");
if (!encKey.exists()) {
FileUtils.writeStringToFile(encKey, getSaltString(), StandardCharsets.UTF_8);
} else {
encCode = FileUtils.readFileToString(encKey, StandardCharsets.UTF_8);
}
encCode = FileUtils.readFileToString(encKey, StandardCharsets.UTF_8);
} catch (Exception e) {
BotController.INSTANCE.getLogger().error("Failed to initialize Encryption", e);
}
@@ -113,14 +113,7 @@ public final class EncryptionUtil {
// Generate Random codes for encryption/decryption
private String getSaltString() {
String SALTCHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
StringBuilder salt = new StringBuilder();
Random rnd = new Random();
while (salt.length() < 18) {
int index = (int) (rnd.nextFloat() * SALTCHARS.length());
salt.append(SALTCHARS.charAt(index));
}
return salt.toString();
return RandomStringUtils.random(new Random().nextInt(40), true, true);
}
}