|
| 1 | +package fr.xephi.authme.security.crypts; |
| 2 | + |
| 3 | +import fr.xephi.authme.security.crypts.description.HasSalt; |
| 4 | +import fr.xephi.authme.security.crypts.description.Recommendation; |
| 5 | +import fr.xephi.authme.security.crypts.description.SaltType; |
| 6 | +import fr.xephi.authme.security.crypts.description.Usage; |
| 7 | +import org.bouncycastle.crypto.generators.Argon2BytesGenerator; |
| 8 | +import org.bouncycastle.crypto.params.Argon2Parameters; |
| 9 | + |
| 10 | +import java.security.MessageDigest; |
| 11 | +import java.security.SecureRandom; |
| 12 | +import java.util.Base64; |
| 13 | + |
| 14 | +@Recommendation(Usage.RECOMMENDED) |
| 15 | +@HasSalt(value = SaltType.TEXT, length = 16) |
| 16 | +// Note: Argon2id is actually a salted algorithm but salt generation is handled internally |
| 17 | +// and isn't exposed to the outside, so we treat it as an unsalted implementation |
| 18 | +public class Argon2Id extends UnsaltedMethod { |
| 19 | + |
| 20 | + private static final int ITERATIONS = 2; |
| 21 | + private static final int MEMORY_KB = 65536; |
| 22 | + private static final int PARALLELISM = 1; |
| 23 | + private static final int SALT_BYTES = 16; |
| 24 | + private static final int HASH_BYTES = 32; |
| 25 | + |
| 26 | + private final SecureRandom random = new SecureRandom(); |
| 27 | + |
| 28 | + @Override |
| 29 | + public String computeHash(String password) { |
| 30 | + byte[] salt = new byte[SALT_BYTES]; |
| 31 | + random.nextBytes(salt); |
| 32 | + byte[] hash = derive(password.toCharArray(), salt, ITERATIONS, MEMORY_KB, PARALLELISM, HASH_BYTES); |
| 33 | + Base64.Encoder enc = Base64.getEncoder().withoutPadding(); |
| 34 | + return "$argon2id$v=19$m=" + MEMORY_KB + ",t=" + ITERATIONS + ",p=" + PARALLELISM |
| 35 | + + "$" + enc.encodeToString(salt) |
| 36 | + + "$" + enc.encodeToString(hash); |
| 37 | + } |
| 38 | + |
| 39 | + @Override |
| 40 | + public boolean comparePassword(String password, HashedPassword hashedPassword, String name) { |
| 41 | + String[] parts = hashedPassword.getHash().split("\\$"); |
| 42 | + // Expected: ["", "argon2id", "v=19", "m=65536,t=2,p=1", "<salt_b64>", "<hash_b64>"] |
| 43 | + if (parts.length != 6 || !"argon2id".equals(parts[1])) { |
| 44 | + return false; |
| 45 | + } |
| 46 | + try { |
| 47 | + int[] params = parseParams(parts[3]); // m, t, p |
| 48 | + byte[] salt = decodeNoPadding(parts[4]); |
| 49 | + byte[] expected = decodeNoPadding(parts[5]); |
| 50 | + byte[] computed = derive(password.toCharArray(), salt, params[1], params[0], params[2], expected.length); |
| 51 | + return MessageDigest.isEqual(computed, expected); |
| 52 | + } catch (IllegalArgumentException e) { |
| 53 | + return false; |
| 54 | + } |
| 55 | + } |
| 56 | + |
| 57 | + private static byte[] derive(char[] password, byte[] salt, int iterations, int memoryKb, int parallelism, int hashLen) { |
| 58 | + Argon2Parameters params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id) |
| 59 | + .withVersion(Argon2Parameters.ARGON2_VERSION_13) |
| 60 | + .withIterations(iterations) |
| 61 | + .withMemoryAsKB(memoryKb) |
| 62 | + .withParallelism(parallelism) |
| 63 | + .withSalt(salt) |
| 64 | + .build(); |
| 65 | + Argon2BytesGenerator generator = new Argon2BytesGenerator(); |
| 66 | + generator.init(params); |
| 67 | + byte[] result = new byte[hashLen]; |
| 68 | + generator.generateBytes(password, result); |
| 69 | + return result; |
| 70 | + } |
| 71 | + |
| 72 | + /** Parses "m=65536,t=2,p=1" → [m, t, p]. */ |
| 73 | + private static int[] parseParams(String paramStr) { |
| 74 | + int[] result = new int[3]; |
| 75 | + for (String kv : paramStr.split(",")) { |
| 76 | + String[] pair = kv.split("="); |
| 77 | + int v = Integer.parseInt(pair[1]); |
| 78 | + switch (pair[0]) { |
| 79 | + case "m": result[0] = v; break; |
| 80 | + case "t": result[1] = v; break; |
| 81 | + case "p": result[2] = v; break; |
| 82 | + } |
| 83 | + } |
| 84 | + return result; |
| 85 | + } |
| 86 | + |
| 87 | + /** Decodes base64 without padding (PHC format omits '='). */ |
| 88 | + private static byte[] decodeNoPadding(String s) { |
| 89 | + switch (s.length() % 4) { |
| 90 | + case 2: s += "=="; break; |
| 91 | + case 3: s += "="; break; |
| 92 | + default: break; |
| 93 | + } |
| 94 | + return Base64.getDecoder().decode(s); |
| 95 | + } |
| 96 | +} |
0 commit comments