diff --git a/.gitignore b/.gitignore index 70e39ba..7ef4f32 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ target log.txt /AuthSchema/ .vscode -secureData*.txt +*secureData*.txt logfile.txt rmc_log.txt +logfileConf.txt diff --git a/.jules/sentinel.md b/.jules/sentinel.md new file mode 100644 index 0000000..b2d4f7f --- /dev/null +++ b/.jules/sentinel.md @@ -0,0 +1,4 @@ +## 2026-02-03 - Timing Attacks and Encoding Consistency +**Vulnerability:** Cryptographic comparisons (passwords, tokens) were using `equalsIgnoreCase`, which is not constant-time and vulnerable to timing attacks. String encoding was platform-dependent. +**Learning:** `java.security.MessageDigest.isEqual` is essential for comparing sensitive cryptographic values. `StandardCharsets.UTF_8` should always be explicitly specified. +**Prevention:** Always use `MessageDigest.isEqual` for secrets and specify `StandardCharsets.UTF_8` for all string-to-byte conversions in crypto logic. diff --git a/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/algorithm/SHA256.java b/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/algorithm/SHA256.java index f1f7103..d6552e2 100644 --- a/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/algorithm/SHA256.java +++ b/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/algorithm/SHA256.java @@ -3,6 +3,8 @@ import org.bouncycastle.crypto.digests.SHA256Digest; import it.richkmeli.jframework.util.TypeConverter; +import java.nio.charset.StandardCharsets; + public class SHA256 { public static byte[] hash(byte[] input) { SHA256Digest digest = new SHA256Digest(); @@ -15,7 +17,7 @@ public static byte[] hash(byte[] input) { // sha256: string to hex public static String hash(String input) { - return TypeConverter.bytesToHex(hash(input.getBytes())); + return TypeConverter.bytesToHex(hash(input.getBytes(StandardCharsets.UTF_8))); } public static String hashToString(byte[] input) { diff --git a/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/PasswordManager.java b/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/PasswordManager.java index 7d2b934..59cf2be 100644 --- a/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/PasswordManager.java +++ b/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/PasswordManager.java @@ -3,7 +3,8 @@ import it.richkmeli.jframework.crypto.algorithm.SHA256; import it.richkmeli.jframework.util.RandomStringGenerator; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; import java.util.Base64; public class PasswordManager { @@ -26,13 +27,13 @@ public static String hashPassword(String password, boolean saltEnabled) { //System.out.println("hashPassword, saltS: " + saltS + " " + saltS.length() + " | hashedPassword: " + hashedPassword + " " + hashedPassword.length()); String out = saltS + hashedPassword; - return Base64.getUrlEncoder().encodeToString(out.getBytes(Charset.defaultCharset())); + return Base64.getUrlEncoder().encodeToString(out.getBytes(StandardCharsets.UTF_8)); } // hashedPassword = db password, hashedSaltPassword = login password public static boolean verifyPassword(String hashedPassword, String hashedSaltPassword) { - String decodedHashedPassword = new String(Base64.getUrlDecoder().decode(hashedPassword)); - String decodedHashedSaltPassword = new String(Base64.getUrlDecoder().decode(hashedSaltPassword)); + String decodedHashedPassword = new String(Base64.getUrlDecoder().decode(hashedPassword), StandardCharsets.UTF_8); + String decodedHashedSaltPassword = new String(Base64.getUrlDecoder().decode(hashedSaltPassword), StandardCharsets.UTF_8); String salt = decodedHashedSaltPassword.substring(0, 9); String hashSP = decodedHashedSaltPassword.substring(9); String hashP = decodedHashedPassword.substring(9); @@ -40,6 +41,6 @@ public static boolean verifyPassword(String hashedPassword, String hashedSaltPas //System.out.println("verifyPassword, saltS: " + salt + " " + salt.length() + " | hashedSaltPassword: " + hashSP + " " + hashSP.length()); String hp = SHA256.hash(hashP + salt); - return hashSP.equalsIgnoreCase(hp); + return MessageDigest.isEqual(hashSP.getBytes(StandardCharsets.UTF_8), hp.getBytes(StandardCharsets.UTF_8)); } } diff --git a/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/token/TokenManager.java b/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/token/TokenManager.java index 4739e09..55f7d47 100644 --- a/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/token/TokenManager.java +++ b/JFramework/crypto/src/main/java/it/richkmeli/jframework/crypto/controller/token/TokenManager.java @@ -4,6 +4,8 @@ import it.richkmeli.jframework.crypto.exception.CryptoException; import it.richkmeli.jframework.util.RandomStringGenerator; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,7 +31,7 @@ public static boolean verifyNumericCompact(String numericCompactToken, String va String extendedToken = generate(extractedNumericSalt + value, false); // put extractedNumericSalt at first chars of extendedToken extendedToken = reduceToNumeric(extractedNumericSalt + extendedToken, numericCompactToken.length()); - return numericCompactToken.equalsIgnoreCase(extendedToken); + return MessageDigest.isEqual(numericCompactToken.getBytes(StandardCharsets.UTF_8), extendedToken.getBytes(StandardCharsets.UTF_8)); } public static String generate(String value) { @@ -109,7 +111,7 @@ public static boolean verifyTemporized(String token, String value, int minutesOf hashed = token; calculatedHash = SHA256.hash(value + (currentTimeMinutes * minutesOfValidity)); } - return hashed.equalsIgnoreCase(calculatedHash); + return MessageDigest.isEqual(hashed.getBytes(StandardCharsets.UTF_8), calculatedHash.getBytes(StandardCharsets.UTF_8)); } private static String reduceToNumeric(String extendedToken, int length) { diff --git a/JFramework/util/src/main/java/it/richkmeli/jframework/util/RandomStringGenerator.java b/JFramework/util/src/main/java/it/richkmeli/jframework/util/RandomStringGenerator.java index a0a9007..3340c42 100644 --- a/JFramework/util/src/main/java/it/richkmeli/jframework/util/RandomStringGenerator.java +++ b/JFramework/util/src/main/java/it/richkmeli/jframework/util/RandomStringGenerator.java @@ -17,11 +17,12 @@ public static String generateNumericString(int length) { return generateString(length, alphabet); } + private static final SecureRandom secureRandom = new SecureRandom(); + private static String generateString(int length, String alphabet) { int alphabetLength = alphabet.length(); StringBuilder result = new StringBuilder(); - SecureRandom secureRandom = new SecureRandom(); for (int i = 0; i < length; ++i) { result.append(alphabet.charAt(secureRandom.nextInt(alphabetLength))); @@ -42,11 +43,9 @@ public static String generateBoundedString(int targetStringLength, int leftLimit //int leftLimit = 97; // letter 'a' //int rightLimit = 122; // letter 'z' //int targetStringLength = 10; - SecureRandom random = new SecureRandom(); StringBuilder buffer = new StringBuilder(targetStringLength); for (int i = 0; i < targetStringLength; i++) { - int randomLimitedInt = leftLimit + (int) - (random.nextFloat() * (rightLimit - leftLimit + 1)); + int randomLimitedInt = leftLimit + secureRandom.nextInt(rightLimit - leftLimit + 1); buffer.append((char) randomLimitedInt); } return buffer.toString(); @@ -55,19 +54,19 @@ public static String generateBoundedString(int targetStringLength, int leftLimit public static String generateUtf8String(int length) { byte[] array = new byte[length]; // length is bounded by 7 - new SecureRandom().nextBytes(array); + secureRandom.nextBytes(array); return new String(array, StandardCharsets.UTF_8); } public static String generateUtf16String(int length) { byte[] array = new byte[length]; // length is bounded by 7 - new SecureRandom().nextBytes(array); + secureRandom.nextBytes(array); return new String(array, StandardCharsets.UTF_16); } public static String generateASCIItring(int length) { byte[] array = new byte[length]; // length is bounded by 7 - new SecureRandom().nextBytes(array); + secureRandom.nextBytes(array); return new String(array, StandardCharsets.US_ASCII); }