From 3f8eaf4ca18fa7a5e252010ceb40fe77ea5e6676 Mon Sep 17 00:00:00 2001 From: GodCipher Date: Wed, 29 May 2024 17:53:09 +0200 Subject: [PATCH 1/2] Removed password encoding --- .../luzifer/spring/config/WebSecurityConfig.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/paladins-webservice/src/main/java/dev/luzifer/spring/config/WebSecurityConfig.java b/paladins-webservice/src/main/java/dev/luzifer/spring/config/WebSecurityConfig.java index 056e149..766976b 100644 --- a/paladins-webservice/src/main/java/dev/luzifer/spring/config/WebSecurityConfig.java +++ b/paladins-webservice/src/main/java/dev/luzifer/spring/config/WebSecurityConfig.java @@ -9,10 +9,7 @@ import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.crypto.password.NoOpPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository; @@ -26,11 +23,6 @@ public WebSecurityConfig(@Value("${api.key}") String apiKey) { this.apiKey = apiKey; } - @Bean - public PasswordEncoder passwordEncoder() { - return NoOpPasswordEncoder.getInstance(); - } - @Bean public ApiKeyAuthFilter apiKeyAuthFilter(AuthenticationManager authenticationManager) { return new ApiKeyAuthFilter("API-KEY-HEADER", authenticationManager); @@ -53,11 +45,6 @@ public AuthenticationManager authenticationManager( return authenticationConfiguration.getAuthenticationManager(); } - @Bean - public WebSecurityCustomizer webSecurityCustomizer() { - return (web) -> web.debug(true); - } - @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.authenticationProvider(new ApiKeyAuthenticationProvider(apiKey)); From f2e2e189ed09f7e6a8b2412fe430f626e48994f5 Mon Sep 17 00:00:00 2001 From: GodCipher Date: Wed, 29 May 2024 18:05:59 +0200 Subject: [PATCH 2/2] Added async logging --- .../{ => async}/AsyncConfiguration.java | 11 +++++++++-- .../AsyncUncaughtExceptionHandlerImpl.java | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) rename paladins-webservice/src/main/java/dev/luzifer/spring/config/{ => async}/AsyncConfiguration.java (61%) create mode 100644 paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncUncaughtExceptionHandlerImpl.java diff --git a/paladins-webservice/src/main/java/dev/luzifer/spring/config/AsyncConfiguration.java b/paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncConfiguration.java similarity index 61% rename from paladins-webservice/src/main/java/dev/luzifer/spring/config/AsyncConfiguration.java rename to paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncConfiguration.java index acedb9f..aad6bcf 100644 --- a/paladins-webservice/src/main/java/dev/luzifer/spring/config/AsyncConfiguration.java +++ b/paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncConfiguration.java @@ -1,13 +1,15 @@ -package dev.luzifer.spring.config; +package dev.luzifer.spring.config.async; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @Configuration @EnableAsync -public class AsyncConfiguration { +public class AsyncConfiguration implements AsyncConfigurer { @Bean(name = "taskExecutor") public ThreadPoolTaskExecutor taskExecutor() { @@ -19,4 +21,9 @@ public ThreadPoolTaskExecutor taskExecutor() { executor.initialize(); return executor; } + + @Override + public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { + return new AsyncUncaughtExceptionHandlerImpl(); + } } diff --git a/paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncUncaughtExceptionHandlerImpl.java b/paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncUncaughtExceptionHandlerImpl.java new file mode 100644 index 0000000..6595ea2 --- /dev/null +++ b/paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncUncaughtExceptionHandlerImpl.java @@ -0,0 +1,19 @@ +package dev.luzifer.spring.config.async; + +import java.lang.reflect.Method; +import java.util.Arrays; +import lombok.extern.slf4j.Slf4j; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; + +@Slf4j +public class AsyncUncaughtExceptionHandlerImpl implements AsyncUncaughtExceptionHandler { + + @Override + public void handleUncaughtException(Throwable throwable, Method method, Object... objects) { + log.error( + "Uncaught exception in async executed method {} with arguments {}", + method, + Arrays.toString(objects), + throwable); + } +}