From b71ed77773b7d967821daa2bb66b56a5bbe300e6 Mon Sep 17 00:00:00 2001 From: Clemens Zagler Date: Tue, 5 Dec 2023 14:49:24 +0100 Subject: [PATCH] Don't supply AuthenticationManager bean in attempt to solve errors when oauth token is invalid --- .../it/bz/idm/bdp/writer/CustomRequestInterceptor.java | 4 ++-- .../main/java/it/bz/idm/bdp/writer/config/WebSecurity.java | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/writer/src/main/java/it/bz/idm/bdp/writer/CustomRequestInterceptor.java b/writer/src/main/java/it/bz/idm/bdp/writer/CustomRequestInterceptor.java index 8a9f8a15..8f74ab41 100644 --- a/writer/src/main/java/it/bz/idm/bdp/writer/CustomRequestInterceptor.java +++ b/writer/src/main/java/it/bz/idm/bdp/writer/CustomRequestInterceptor.java @@ -89,10 +89,10 @@ public void afterCompletion( request.setAttribute("level", "WARN"); LOG.warn("API call", v("api_request_info", logPayload)); } else { - logPayload.put("exception", Arrays.toString(exception.getStackTrace())); + logPayload.put("exception", exception != null ? Arrays.toString(exception.getStackTrace()) : ""); logPayload.put("request_state", "ERROR"); LOG.error("API call", v("api_request_info", logPayload)); - if (LOG.isDebugEnabled()) { + if (LOG.isDebugEnabled() && exception != null) { exception.printStackTrace(System.err); } } diff --git a/writer/src/main/java/it/bz/idm/bdp/writer/config/WebSecurity.java b/writer/src/main/java/it/bz/idm/bdp/writer/config/WebSecurity.java index 151fb2ab..0a9ede2a 100644 --- a/writer/src/main/java/it/bz/idm/bdp/writer/config/WebSecurity.java +++ b/writer/src/main/java/it/bz/idm/bdp/writer/config/WebSecurity.java @@ -12,9 +12,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; import org.springframework.security.authentication.AbstractAuthenticationToken; -import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.Customizer; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -37,11 +35,6 @@ public SessionAuthenticationStrategy sessionAuthenticationStrategy() { return new NullAuthenticatedSessionStrategy(); } - @Bean - public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception { - return http.getSharedObject(AuthenticationManagerBuilder.class).build(); - } - // For some reason, spring does not read the role claim from the jwt. // Since we're basing our authorization on roles, we have to extend the spring security jwt converter to get that functionality. // see https://stackoverflow.com/questions/65518172/spring-security-cant-extract-roles-from-jwt for reference