Переглянути джерело

Update :servlet:spring-boot:java:saml2:saml-extension-urls to 7

Josh Cummings 1 місяць тому
батько
коміт
343eabbd47

+ 1 - 0
servlet/spring-boot/java/saml2/saml-extension-urls/build.gradle

@@ -17,6 +17,7 @@ dependencies {
 		implementation "org.opensaml:opensaml-saml-api:5.1.3"
 		implementation "org.opensaml:opensaml-saml-impl:5.1.3"
 	}
+	implementation 'org.springframework.boot:spring-boot-security-saml2'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-web'

+ 1 - 1
servlet/spring-boot/java/saml2/saml-extension-urls/gradle.properties

@@ -1,4 +1,4 @@
 version=6.1.1
-spring-security.version=6.5.0-SNAPSHOT
+spring-security.version=7.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true

+ 1 - 1
servlet/spring-boot/java/saml2/saml-extension-urls/src/integTest/java/example/SamlExtensionUrlsApplicationITests.java

@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.boot.web.server.test.LocalServerPort;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.assertj.core.api.Assertions.assertThat;

+ 3 - 2
servlet/spring-boot/java/saml2/saml-extension-urls/src/main/java/example/SamlExtensionUrlForwardingFilter.java

@@ -29,12 +29,13 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.core.annotation.Order;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.OrRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
+import static org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern;
+
 @Component
 @Order(-101) // To run before FilterChainProxy
 public class SamlExtensionUrlForwardingFilter extends OncePerRequestFilter {
@@ -52,7 +53,7 @@ public class SamlExtensionUrlForwardingFilter extends OncePerRequestFilter {
 	private RequestMatcher createRequestMatcher() {
 		Set<String> urls = urlMapping.keySet();
 		List<RequestMatcher> matchers = new LinkedList<>();
-		urls.forEach((url) -> matchers.add(new AntPathRequestMatcher(url)));
+		urls.forEach((url) -> matchers.add(pathPattern(url)));
 		return new OrRequestMatcher(matchers);
 	}