From b676a311c384da6fad1b863e8fe0afd2332ba9ff Mon Sep 17 00:00:00 2001 From: Marko Strukelj Date: Wed, 15 Jan 2020 18:03:57 +0100 Subject: [PATCH] Fix variable public key algorithm name - EC and ECDSA Signed-off-by: Marko Strukelj --- .../kafka/oauth/validator/JWTSignatureValidator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java b/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java index 35fe7cbf..cb6d9155 100644 --- a/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java +++ b/oauth-common/src/main/java/io/strimzi/kafka/oauth/validator/JWTSignatureValidator.java @@ -187,7 +187,7 @@ public TokenInfo validate(String token) { keywrap.setKid(kid); log.debug("Signature algorithm used: [" + pub.getAlgorithm() + "]"); - AsymmetricSignatureVerifierContext ctx = "EC".equals(pub.getAlgorithm()) ? + AsymmetricSignatureVerifierContext ctx = isAlgorithmEC(pub.getAlgorithm()) ? new ECDSASignatureVerifierContext(keywrap) : new AsymmetricSignatureVerifierContext(keywrap); tokenVerifier.verifierContext(ctx); @@ -214,6 +214,10 @@ public TokenInfo validate(String token) { return new TokenInfo(t, token); } + private static boolean isAlgorithmEC(String algorithm) { + return "EC".equals(algorithm) || "ECDSA".equals(algorithm); + } + /** * Use daemon thread for refresh job