Maintain sockjs session while websocket handshake failed

spring-projects · Aug 17, 2020 · c31e530 · c31e530
1 parent 1891f8a
commit c31e530
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/...ocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandler.java b/...ocket/src/main/java/org/springframework/web/socket/sockjs/transport/TransportHandler.java
@@ -60,10 +60,11 @@ public interface TransportHandler {
 	 * @param response the current response
 	 * @param handler the target WebSocketHandler (never {@code null})
 	 * @param session the SockJS session (never {@code null})
+	 * @return whether the given session is still valid
 	 * @throws SockJsException raised when request processing fails as
 	 * explained in {@link SockJsService}
 	 */
-	void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
+	boolean handleRequest(ServerHttpRequest request, ServerHttpResponse response,
 			WebSocketHandler handler, SockJsSession session) throws SockJsException;
 
 }
diff --git a/.../java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java b/.../java/org/springframework/web/socket/sockjs/transport/TransportHandlingSockJsService.java
@@ -310,7 +310,9 @@ else if (transportType.supportsCors()) {
 				return;
 			}
 
-			transportHandler.handleRequest(request, response, handler, session);
+			if (!transportHandler.handleRequest(request, response, handler, session)) {
+				sessions.remove(sessionId);
+			}
 			chain.applyAfterHandshake(request, response, null);
 		}
 		catch (SockJsException ex) {

diff --git a/...gframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java b/...gframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java
@@ -45,13 +45,14 @@ public boolean checkSessionType(SockJsSession session) {
 	}
 
 	@Override
-	public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
+	public final boolean handleRequest(ServerHttpRequest request, ServerHttpResponse response,
 			WebSocketHandler wsHandler, SockJsSession wsSession) throws SockJsException {
 
 		Assert.notNull(wsSession, "No session");
 		AbstractHttpSockJsSession sockJsSession = (AbstractHttpSockJsSession) wsSession;
 
 		handleRequestInternal(request, response, wsHandler, sockJsSession);
+		return true;
 	}
 
 	protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,

diff --git a/...ingframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java b/...ingframework/web/socket/sockjs/transport/handler/AbstractHttpSendingTransportHandler.java
@@ -52,7 +52,7 @@ public abstract class AbstractHttpSendingTransportHandler extends AbstractTransp
 
 
 	@Override
-	public final void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
+	public final boolean handleRequest(ServerHttpRequest request, ServerHttpResponse response,
 			WebSocketHandler wsHandler, SockJsSession wsSession) throws SockJsException {
 
 		AbstractHttpSockJsSession sockJsSession = (AbstractHttpSockJsSession) wsSession;
@@ -64,6 +64,7 @@ public final void handleRequest(ServerHttpRequest request, ServerHttpResponse re
 		response.getHeaders().setContentType(getContentType());
 
 		handleRequestInternal(request, response, sockJsSession);
+		return true;
 	}
 
 	protected void handleRequestInternal(ServerHttpRequest request, ServerHttpResponse response,

diff --git a/...va/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java b/...va/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java
@@ -116,13 +116,13 @@ public AbstractSockJsSession createSession(String id, WebSocketHandler handler,
 	}
 
 	@Override
-	public void handleRequest(ServerHttpRequest request, ServerHttpResponse response,
+	public boolean handleRequest(ServerHttpRequest request, ServerHttpResponse response,
 			WebSocketHandler wsHandler, SockJsSession wsSession) throws SockJsException {
 
 		WebSocketServerSockJsSession sockJsSession = (WebSocketServerSockJsSession) wsSession;
 		try {
 			wsHandler = new SockJsWebSocketHandler(getServiceConfig(), wsHandler, sockJsSession);
-			this.handshakeHandler.doHandshake(request, response, wsHandler, sockJsSession.getAttributes());
+			return this.handshakeHandler.doHandshake(request, response, wsHandler, sockJsSession.getAttributes());
 		}
 		catch (Exception ex) {
 			sockJsSession.tryCloseWithSockJsTransportError(ex, CloseStatus.SERVER_ERROR);