Merge branch '4.11.x' into 4.12.x

micronaut-projects · Nov 29, 2024 · bd47b8c · bd47b8c
2 parents 06ddf39 + 4876089
commit bd47b8c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...-jwt/src/main/java/io/micronaut/security/token/jwt/signature/jwks/JwksSignatureUtils.java b/...-jwt/src/main/java/io/micronaut/security/token/jwt/signature/jwks/JwksSignatureUtils.java
@@ -32,6 +32,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -71,10 +72,7 @@ public static boolean verify(SignedJWT jwt, JWKSet jwkSet, JwkValidator jwkValid
      * @return whether this signature configuration supports this algorithm
      */
     public static boolean supports(JWSAlgorithm algorithm, JWKSet jwkSet) {
-        return jwkSet.getKeys()
-            .stream()
-            .map(JWK::getAlgorithm)
-            .anyMatch(algorithm::equals);
+        return supports(algorithm, jwkSet.getKeys());
     }
 
     /**
@@ -88,6 +86,7 @@ public static boolean supports(JWSAlgorithm algorithm, List<JWK> keys) {
         return keys
             .stream()
             .map(JWK::getAlgorithm)
+            .filter(Objects::nonNull)
             .anyMatch(algorithm::equals);
     }
 
@@ -106,6 +105,7 @@ public static String supportedAlgorithmsMessage(JWKSet jwkSet) {
     public static String supportedAlgorithmsMessage(List<JWK> keys) {
         return keys.stream()
             .map(JWK::getAlgorithm)
+            .filter(Objects::nonNull)
             .map(Algorithm::getName)
             .distinct()
             .reduce((a, b) -> a + ", " + b)