handle Bearer interception gracefully

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>websocket-server</artifactId>
-	<version>1.0.10</version>
+	<version>1.0.12</version>
 	<name>WebsocketServer</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/websocketserver/WsHandlerBase.java

@@ -10,7 +10,7 @@ public abstract class WsHandlerBase {
 
 	public abstract void onConnect(WsConnectContext ctx) throws Exception;
 
-	public abstract void onMessage(WsMessageContext ctx) throws Exception;
+	public abstract void onMsg(WsMessageContext ctx) throws Exception;
 
 	public abstract void onBinaryMessage(WsBinaryMessageContext ctx) throws Exception;
 

src/main/java/info/unterrainer/websocketserver/WsOauthHandlerBase.java

@@ -74,7 +74,10 @@ public void onConnect(WsConnectContext ctx) throws Exception {
 	}
 
 	@Override
-	public void onMessage(WsMessageContext ctx) throws Exception {
+	public void onMsg(WsMessageContext ctx) throws Exception {
+	}
+
+	public final void onMessage(WsMessageContext ctx) throws Exception {
 		log.debug("Received from [{}]: [{}]", ctx.session.getRemoteAddress(), ctx.message());
 		if (isQuarantined(ctx.session)) {
 			log.warn("Client [{}] is quarantined, checking message for standard authorization-bearer-token.",
@@ -93,12 +96,14 @@ public void onMessage(WsMessageContext ctx) throws Exception {
 						ctx.session.getRemoteAddress());
 				clientsQuarantined.removeIf(c -> c.session.equals(ctx.session));
 				clientsConnected.add(client);
+				return;
 			} catch (Exception e) {
 				log.debug("Token validation failed for client [{}]. Disconnecting.", ctx.session.getRemoteAddress(), e);
 				ctx.session.close(1000, "Unauthorized access with invalid token");
 				return;
 			}
 		}
+		onMsg(ctx);
 	}
 
 	@Override

src/test/java/info/unterrainer/websocketserver/AiComm.java

@@ -8,7 +8,7 @@
 public class AiComm extends WsOauthHandlerBase {
 
 	@Override
-	public void onMessage(WsMessageContext ctx) throws Exception {
+	public void onMsg(WsMessageContext ctx) throws Exception {
 		super.onMessage(ctx);
 
 		// Broadcast to all connected WS clients.