feat: 支持websocket #2494

TencentBlueKing · Nov 15, 2024 · f5356e2 · f5356e2
1 parent ae04b5b
commit f5356e2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/...z-websocket/src/main/kotlin/com/tencent/bkrepo/websocket/config/WebsocketConfiguration.kt b/...z-websocket/src/main/kotlin/com/tencent/bkrepo/websocket/config/WebsocketConfiguration.kt
@@ -30,6 +30,7 @@ package com.tencent.bkrepo.websocket.config
 import com.tencent.bkrepo.common.security.http.jwt.JwtAuthProperties
 import com.tencent.bkrepo.common.security.manager.AuthenticationManager
 import com.tencent.bkrepo.websocket.constant.APP_ENDPOINT
+import com.tencent.bkrepo.websocket.constant.DESKTOP_ENDPOINT
 import com.tencent.bkrepo.websocket.constant.USER_ENDPOINT
 import com.tencent.bkrepo.websocket.dispatch.push.TransferPush
 import com.tencent.bkrepo.websocket.handler.SessionWebSocketHandlerDecoratorFactory
@@ -68,9 +69,9 @@ class WebsocketConfiguration(
     }
 
     override fun registerStompEndpoints(registry: StompEndpointRegistry) {
-        registry.addEndpoint(USER_ENDPOINT, APP_ENDPOINT)
+        registry.addEndpoint(USER_ENDPOINT, APP_ENDPOINT, DESKTOP_ENDPOINT)
             .setAllowedOriginPatterns("*")
-        registry.addEndpoint(USER_ENDPOINT, APP_ENDPOINT)
+        registry.addEndpoint(USER_ENDPOINT, APP_ENDPOINT, DESKTOP_ENDPOINT)
             .setAllowedOriginPatterns("*")
             .withSockJS()
     }

diff --git a/...cket/biz-websocket/src/main/kotlin/com/tencent/bkrepo/websocket/constant/WebsocketKeys.kt b/...cket/biz-websocket/src/main/kotlin/com/tencent/bkrepo/websocket/constant/WebsocketKeys.kt
@@ -29,5 +29,6 @@ package com.tencent.bkrepo.websocket.constant
 
 const val USER_ENDPOINT = "/ws/user"
 const val APP_ENDPOINT = "/ws/app"
+const val DESKTOP_ENDPOINT = "/ws/desktop"
 
 const val SESSION_ID = "sessionId"
diff --git a/src/gateway/auth.conf b/src/gateway/auth.conf
@@ -5,3 +5,9 @@
     internal;
     content_by_lua_file 'conf/lua/auth/auth_web.lua';
   }
+
+  # websocket验证身份
+  location = /auth/websocket {
+    internal;
+    content_by_lua_file 'conf/lua/auth/auth_websocket.lua';
+  }
diff --git a/src/gateway/vhosts/bkrepo.websocket.conf b/src/gateway/vhosts/bkrepo.websocket.conf
@@ -1,6 +1,6 @@
-location  ~ /websocket/(ws/user.*) {
+location  ~ /websocket/(ws/user/.*|ws/desktop/.*) {
         header_filter_by_lua_file 'conf/lua/cors_filter.lua';
-        auth_request /auth/web;
+        auth_request /auth/websocket;
         # 设置auth的变量
         auth_request_set $uid $sent_http_x_bkrepo_uid;
         auth_request_set $accessToken $sent_http_x_bkrepo_access_token;
@@ -43,4 +43,4 @@ location ~ /websocket/(ws/app.*) {
         proxy_set_header Connection "Upgrade";
         proxy_http_version 1.1;
         proxy_pass http://$target/$path?$args;
-}
+}