mirror of
https://gitee.com/mateos/mateclaw.git
synced 2026-09-15 03:55:09 +08:00
fix(chat): return 401/403 not 500 for chat auth and ownership failures
This commit is contained in:
parent
ff3e5b42f5
commit
b3e8d1e283
@ -932,7 +932,7 @@ public class ChatController {
|
|||||||
String username = auth != null ? auth.getName() : "anonymous";
|
String username = auth != null ? auth.getName() : "anonymous";
|
||||||
// 权限校验:已认证用户需验证会话归属,匿名用户(permitAll)直接放行
|
// 权限校验:已认证用户需验证会话归属,匿名用户(permitAll)直接放行
|
||||||
if (auth != null && !conversationService.isConversationOwner(conversationId, username)) {
|
if (auth != null && !conversationService.isConversationOwner(conversationId, username)) {
|
||||||
return R.fail("无权操作该会话");
|
return R.fail(403, "无权操作该会话");
|
||||||
}
|
}
|
||||||
boolean stopped = streamTracker.requestStop(conversationId);
|
boolean stopped = streamTracker.requestStop(conversationId);
|
||||||
|
|
||||||
@ -975,7 +975,7 @@ public class ChatController {
|
|||||||
Authentication auth) {
|
Authentication auth) {
|
||||||
String username = auth != null ? auth.getName() : "anonymous";
|
String username = auth != null ? auth.getName() : "anonymous";
|
||||||
if (auth != null && !conversationService.isConversationOwner(conversationId, username)) {
|
if (auth != null && !conversationService.isConversationOwner(conversationId, username)) {
|
||||||
return R.fail("无权操作该会话");
|
return R.fail(403, "无权操作该会话");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!streamTracker.isRunning(conversationId)) {
|
if (!streamTracker.isRunning(conversationId)) {
|
||||||
@ -1024,7 +1024,7 @@ public class ChatController {
|
|||||||
|
|
||||||
String username = auth != null ? auth.getName() : null;
|
String username = auth != null ? auth.getName() : null;
|
||||||
if (username == null) {
|
if (username == null) {
|
||||||
return R.fail("未登录,请先登录");
|
return R.fail(401, "未登录,请先登录");
|
||||||
}
|
}
|
||||||
conversationService.getOrCreateConversation(request.getConversationId(), agentId, username, workspaceId);
|
conversationService.getOrCreateConversation(request.getConversationId(), agentId, username, workspaceId);
|
||||||
conversationService.saveMessage(request.getConversationId(), "user", request.getMessage(), request.getContentParts());
|
conversationService.saveMessage(request.getConversationId(), "user", request.getMessage(), request.getContentParts());
|
||||||
@ -1047,7 +1047,7 @@ public class ChatController {
|
|||||||
// 校验会话归属(会话可能尚未创建,此时允许上传——后续 stream/chat 会创建并绑定用户)
|
// 校验会话归属(会话可能尚未创建,此时允许上传——后续 stream/chat 会创建并绑定用户)
|
||||||
if (conversationService.conversationExists(conversationId)
|
if (conversationService.conversationExists(conversationId)
|
||||||
&& !conversationService.isConversationOwner(conversationId, username)) {
|
&& !conversationService.isConversationOwner(conversationId, username)) {
|
||||||
return R.fail("无权操作该会话");
|
return R.fail(403, "无权操作该会话");
|
||||||
}
|
}
|
||||||
if (file.isEmpty()) {
|
if (file.isEmpty()) {
|
||||||
return R.fail("上传文件不能为空");
|
return R.fail("上传文件不能为空");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user