Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1103,8 +1103,8 @@ public R<ChatUploadResponse> upload(
response.setFileName(originalFilename);
response.setStoredName(storedName);
response.setUrl("/api/v1/chat/files/" + conversationId + "/" + storedName);
// 使用相对路径,避免暴露服务端绝对路径
response.setPath(uploadRoot.resolve(conversationId).resolve(storedName).toString());
// 用 root 相对路径,避免暴露服务端绝对路径(uploadRoot 现在恒为绝对路径)。
response.setPath(toRelativeUploadPath(uploadRoot, conversationId, storedName));
response.setSize(file.getSize());
response.setContentType(file.getContentType());
return R.ok(response);
Expand Down Expand Up @@ -1500,6 +1500,31 @@ static boolean isAssistantPersisted(MessageEntity savedAssistant) {
return savedAssistant != null;
}

/**
* Build the value stored in {@code ChatUploadResponse.path} (and, downstream,
* the message content part): a root-relative path like
* {@code chat-uploads/{convId}/{storedName}}, never the absolute on-disk
* location.
* <p>
* {@code uploadRoot} is always absolute (the resolver normalizes it via
* {@code toAbsolutePath().normalize()}), and this field is purely
* informational — it is rendered into the LLM prompt ("附件: foo (path)") and
* returned to the client, while retrieval goes through the basename-based
* {@code ChatUploadResolver} plus the {@code /api/v1/chat/files/...} URL. So
* the absolute form must be avoided: it leaks the server's filesystem layout
* into the prompt/response and breaks if the deploy directory ever moves.
* <p>
* The path is made relative to {@code uploadRoot}'s parent so the trailing
* upload sub-directory name is preserved (e.g. {@code chat-uploads/...}), and
* separators are normalized to {@code /} so the value is stable across OSes.
*/
static String toRelativeUploadPath(Path uploadRoot, String conversationId, String storedName) {
Path target = uploadRoot.resolve(conversationId).resolve(storedName);
Path base = uploadRoot.getParent();
Path relative = base != null ? base.relativize(target) : target;
return relative.toString().replace('\\', '/');
}

private MessageEntity saveEmptyAssistantPlaceholder(String conversationId, String status,
StreamAccumulator accumulator, String source) {
log.warn("{} with empty accumulator: conversationId={}, status={}, finishReason={}, phase={}, hasSegments={}",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package vip.mate.channel.web;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import java.nio.file.Path;
import java.nio.file.Paths;

import static org.assertj.core.api.Assertions.assertThat;

/**
* Pins {@link ChatController#toRelativeUploadPath} to return a <em>root-relative</em>
* path, never the absolute server location.
* <p>
* Regression guard for the workspace-aware chat-uploads change: once the upload
* root became absolute (the resolver normalizes via {@code toAbsolutePath()}),
* the {@code path} field — which is rendered into the LLM prompt and returned to
* the client — started leaking the server's absolute filesystem layout. These
* tests lock the value back to {@code chat-uploads/{convId}/{storedName}}.
*/
class ChatControllerUploadPathTest {

@Test
@DisplayName("default root: returns chat-uploads/{convId}/{storedName}, not absolute")
void defaultRootIsRelative() {
// Mirrors the resolver's default root: absolute + normalized.
Path uploadRoot = Paths.get("data", "chat-uploads").toAbsolutePath().normalize();

String path = ChatController.toRelativeUploadPath(uploadRoot, "conv-1", "1777_a.txt");

assertThat(path).isEqualTo("chat-uploads/conv-1/1777_a.txt");
assertThat(Paths.get(path).isAbsolute()).isFalse();
assertThat(path).doesNotContain(uploadRoot.toString());
}

@Test
@DisplayName("workspace-scoped absolute root: still root-relative, no leak")
void scopedRootIsRelative() {
// An absolute workspace basePath somewhere outside the CWD.
Path uploadRoot = Paths.get("/srv/ws/alpha/chat-uploads").toAbsolutePath().normalize();

String path = ChatController.toRelativeUploadPath(uploadRoot, "conv-2", "9_b.pdf");

assertThat(path).isEqualTo("chat-uploads/conv-2/9_b.pdf");
assertThat(path).doesNotContain("/srv/ws/alpha");
}

@Test
@DisplayName("custom base-dir name is preserved (not hardcoded to chat-uploads)")
void customBaseDirNamePreserved() {
Path uploadRoot = Paths.get("/var/uploads").toAbsolutePath().normalize();

String path = ChatController.toRelativeUploadPath(uploadRoot, "conv-3", "f.bin");

assertThat(path).isEqualTo("uploads/conv-3/f.bin");
}
}