mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-06 06:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

More efficient secure ID generator

Browse Source 
Closes #42283

Signed-off-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
Co-authored-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
This commit is contained in:
Pedro Ruivo
2025-09-12 12:52:26 +01:00
committed by GitHub
parent 232c91e6b7
commit 971016f743
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/src/main/java/org/keycloak/common/util/SecretGenerator.java
View File

@@ -1,7 +1,6 @@
package org.keycloak.common.util;
import java.security.SecureRandom;
import java.util.Random;
import java.util.UUID;
public class SecretGenerator {
@@ -18,12 +17,7 @@ public class SecretGenerator {
private static final SecretGenerator instance = new SecretGenerator();
private ThreadLocal<Random> random = new ThreadLocal<Random>() {
@Override
protected Random initialValue() {
return new SecureRandom();
}
};
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
private SecretGenerator() {
}
@@ -33,12 +27,7 @@ public class SecretGenerator {
}
public String generateSecureID() {
StringBuilder builder = new StringBuilder(instance.randomBytesHex(16));
builder.insert(8, '-');
builder.insert(13, '-');
builder.insert(18, '-');
builder.insert(23, '-');
return builder.toString();
return generateSecureUUID().toString();
}
public String randomString() {
@@ -57,11 +46,10 @@ public class SecretGenerator {
throw new IllegalArgumentException();
}
Random r = random.get();
char[] buf = new char[length];
for (int idx = 0; idx < buf.length; ++idx) {
buf[idx] = symbols[r.nextInt(symbols.length)];
buf[idx] = symbols[SECURE_RANDOM.nextInt(symbols.length)];
}
return new String(buf);
@@ -77,7 +65,7 @@ public class SecretGenerator {
}
byte[] buf = new byte[length];
random.get().nextBytes(buf);
SECURE_RANDOM.nextBytes(buf);
return buf;
}
@@ -121,6 +109,18 @@ public class SecretGenerator {
* @return UUID with all bits random
*/
public UUID generateSecureUUID() {
return new UUID(random.get().nextLong(), random.get().nextLong());
byte[] data = randomBytes(16);
return new UUID(toLong(data, 0), toLong(data, 8));
}
private static long toLong(byte[] data, int offset) {
return ((data[offset] & 0xFFL) << 56) |
((data[offset + 1] & 0xFFL) << 48) |
((data[offset + 2] & 0xFFL) << 40) |
((data[offset + 3] & 0xFFL) << 32) |
((data[offset + 4] & 0xFFL) << 24) |
((data[offset + 5] & 0xFFL) << 16) |
((data[offset + 6] & 0xFFL) << 8) |
((data[offset + 7] & 0xFFL)) ;
}
}