fix: ensure themes stylesheets pattern is relative to context root (#22902)

* fix: ensure themes stylesheets pattern is relative to context root

Aura and Lumo stylesheets are loaded by the servelt container
so they should not be potentially prefixed by the Vaadin servlet
URL mapping.

Fixes #22899

* fix test

* Add tests

Author: mcollovati

flow-server/src/main/java/com/vaadin/flow/server/HandlerHelper.java

@@ -157,14 +157,14 @@ public String getIdentifier() {
         resources.add("/" + PwaConfiguration.DEFAULT_ICON);
         resources.add("/" + FrontendUtils.DEFAULT_STYLES_CSS);
         resources.add("/themes/**");
-        resources.add("/aura/**");
-        resources.add("/lumo/**");
         resources.add("/assets/**");
         resources.addAll(getIconVariants(PwaConfiguration.DEFAULT_ICON));
         publicResources = resources.toArray(new String[resources.size()]);
 
         // These are always in the root of the app, not inside any url mapping
         List<String> rootResources = new ArrayList<>();
+        rootResources.add("/aura/**");
+        rootResources.add("/lumo/**");
         rootResources.add("/favicon.ico");
         publicResourcesRoot = rootResources
                 .toArray(new String[rootResources.size()]);

flow-server/src/test/java/com/vaadin/flow/server/HandlerHelperTest.java

@@ -436,15 +436,14 @@ public void publicResources() {
         expected.add("/icons/icon-1136x640.png");
         expected.add("/styles.css");
         expected.add("/themes/**");
-        expected.add("/aura/**");
-        expected.add("/lumo/**");
         expected.add("/assets/**");
 
         Set<String> actual = new HashSet<>();
         Collections.addAll(actual, HandlerHelper.getPublicResources());
         Assert.assertEquals(expected, actual);
 
-        Set<String> expectedRoot = Set.of("/favicon.ico");
+        Set<String> expectedRoot = Set.of("/favicon.ico", "/aura/**",
+                "/lumo/**");
 
         Set<String> actualRoot = new HashSet<>();
         Collections.addAll(actualRoot, HandlerHelper.getPublicResourcesRoot());

flow-tests/vaadin-spring-tests/pom.xml

@@ -316,6 +316,7 @@
         <module>test-spring-security-flow-standalone-routepathaccesschecker</module>
         <module>test-spring-security-flow-routepathaccesschecker</module>
         <module>test-spring-security-flow-themes-contextpath</module>
+        <module>test-spring-security-flow-themes-urlmapping</module>
 
         <module>test-spring-boot-only-prepare</module>
         <module>test-spring-white-list</module>

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/pom.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.vaadin</groupId>
+    <artifactId>vaadin-spring-tests</artifactId>
+    <version>25.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>test-spring-security-flow-themes-urlmapping</artifactId>
+  <packaging>jar</packaging>
+  <name>Integration tests for Vaadin Spring Security and Theme Loading With Vaadin URL mapping</name>
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-spring</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-dev-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>test-aura</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>test-lumo-theme</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-test-spring-helpers</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-test-spring-helpers</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-devtools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <defaultGoal>spring-boot:run</defaultGoal>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${spring.boot.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>com.vaadin</groupId>
+        <artifactId>flow-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-frontend</goal>
+              <goal>build-frontend</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <jvmArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=18888</jvmArguments>
+        </configuration>
+        <executions>
+          <!-- start and stop application when running
+                        integration tests -->
+          <execution>
+            <id>pre-integration-test</id>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>post-integration-test</id>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/src/main/java/com/vaadin/flow/spring/flowthemessecuritycontextpath/Application.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.spring.flowthemessecuritycontextpath;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/src/main/java/com/vaadin/flow/spring/flowthemessecuritycontextpath/Configurator.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.spring.flowthemessecuritycontextpath;
+
+import com.vaadin.flow.component.dependency.StyleSheet;
+import com.vaadin.flow.component.page.AppShellConfigurator;
+
+@StyleSheet("context://aura/fake-aura.css")
+@StyleSheet("context://lumo/fake-lumo.css")
+public class Configurator implements AppShellConfigurator {
+
+}

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/src/main/java/com/vaadin/flow/spring/flowthemessecuritycontextpath/PublicView.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.spring.flowthemessecuritycontextpath;
+
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+
+@Route("")
+@AnonymousAllowed
+public class PublicView extends Div {
+    public PublicView() {
+        setText("This is the public view for testing theme loading using @StyleSheet in secure environment with context path");
+    }
+}

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/src/main/java/com/vaadin/flow/spring/flowthemessecuritycontextpath/SecurityConfig.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.spring.flowthemessecuritycontextpath;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+import static com.vaadin.flow.spring.security.VaadinSecurityConfigurer.vaadin;
+
+@EnableWebSecurity
+@Configuration
+@Profile("default")
+public class SecurityConfig {
+
+    @Bean
+    SecurityFilterChain vaadinSecurityFilterChain(HttpSecurity http) {
+        http.with(vaadin(), cfg -> {
+        });
+        return http.build();
+    }
+
+}

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/src/main/resources/application.properties

@@ -0,0 +1,5 @@
+server.port=8888
+logging.level.org.springframework.security=INFO
+server.servlet.session.persistent=false
+vaadin.frontend.hotdeploy=true
+vaadin.url-mapping=/ui/*

flow-tests/vaadin-spring-tests/test-spring-security-flow-themes-urlmapping/src/test/java/com/vaadin/flow/spring/flowthemessecuritycontextpath/AppViewIT.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.spring.flowthemessecuritycontextpath;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.flow.spring.test.AbstractSpringTest;
+
+public class AppViewIT extends AbstractSpringTest {
+
+    @Override
+    protected String getRootURL() {
+        return super.getRootURL() + "/ui";
+    }
+
+    @Override
+    protected String getTestPath() {
+        return "";
+    }
+
+    @Test
+    public void stylesheet_auraThemeImport_importedWithNoExtraSecurityConfig() {
+        open("");
+
+        // Verify that the Aura theme stylesheet from @StyleSheet has been
+        // applied
+        // by checking that the CSS custom property is present on :root
+        String auraLoaded = (String) executeScript(
+                "return getComputedStyle(document.documentElement).getPropertyValue('--fake-aura-theme-loaded').trim() ");
+        Assert.assertEquals(
+                "Expected :root --fake-aura-theme-loaded custom property to be set by aura/fake-aura.css",
+                "1", auraLoaded);
+    }
+
+    @Test
+    public void stylesheet_lumoThemeImport_importedWithNoExtraSecurityConfig() {
+        open("");
+
+        // Verify that the Lumo theme stylesheet from @StyleSheet has been
+        // applied
+        // by checking that the CSS custom property is present on :root
+        String lumoLoaded = (String) executeScript(
+                "return getComputedStyle(document.documentElement).getPropertyValue('--fake-lumo-theme-loaded').trim() ");
+        Assert.assertEquals(
+                "Expected :root --fake-lumo-theme-loaded custom property to be set by lumo/fake-lumo.css",
+                "1", lumoLoaded);
+    }
+}