fix(websocket): 修复系统通知websocket身份绑定误拒合法连接 #9907

GHSA-5j5w 的身份绑定修复中,过滤器用整段路径userId与登录用户id全等比对,
但前端 /websocket/{userId} 的 userId 实际为 {真实userId}_{wsClientId}(md5(token)) 格式,
导致合法连接被误判为"用户身份与路径userId不一致"而拒绝。
改为取下划线前的真实userId比对,兼容带wsClientId后缀与纯userId两种情况,
安全约束不变(仍拒绝订阅他人)。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
zhangdaiscott 2026-10-13 21:56:27 -04:00
parent 98681e17ff
commit 4998e645db

View File

@ -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;
}