WebSockets support in http(s) shares.

aalku · Dec 9, 2023 · b471b0c · b471b0c
1 parent ba4a90c
commit b471b0c
Show file tree

Hide file tree

Showing 7 changed files with 394 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.2</version>
+		<version>3.1.6</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.aalku.joatse</groupId>
 	<artifactId>joatse-cloud</artifactId>
-	<version>0.0.20-SNAPSHOT</version>
+	<version>0.0.21-SNAPSHOT</version>
 	<name>joatse-cloud</name>
 	<description>Tunnel Router</description>
 	<properties>
@@ -118,6 +118,14 @@
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
 		</dependency>
+		<dependency>
+		    <groupId>org.eclipse.jetty.websocket</groupId>
+		    <artifactId>websocket-jetty-server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty.websocket</groupId>
+			<artifactId>websocket-jetty-client</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/src/main/java/org/aalku/joatse/cloud/config/WebSecurityConfiguration.java b/src/main/java/org/aalku/joatse/cloud/config/WebSecurityConfiguration.java
@@ -72,6 +72,7 @@ SecurityFilterChain filterChain(HttpSecurity http, JWTAuthorizationFilter jwtAut
                 .addFilterBefore(jwtAuthorizationFilter, UsernamePasswordAuthenticationFilter.class)
                 .authorizeHttpRequests(t -> t.requestMatchers(WebSocketConfig.CONNECTION_HTTP_PATH).anonymous()
 				//
+                .requestMatchers(HttpMethod.GET, "/ws-test.html").permitAll()
                 .requestMatchers(HttpMethod.GET, "/login.html", "/css/**", "/header.js", "/lib/*.js").permitAll()
 				.requestMatchers(HttpMethod.GET, "/user").permitAll()
 				.requestMatchers("/error").permitAll()

diff --git a/src/main/java/org/aalku/joatse/cloud/service/sharing/SharingManager.java b/src/main/java/org/aalku/joatse/cloud/service/sharing/SharingManager.java
@@ -416,4 +416,9 @@ public HttpTunnel getTunnelForHttpRequest(InetAddress remoteAddress, int serverP
 			return null;
 		}
 	}
+
+	public HttpTunnel getHttpTunnelById(UUID uuid, long httpTunnelId) {
+		HttpTunnel res = tunnelRegistry.getHttpTunnel(uuid, httpTunnelId);
+		return res;
+	}
 }