From 4998e645db547ff614b6568df3895bf5586effbf Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Tue, 13 Oct 2026 21:56:27 -0400 Subject: [PATCH] =?UTF-8?q?fix(websocket):=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=80=9A=E7=9F=A5websocket=E8=BA=AB=E4=BB=BD=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=AF=AF=E6=8B=92=E5=90=88=E6=B3=95=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=20#9907?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GHSA-5j5w 的身份绑定修复中,过滤器用整段路径userId与登录用户id全等比对, 但前端 /websocket/{userId} 的 userId 实际为 {真实userId}_{wsClientId}(md5(token)) 格式, 导致合法连接被误判为"用户身份与路径userId不一致"而拒绝。 改为取下划线前的真实userId比对,兼容带wsClientId后缀与纯userId两种情况, 安全约束不变(仍拒绝订阅他人)。 Co-Authored-By: Claude Opus 4.8 --- .../main/java/org/jeecg/config/filter/WebsocketFilter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java index 69620b033..55ae701d1 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java @@ -55,8 +55,11 @@ public class WebsocketFilter implements Filter { String rest = uri.substring(idx + "/websocket/".length()); int slash = rest.indexOf('/'); String pathUserId = slash >= 0 ? rest.substring(0, slash) : rest; + // 前端路径userId格式为 {真实userId}_{wsClientId}(md5(token)),取下划线前的真实userId比对;同时兼容无后缀的纯userId + int underline = pathUserId.indexOf('_'); + String realPathUserId = underline >= 0 ? pathUserId.substring(0, underline) : pathUserId; LoginUser loginUser = commonApi.getUserByName(JwtUtil.getUsername(token)); - if (loginUser == null || !loginUser.getId().equals(pathUserId)) { + if (loginUser == null || !loginUser.getId().equals(realPathUserId)) { log.warn("Websocket连接 用户身份与路径userId不一致,已拒绝。Path = {}", uri); return; }