fix: Only map websockets to servlet path and not any sub paths

Allows other websockets to work, especially when Vaadin is root mapped
vaadin · Sep 26, 2022 · c4181b0 · c4181b0
1 parent ec3b510
commit c4181b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringBootAutoConfiguration.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringBootAutoConfiguration.java
@@ -88,7 +88,7 @@ public ServletRegistrationBean<SpringServlet> servletRegistrationBean(
             initParameters.put(
                     VaadinServlet.INTERNAL_VAADIN_SERVLET_VITE_DEV_MODE_FRONTEND_PATH,
                     "");
-            pushRegistrationPath = "";
+            pushRegistrationPath = "/";
         } else {
             pushRegistrationPath = mapping.replace("/*", "");
         }
@@ -101,6 +101,7 @@ public ServletRegistrationBean<SpringServlet> servletRegistrationBean(
          */
         initParameters.put(ApplicationConfig.JSR356_MAPPING_PATH,
                 pushRegistrationPath);
+        initParameters.put(ApplicationConfig.JSR356_PATH_MAPPING_LENGTH, "0");
 
         ServletRegistrationBean<SpringServlet> registration = new ServletRegistrationBean<>(
                 new SpringServlet(context, rootMapping), mapping);

diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinMVCWebAppInitializer.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinMVCWebAppInitializer.java
@@ -71,7 +71,7 @@ public void onStartup(ServletContext servletContext)
                     .addServlet("dispatcher", new DispatcherServlet(context));
             dispatcherRegistration.addMapping("/*");
             mapping = VaadinServletConfiguration.VAADIN_SERVLET_MAPPING;
-            pushRegistrationPath = "";
+            pushRegistrationPath = "/";
         } else {
             pushRegistrationPath = mapping.replace("/*", "");
         }
@@ -85,6 +85,7 @@ public void onStartup(ServletContext servletContext)
          */
         initParameters.put(ApplicationConfig.JSR356_MAPPING_PATH,
                 pushRegistrationPath);
+        initParameters.put(ApplicationConfig.JSR356_PATH_MAPPING_LENGTH, "0");
 
         registration.setInitParameters(initParameters);