Skip to content

Commit 6370983

Browse files
authored
fix: Claim a path is not an anonymous route when it is unclear (#16473)
Fixes #16047
1 parent 4273a99 commit 6370983

2 files changed

Lines changed: 25 additions & 1 deletion

File tree

‎vaadin-spring/src/main/java/com/vaadin/flow/spring/security/RequestUtil.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ public boolean isAnonymousRoute(HttpServletRequest request) {
119119

120120
SpringServlet servlet = springServletRegistration.getServlet();
121121
VaadinService service = servlet.getService();
122+
if (service == null) {
123+
// The service has not yet been initialized. We cannot know if this
124+
// is an anonymous route, so better say it is not.
125+
return false;
126+
}
122127
Router router = service.getRouter();
123128
RouteRegistry routeRegistry = router.getRegistry();
124129

‎vaadin-spring/src/test/java/com/vaadin/flow/spring/security/RequestUtilTest.java‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,19 @@ public void testAnonymousRouteRequest_fooMappedServlet_publicViewPathOutsideServ
287287
Assert.assertFalse(requestUtil.isAnonymousRoute(request));
288288
}
289289

290+
@Test
291+
public void testRouteRequest_servletNotInited() {
292+
Mockito.when(vaadinConfigurationProperties.getUrlMapping())
293+
.thenReturn("/*");
294+
setupMockServlet(false);
295+
MockHttpServletRequest request = createRequest(null);
296+
request.setServletPath("/");
297+
Assert.assertFalse(requestUtil.isAnonymousRoute(request));
298+
request = createRequest("other");
299+
request.setServletPath("/");
300+
Assert.assertFalse(requestUtil.isAnonymousRoute(request));
301+
}
302+
290303
@Test
291304
public void testApplyUrlMapping_fooMappedServlet_prependMapping() {
292305
Mockito.when(vaadinConfigurationProperties.getUrlMapping())
@@ -337,6 +350,10 @@ public void testApplyUrlMapping_nullMappedServlet_prependMapping() {
337350
}
338351

339352
private SpringServlet setupMockServlet() {
353+
return setupMockServlet(true);
354+
}
355+
356+
private SpringServlet setupMockServlet(boolean inited) {
340357
SpringServlet servlet = Mockito.mock(SpringServlet.class);
341358
SpringVaadinServletService service = Mockito
342359
.mock(SpringVaadinServletService.class);
@@ -345,7 +362,9 @@ private SpringServlet setupMockServlet() {
345362

346363
Mockito.when(springServletRegistration.getServlet())
347364
.thenReturn(servlet);
348-
Mockito.when(servlet.getService()).thenReturn(service);
365+
if (inited) {
366+
Mockito.when(servlet.getService()).thenReturn(service);
367+
}
349368
Mockito.when(service.getRouter()).thenReturn(router);
350369
Mockito.when(router.getRegistry()).thenReturn(routeRegistry);
351370
return servlet;

0 commit comments

Comments
 (0)