feat: allow to only override security filterchain

terrestris · Sep 5, 2023 · 16335f9 · 16335f9
1 parent d368194
commit 16335f9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 25 deletions.
diff --git a/shogun-config/src/main/java/de/terrestris/shogun/config/DefaultWebSecurityConfig.java b/shogun-config/src/main/java/de/terrestris/shogun/config/DefaultWebSecurityConfig.java
@@ -66,4 +66,8 @@ default void customHttpConfiguration(HttpSecurity http) throws Exception {
                     .ignoringRequestMatchers("/ws/**");
     }
 
+    default void configure(HttpSecurity http) throws Exception {
+        customHttpConfiguration(http);
+    }
+
 }
diff --git a/shogun-config/src/main/java/de/terrestris/shogun/config/KeycloakWebSecurityConfig.java b/shogun-config/src/main/java/de/terrestris/shogun/config/KeycloakWebSecurityConfig.java
@@ -49,7 +49,7 @@ public void init() {
     }
 
     @Override
-    public void customHttpConfiguration(HttpSecurity http) throws Exception {
+    public void configure(HttpSecurity http) throws Exception {
         http
             .authorizeHttpRequests((auths) -> auths
                 .requestMatchers("/webhooks/keycloak/**")
@@ -58,7 +58,7 @@ public void customHttpConfiguration(HttpSecurity http) throws Exception {
                 ))
             );
 
-        DefaultWebSecurityConfig.super.customHttpConfiguration(http);
+        customHttpConfiguration(http);
 
         KeycloakJwtAuthenticationConverter authConverter = new KeycloakJwtAuthenticationConverter(
             keycloakProperties.getClientId(),

diff --git a/shogun-config/src/main/java/de/terrestris/shogun/config/WebSecurityConfig.java b/shogun-config/src/main/java/de/terrestris/shogun/config/WebSecurityConfig.java
@@ -36,10 +36,12 @@ public interface WebSecurityConfig {
     @Bean
     @ConditionalOnMissingBean
     default SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        customHttpConfiguration(http);
+        configure(http);
         return http.getOrBuild();
     }
 
+    void configure(HttpSecurity http) throws Exception;
+
     void customHttpConfiguration(HttpSecurity http) throws Exception;
 
 }
diff --git a/...r/src/main/java/de/terrestris/shogun/interceptor/config/InterceptorWebSecurityConfig.java b/...r/src/main/java/de/terrestris/shogun/interceptor/config/InterceptorWebSecurityConfig.java
@@ -33,30 +33,29 @@ public class InterceptorWebSecurityConfig implements DefaultWebSecurityConfig {
         return StringUtils.equalsIgnoreCase(refererHeader, "Shogun-Manager-Client");
     };
 
-    @Bean
-    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+    @Override
+    public void customHttpConfiguration(HttpSecurity http) throws Exception {
         http
             .authorizeHttpRequests()
-            .requestMatchers(
-                // Allow access to swagger interface
-                "/swagger-ui/index.html",
-                "/swagger-resources/**",
-                "/webjars/**",
-                "/v2/**",
-                "/csrf/**"
-            )
-            .permitAll()
-            .requestMatchers("/interceptorrules/**")
-            .hasRole("INTERCEPTOR_ADMIN")
-            .anyRequest()
-            .authenticated()
-            .and()
-            .httpBasic()
-            .and()
-            .csrf()
-            .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-            .ignoringRequestMatchers(csrfRequestMatcher);
-        return http.build();
+                .requestMatchers(
+                    // Allow access to swagger interface
+                    "/swagger-ui/index.html",
+                    "/swagger-resources/**",
+                    "/webjars/**",
+                    "/v3/**",
+                    "/csrf/**"
+                )
+                    .permitAll()
+                .requestMatchers("/interceptorrules/**")
+                    .hasRole("INTERCEPTOR_ADMIN")
+                .anyRequest()
+                    .authenticated()
+                .and()
+                    .httpBasic()
+                .and()
+                    .csrf()
+                        .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+                        .ignoringRequestMatchers(csrfRequestMatcher);
     }
 
 }