Fix issue with getting SockJS path

rstoyanchev · rstoyanchev · commit e60e8dc582b9 · 2013-09-30T21:19:29.000-04:00
Issue: SPR-10923
diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
@@ -374,7 +374,7 @@ private String getSockJsPath(ServerHttpRequest request) {
 		// Try SockJS prefix hints
 		if (!this.validSockJsPrefixes.isEmpty()) {
 			for (String prefix : this.validSockJsPrefixes) {
-				int index = path.indexOf(prefix);
+				int index = path.lastIndexOf(prefix);
 				if (index != -1) {
 					this.knownSockJsPrefixes.add(path.substring(0, index + prefix.length()));
 					return path.substring(index + prefix.length());
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java
@@ -113,6 +113,17 @@ public void getSockJsPathForTransportRequestWithConfiguredPrefix() throws Except
 		assertSame(this.handler, this.service.handler);
 	}
 
+	// SPR-10923
+
+	@Test
+	public void getSockJsPathWithPartlyMatchingServletPath() throws Exception {
+
+		this.service.setValidSockJsPrefixes("/snake");
+		handleRequest("GET", "/snakedemo/snake/info", HttpStatus.OK);
+
+		assertTrue(this.servletResponse.getContentAsString().startsWith("{\"entropy\":"));
+	}
+
 	@Test
 	public void validateRequest() throws Exception {
 
@@ -146,7 +157,7 @@ public void handleInfoGet() throws Exception {
 
 		String body = this.servletResponse.getContentAsString();
 		assertEquals("{\"entropy\"", body.substring(0, body.indexOf(':')));
-		assertEquals(",\"origins\":[\"*:*\"],\"cookie_needed\":false,\"websocket\":true}",
+		assertEquals(",\"origins\":[\"*:*\"],\"cookie_needed\":true,\"websocket\":true}",
 				body.substring(body.indexOf(',')));
 
 		this.service.setSessionCookieNeeded(false);
