Bump Springboot@4, switcher-client@2.5.2

Author: petruki

pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.5.7</version>
+		<version>4.0.0</version>
 		<relativePath/>
 	</parent>
 
@@ -34,8 +34,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 
 		<jsonwebtoken.version>0.13.0</jsonwebtoken.version>
-		<springdoc-openapi-starter-webmvc-ui.version>2.8.14</springdoc-openapi-starter-webmvc-ui.version>
-		<switcher-client.version>2.5.1</switcher-client.version>
+		<springdoc-openapi-starter-webmvc-ui.version>3.0.0</springdoc-openapi-starter-webmvc-ui.version>
+		<switcher-client.version>2.5.2</switcher-client.version>
 
         <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
 	</properties>
@@ -70,8 +70,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-kafka</artifactId>
 		</dependency>
 
 		<dependency>
@@ -127,17 +127,6 @@
 		</dependency>
 	</dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Patches Uncontrolled Recursion [High Severity][https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-10734078]-->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.18.0</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 	<build>
 		<plugins>
 			<plugin>

src/main/java/com/trackerforce/queue/config/SecurityConfig.java

@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authorization.AuthorizationDecision;
+import org.springframework.security.authorization.AuthorizationResult;
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -28,16 +29,21 @@ public class SecurityConfig {
 	protected String[] allowedEndpoint;
 
 	@Bean
-	public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+	public SecurityFilterChain filterChain(HttpSecurity http) {
 		return http.authorizeHttpRequests(auth -> auth.requestMatchers(allowedEndpoint).permitAll()
 						.anyRequest().access(this::authorize))
 						.sessionManagement(auth -> auth.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
 						.csrf(AbstractHttpConfigurer::disable).build();
 	}
 
-	private AuthorizationDecision authorize(Supplier<Authentication> authentication, RequestAuthorizationContext object) {
-		final var remoteAddress = object.getRequest().getRemoteAddr();
-		var decision = new AuthorizationDecision(authentication.get().isAuthenticated());
+	protected AuthorizationResult authorize(Supplier<? extends Authentication> supplier, RequestAuthorizationContext requestAuthorizationContext) {
+		final var authentication = supplier.get();
+
+		if (authentication == null || !authentication.isAuthenticated()) {
+			return new AuthorizationDecision(false);
+		}
+
+		final var remoteAddress = requestAuthorizationContext.getRequest().getRemoteAddr();
 
 		boolean isAllowed = false;
 		for (String address : allowedAddresses) {
@@ -49,10 +55,10 @@ private AuthorizationDecision authorize(Supplier<Authentication> authentication,
 		}
 
 		if (!isAllowed) {
-			decision = new AuthorizationDecision(false);
+			return new AuthorizationDecision(false);
 		}
 
-		return decision;
+		return new AuthorizationDecision(true);
 	}
 
 }

src/main/resources/application-dev.yml

@@ -8,8 +8,8 @@ service:
       127.0.0.1,
       10.0.0.2
     allowed-endpoints: >
-      /v3/api-docs,
-      /*/swagger*/**,
+      /v3/api-docs.*,
+      /swagger.*,
       /queue/session/v1
   management:
     url: http://127.0.0.1:8090  

src/main/resources/application-prod.yml

@@ -7,8 +7,8 @@ service:
       127.0.0.1,
       10.0.0.2
     allowed-endpoints: >
-      /v3/api-docs,
-      /*/swagger*/**,
+      /v3/api-docs.*,
+      /swagger.*,
       /queue/session/v1
   management:
     url: http://127.0.0.1:8090

src/test/resources/application-test.yml

@@ -8,8 +8,8 @@ service:
       127.0.0.1,
       10.0.0.2
     allowed-endpoints: >
-      /v3/api-docs,
-      /**/swagger*/**,
+      /v3/api-docs.*,
+      /swagger.*,
       /queue/session/v1
   management:
     url: http://127.0.0.1:8090