update

Author: guFalcon

pom.xml

@@ -40,6 +40,11 @@
 			<artifactId>http-server</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+		<dependency>
+			<groupId>info.unterrainer.commons</groupId>
+			<artifactId>oauth-token-manager</artifactId>
+			<version>1.0.7</version>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -5,6 +5,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import info.unterrainer.oauthtokenmanager.OauthTokenManager;
 import io.javalin.Javalin;
 import io.javalin.websocket.WsHandler;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +15,7 @@ public class WebsocketServer {
 
 	private String keycloakHost;
 	private String realm;
-	private JwtTokenHandler tokenHandler;
+	private OauthTokenManager tokenManager;
 
 	private Javalin wss;
 	private boolean isOauthEnabled = false;
@@ -28,8 +29,8 @@ public WebsocketServer(String keycloakHost, String keycloakRealm) {
 		this.realm = keycloakRealm;
 
 		try {
-			tokenHandler = new JwtTokenHandler(this.keycloakHost, this.realm);
-			tokenHandler.initPublicKey();
+			tokenManager = new OauthTokenManager(this.keycloakHost, this.realm);
+			tokenManager.initPublicKey();
 			wss = Javalin.create();
 			isOauthEnabled = true;
 		} catch (Exception e) {
@@ -54,7 +55,7 @@ public WebsocketServer wsOauth(@NotNull String path, @NotNull WsOauthHandlerBase
 			throw new IllegalStateException("Websocket server is not configured for OAuth2/JWT support.");
 		}
 
-		handler.setTokenHandler(tokenHandler);
+		handler.setTokenHandler(tokenManager);
 		wss.ws(path, ws -> {
 			ws.onConnect(handler::onConnect);
 			ws.onMessage(handler::onMessage);

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

@@ -1,5 +1,9 @@
 package info.unterrainer.websocketserver;
 
+import java.io.EOFException;
+import java.io.IOException;
+
+import info.unterrainer.oauthtokenmanager.OauthTokenManager;
 import io.javalin.websocket.WsCloseContext;
 import io.javalin.websocket.WsConnectContext;
 import io.javalin.websocket.WsErrorContext;
@@ -9,16 +13,16 @@
 @Slf4j
 public class WsOauthHandlerBase extends WsHandlerBase {
 
-	private JwtTokenHandler tokenHandler;
+	private OauthTokenManager tokenHandler;
 
-	void setTokenHandler(JwtTokenHandler tokenHandler) {
+	void setTokenHandler(OauthTokenManager tokenHandler) {
 		this.tokenHandler = tokenHandler;
 	}
 
 	@Override
 	public void onConnect(WsConnectContext ctx) throws Exception {
 		log.debug("New client tries to connect: [{}]", ctx.session.getRemoteAddress());
-		String token = ctx.queryParam("token");
+		String token = ctx.header("Authorization");
 		log.debug("New client token: [{}]", token);
 		try {
 			tokenHandler.checkAccess(token);
@@ -40,6 +44,11 @@ public void onClose(WsCloseContext ctx) throws Exception {
 
 	@Override
 	public void onError(WsErrorContext ctx) throws Exception {
-		log.error("Error on [{}]: [{}]", ctx.session.getRemoteAddress(), ctx.error());
+		Throwable t = ctx.error();
+		if (t instanceof EOFException || t instanceof IOException) {
+			log.debug("Client disconnected [{}].", ctx.session.getRemoteAddress());
+		} else {
+			log.error("Unexpected error on [{}].", ctx.session.getRemoteAddress(), t);
+		}
 	}
 }

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

@@ -11,4 +11,5 @@ log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
 
 # Print only info for imported libraries.
 log4j.logger.io.netty=WARN
-log4j.logger.org.eclipse.milo=WARN
+log4j.logger.org.eclipse.milo=WARN
+log4j.logger.org.eclipse.jetty=WARN

src/main/resources/log4j.properties

@@ -8,7 +8,7 @@ public static void main(String[] args) {
 
 		aiComm = new AiComm();
 
-		server.wsOauth("/wss", aiComm);
+		server.wsOauth("/jwt", aiComm);
 		server.ws("/ws", ws -> {
 			ws.onConnect(ctx -> ctx.send("Welcome to our websocket-server!"));
 			ws.onMessage(ctx -> ctx.send("Echo from server: [" + ctx.message() + "]"));

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

@@ -11,4 +11,5 @@ log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
 
 # Print only info for imported libs.
 log4j.logger.io.netty=WARN
-log4j.logger.org.eclipse.milo=WARN
+log4j.logger.org.eclipse.milo=WARN
+log4j.logger.org.eclipse.jetty=WARN