Merge pull request #498 from groldan/gateway_shared_auth_tests

Split gateway shared authentication filter into pre and post filters

src/apps/infrastructure/gateway/pom.xml

@@ -50,6 +50,11 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock-standalone</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

src/apps/infrastructure/gateway/src/main/java/org/geoserver/cloud/autoconfigure/gateway/GatewayApplicationAutoconfiguration.java

@@ -4,19 +4,14 @@
  */
 package org.geoserver.cloud.autoconfigure.gateway;
 
-import lombok.extern.slf4j.Slf4j;
-
-import org.geoserver.cloud.gateway.filter.GatewaySharedAuhenticationGlobalFilter;
 import org.geoserver.cloud.gateway.filter.RouteProfileGatewayFilterFactory;
 import org.geoserver.cloud.gateway.filter.StripBasePathGatewayFilterFactory;
 import org.geoserver.cloud.gateway.predicate.RegExpQueryRoutePredicateFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 
 @AutoConfiguration
-@Slf4j
 public class GatewayApplicationAutoconfiguration {
 
     /**
@@ -66,14 +61,4 @@ RouteProfileGatewayFilterFactory routeProfileGatewayFilterFactory(Environment en
     StripBasePathGatewayFilterFactory stripBasePathGatewayFilterFactory() {
         return new StripBasePathGatewayFilterFactory();
     }
-
-    @Bean
-    @ConditionalOnProperty(
-            name = "geoserver.security.gateway-shared-auth.enabled",
-            havingValue = "true",
-            matchIfMissing = true)
-    GatewaySharedAuhenticationGlobalFilter gatewaySharedAuhenticationGlobalFilter() {
-        log.info("gateway-shared-auth is enabled");
-        return new GatewaySharedAuhenticationGlobalFilter();
-    }
 }

src/apps/infrastructure/gateway/src/main/java/org/geoserver/cloud/autoconfigure/gateway/GatewaySharedAuthAutoConfiguration.java

@@ -0,0 +1,39 @@
+/*
+ * (c) 2024 Open Source Geospatial Foundation - all rights reserved This code is licensed under the
+ * GPL 2.0 license, available at the root application directory.
+ */
+package org.geoserver.cloud.autoconfigure.gateway;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.geoserver.cloud.security.gateway.sharedauth.GatewaySharedAuhenticationPostFilter;
+import org.geoserver.cloud.security.gateway.sharedauth.GatewaySharedAuhenticationPreFilter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+
+import javax.annotation.PostConstruct;
+
+@AutoConfiguration
+@ConditionalOnProperty(
+        name = "geoserver.security.gateway-shared-auth.enabled",
+        havingValue = "true",
+        matchIfMissing = true)
+@Slf4j
+public class GatewaySharedAuthAutoConfiguration {
+
+    @PostConstruct
+    void logEnabled() {
+        log.info("gateway-shared-auth is enabled");
+    }
+
+    @Bean
+    GatewaySharedAuhenticationPreFilter gatewaySharedAuhenticationGlobalPreFilter() {
+        return new GatewaySharedAuhenticationPreFilter();
+    }
+
+    @Bean
+    GatewaySharedAuhenticationPostFilter gatewaySharedAuhenticationGlobalPostFilter() {
+        return new GatewaySharedAuhenticationPostFilter();
+    }
+}