diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml
index 262c9f91..ce1e09d2 100644
--- a/.config/checkstyle/checkstyle.xml
+++ b/.config/checkstyle/checkstyle.xml
@@ -85,6 +85,7 @@
+
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index a751c417..27f72cee 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -1,7 +1,7 @@
- 13.0.0
+ 13.4.0
JavaOnlyWithTests
true
true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76085061..cf70dbd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.1.1
+* Vaadin
+ * `SecureVaadinRequestCache` no longer ignores `urlMapping`
+
# 2.1.0
* Renamed `OAuth2AuthenticationTokenUtil` -> `OAuth2AuthenticationTokenExtractor`
* Updated dependencies
diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml
index 3880f66d..d5733524 100644
--- a/demo/integration-tests/pom.xml
+++ b/demo/integration-tests/pom.xml
@@ -86,7 +86,7 @@
software.xdev
testcontainers-advanced-imagebuilder
- 2.4.1
+ 2.5.0
org.testcontainers
diff --git a/demo/pom.xml b/demo/pom.xml
index c553029b..5bcd2d23 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -82,7 +82,7 @@
org.springdoc
springdoc-openapi-starter-webmvc-ui
- 3.0.2
+ 3.0.3
@@ -106,7 +106,7 @@
org.mariadb.jdbc
mariadb-java-client
- 3.5.7
+ 3.5.8
@@ -210,7 +210,7 @@
io.github.git-commit-id
git-commit-id-maven-plugin
- 9.1.0
+ 10.0.0
diff --git a/vaadin/src/main/java/software/xdev/sse/vaadin/SecureVaadinRequestCache.java b/vaadin/src/main/java/software/xdev/sse/vaadin/SecureVaadinRequestCache.java
index 83d85716..e0d5ef86 100644
--- a/vaadin/src/main/java/software/xdev/sse/vaadin/SecureVaadinRequestCache.java
+++ b/vaadin/src/main/java/software/xdev/sse/vaadin/SecureVaadinRequestCache.java
@@ -38,6 +38,7 @@
import com.vaadin.flow.router.RouteBaseData;
import com.vaadin.flow.server.VaadinServlet;
import com.vaadin.flow.server.VaadinServletService;
+import com.vaadin.flow.spring.security.RequestUtil;
import com.vaadin.flow.spring.security.VaadinDefaultRequestCache;
@@ -56,6 +57,9 @@ public class SecureVaadinRequestCache extends VaadinDefaultRequestCache
@Autowired
protected ServletContext context;
+ @Autowired
+ protected RequestUtil requestUtil;
+
// Shortcut to save computation cost (no path is longer than this)
protected int defaultPathMaxLength = 255;
protected int defaultWildcardPathLengthAssumption = 48;
@@ -154,8 +158,8 @@ protected synchronized void initAllowedPaths()
.stream()
.map(RouteBaseData::getTemplate)
.filter(s -> !s.isBlank())
+ .map(this.requestUtil::applyUrlMapping)
.map(this::handleUrlParameterInPath)
- .map(s -> "/" + s)
.collect(Collectors.toSet());
LOG.debug("Allowed paths: {}", allowedPaths);