Additional logging.

navikt · Feb 26, 2025 · de36bbe · de36bbe
1 parent 7d1512e
commit de36bbe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/.../java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java b/.../java/no/nav/testnav/libs/reactivesecurity/action/GetAuthenticatedResourceServerType.java
@@ -22,21 +22,17 @@ public class GetAuthenticatedResourceServerType extends JwtResolver implements C
     private Optional<ResourceServerType> getResourceTypeFrom(JwtAuthenticationToken token) {
         return resourceServerProperties
                 .stream()
-                .filter(properties -> {
-                    if (token == null) {
-                        log.warn("Token is null");
-                    } else if (token.getToken() == null) {
-                        log.warn("Token.getToken() is null");
-                    } else if (token.getToken().getIssuer() == null) {
-                        log.warn("Token.getToken().getIssuer() is null");
-                    }
-                    return Optional
-                            .ofNullable(token)
-                            .map(JwtAuthenticationToken::getToken)
-                            .map(JwtClaimAccessor::getIssuer)
-                            .map(issuerFromToken -> issuerFromToken.toString().equalsIgnoreCase(properties.getIssuerUri()))
-                            .orElse(false);
-                })
+                .filter(properties ->
+                        Optional
+                                .ofNullable(token)
+                                .map(JwtAuthenticationToken::getToken)
+                                .map(JwtClaimAccessor::getIssuer)
+                                .map(issuerFromToken -> {
+                                    var issuer = issuerFromToken.toString().equalsIgnoreCase(properties.getIssuerUri());
+                                    log.info("issuerFromToken: {}, properties.getIssuerUri(): {}, issuer: {}", issuerFromToken, properties.getIssuerUri(), issuer);
+                                    return issuer;
+                                })
+                                .orElse(false))
                 .findFirst()
                 .map(ResourceServerProperties::getType);
     }

diff --git a/...ctive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java b/...ctive-security/src/main/java/no/nav/testnav/libs/reactivesecurity/action/JwtResolver.java
@@ -14,15 +14,14 @@ Mono<Authentication> getJwtAuthenticationToken() {
                 .getContext()
                 .switchIfEmpty(Mono.error(new EmptyReactiveSecurityContextException()))
                 .doOnNext(context -> log.info("JwtResolver context.authentication {} {}", context.getAuthentication().getClass().getCanonicalName(), context.getAuthentication()))
-                .map(SecurityContext::getAuthentication);
+                .map(SecurityContext::getAuthentication)
+                .doOnNext(authentication -> log.info("JwtResolver authentication {} {}", authentication.getClass().getCanonicalName(), authentication));
     }
 
     static class EmptyReactiveSecurityContextException extends IllegalStateException {
-
         EmptyReactiveSecurityContextException() {
             super();
         }
-
     }
 
 }
diff --git a/...rity/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/MultipleIssuersJwtDecoder.java b/...rity/src/main/java/no/nav/testnav/libs/servletsecurity/jwt/MultipleIssuersJwtDecoder.java
@@ -65,7 +65,7 @@ private static OAuth2TokenValidator<Jwt> customAudienceValidator(ResourceServerP
                     .stream()
                     .anyMatch(audience -> properties.getAcceptedAudience().contains(audience));
             if (!valid) {
-                log.error("Fant ikke påkrevd audience {} i tokenet, bare {}", properties.getAcceptedAudience(), token.getAudience());
+                log.warn("Fant ikke påkrevd audience {} i tokenet, bare {}", properties.getAcceptedAudience(), token.getAudience());
             }
             return OAuth2TokenValidatorResult.success();
         };

diff --git a/.../no/nav/testnav/libs/servletsecurity/jwt/SecureOAuth2ServerToServerAutoConfiguration.java b/.../no/nav/testnav/libs/servletsecurity/jwt/SecureOAuth2ServerToServerAutoConfiguration.java
@@ -36,7 +36,7 @@ public class SecureOAuth2ServerToServerAutoConfiguration {
     @Bean
     @Profile("!test")
     @ConditionalOnMissingBean
-    JwtDecoder jwtDecoder(List<ResourceServerProperties> properties) {
+    MultipleIssuersJwtDecoder jwtDecoder(List<ResourceServerProperties> properties) {
         return new MultipleIssuersJwtDecoder(properties);
     }