root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix issue with getting SockJS path 

Issue: SPR-10923
This commit is contained in:
Rossen Stoyanchev 2013-09-30 21:19:29 -04:00
parent 6ddacdc01d
commit e60e8dc582
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java
View File

@ -374,7 +374,7 @@ public abstract class AbstractSockJsService implements SockJsService {
// Try SockJS prefix hints // Try SockJS prefix hints
if (!this.validSockJsPrefixes.isEmpty()) { if (!this.validSockJsPrefixes.isEmpty()) {
for (String prefix : this.validSockJsPrefixes) { for (String prefix : this.validSockJsPrefixes) {
int index = path.indexOf(prefix); int index = path.lastIndexOf(prefix);
if (index != -1) { if (index != -1) {
this.knownSockJsPrefixes.add(path.substring(0, index + prefix.length())); this.knownSockJsPrefixes.add(path.substring(0, index + prefix.length()));
return path.substring(index + prefix.length()); return path.substring(index + prefix.length());

13
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java
View File

@ -113,6 +113,17 @@ public class AbstractSockJsServiceTests extends AbstractHttpRequestTests {
assertSame(this.handler, this.service.handler); 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 @Test
public void validateRequest() throws Exception { public void validateRequest() throws Exception {
@ -146,7 +157,7 @@ public class AbstractSockJsServiceTests extends AbstractHttpRequestTests {
String body = this.servletResponse.getContentAsString(); String body = this.servletResponse.getContentAsString();
assertEquals("{\"entropy\"", body.substring(0, body.indexOf(':'))); 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(','))); body.substring(body.indexOf(',')));
this.service.setSessionCookieNeeded(false); this.service.setSessionCookieNeeded(false);