From e77bae85a513462863e824b3d8b071edb426bd52 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 30 Mar 2026 09:04:15 +0200 Subject: [PATCH 1/8] Updates for CheckStyle 13.4 --- .config/checkstyle/checkstyle.xml | 1 + .idea/checkstyle-idea.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 From 59f35afa74f49269ac326edfcdc2a74d3119e649 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 2 Apr 2026 04:55:59 +0000 Subject: [PATCH 2/8] Update dependency org.mariadb.jdbc:mariadb-java-client to v3.5.8 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index c553029b..fd4226b4 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -106,7 +106,7 @@ org.mariadb.jdbc mariadb-java-client - 3.5.7 + 3.5.8 From 1fa560a861c9572ac9e9efa6b04b9eb24a3091ec Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 2 Apr 2026 04:56:01 +0000 Subject: [PATCH 3/8] Update dependency software.xdev:testcontainers-advanced-imagebuilder to v2.5.0 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 14327f3be422b9f06c654d708f6e6ca50d0858f9 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 4 Apr 2026 04:43:55 +0000 Subject: [PATCH 4/8] Update dependency io.github.git-commit-id:git-commit-id-maven-plugin to v10 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index c553029b..3e4f8fdb 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -210,7 +210,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 9.1.0 + 10.0.0 From af178180a4da8684a128a2caf6a8be18045c3674 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 11 Apr 2026 04:48:59 +0000 Subject: [PATCH 5/8] Update dependency org.seleniumhq.selenium:selenium-dependencies-bom to v4.43.0 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 3880f66d..ecff53b7 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -62,7 +62,7 @@ org.seleniumhq.selenium selenium-dependencies-bom - 4.41.0 + 4.43.0 pom import From dfc366a7dca36a37e2c27cd50e6e6747f95867ea Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 12 Apr 2026 05:07:32 +0000 Subject: [PATCH 6/8] Update dependency org.springdoc:springdoc-openapi-starter-webmvc-ui to v3.0.3 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index c553029b..700a7003 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 From b8c548f2e0196c0ea4a654dd64fe66fe2ddbbc9c Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 13 Apr 2026 18:12:16 +0200 Subject: [PATCH 7/8] `SecureVaadinRequestCache` no longer ignores `urlMapping` --- CHANGELOG.md | 4 ++++ .../software/xdev/sse/vaadin/SecureVaadinRequestCache.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) 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/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); From 953b9fb675fa4e27e56bc5f87bbfce57083a9558 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 13 Apr 2026 18:25:48 +0200 Subject: [PATCH 8/8] Revert "Update dependency org.seleniumhq.selenium:selenium-dependencies-bom to v4.43.0" This reverts commit af178180a4da8684a128a2caf6a8be18045c3674. --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 39ea138f..d5733524 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -62,7 +62,7 @@ org.seleniumhq.selenium selenium-dependencies-bom - 4.43.0 + 4.41.0 pom import