Harden session discovery with path validation and parallel I/O
Security: Reject session paths containing '..' traversal segments or non-.jsonl extensions before resolving them. This prevents a malicious sessions-index.json from tricking the viewer into reading arbitrary files. Performance: Process all project directories concurrently with Promise.all instead of sequentially awaiting each one. Each directory's stat + readFile is independent I/O that benefits from parallelism. Add test case verifying that traversal paths and non-JSONL paths are rejected while valid paths pass through. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -28,46 +28,70 @@ export async function discoverSessions(
|
|||||||
return sessions;
|
return sessions;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const projectDir of projectDirs) {
|
// Parallel I/O: stat + readFile for all project dirs concurrently
|
||||||
const projectPath = path.join(projectsDir, projectDir);
|
const results = await Promise.all(
|
||||||
|
projectDirs.map(async (projectDir) => {
|
||||||
|
const projectPath = path.join(projectsDir, projectDir);
|
||||||
|
const entries: SessionEntry[] = [];
|
||||||
|
|
||||||
let stat;
|
let stat;
|
||||||
try {
|
try {
|
||||||
stat = await fs.stat(projectPath);
|
stat = await fs.stat(projectPath);
|
||||||
} catch {
|
} catch {
|
||||||
continue;
|
return entries;
|
||||||
}
|
|
||||||
if (!stat.isDirectory()) continue;
|
|
||||||
|
|
||||||
const indexPath = path.join(projectPath, "sessions-index.json");
|
|
||||||
try {
|
|
||||||
const content = await fs.readFile(indexPath, "utf-8");
|
|
||||||
const parsed = JSON.parse(content);
|
|
||||||
|
|
||||||
// Handle both formats: raw array or { version, entries: [...] }
|
|
||||||
const entries: IndexEntry[] = Array.isArray(parsed)
|
|
||||||
? parsed
|
|
||||||
: parsed.entries ?? [];
|
|
||||||
|
|
||||||
for (const entry of entries) {
|
|
||||||
const sessionPath =
|
|
||||||
entry.fullPath ||
|
|
||||||
path.join(projectPath, `${entry.sessionId}.jsonl`);
|
|
||||||
|
|
||||||
sessions.push({
|
|
||||||
id: entry.sessionId,
|
|
||||||
summary: entry.summary || "",
|
|
||||||
firstPrompt: entry.firstPrompt || "",
|
|
||||||
project: projectDir,
|
|
||||||
created: entry.created || "",
|
|
||||||
modified: entry.modified || "",
|
|
||||||
messageCount: entry.messageCount || 0,
|
|
||||||
path: sessionPath,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
} catch {
|
if (!stat.isDirectory()) return entries;
|
||||||
// Missing or corrupt index - skip
|
|
||||||
}
|
const indexPath = path.join(projectPath, "sessions-index.json");
|
||||||
|
try {
|
||||||
|
const content = await fs.readFile(indexPath, "utf-8");
|
||||||
|
const parsed = JSON.parse(content);
|
||||||
|
|
||||||
|
// Handle both formats: raw array or { version, entries: [...] }
|
||||||
|
const rawEntries: IndexEntry[] = Array.isArray(parsed)
|
||||||
|
? parsed
|
||||||
|
: parsed.entries ?? [];
|
||||||
|
|
||||||
|
for (const entry of rawEntries) {
|
||||||
|
const sessionPath =
|
||||||
|
entry.fullPath ||
|
||||||
|
path.join(projectPath, `${entry.sessionId}.jsonl`);
|
||||||
|
|
||||||
|
// Validate: reject paths with traversal segments or non-JSONL extensions.
|
||||||
|
// Check the raw path for ".." before resolving (resolve normalizes them away).
|
||||||
|
if (sessionPath.includes("..") || !sessionPath.endsWith(".jsonl")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const resolved = path.resolve(sessionPath);
|
||||||
|
|
||||||
|
// Containment check: reject paths that escape the projects directory.
|
||||||
|
// A corrupted or malicious index could set fullPath to an arbitrary
|
||||||
|
// absolute path like "/etc/shadow.jsonl".
|
||||||
|
if (!resolved.startsWith(projectsDir + path.sep) && resolved !== projectsDir) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
entries.push({
|
||||||
|
id: entry.sessionId,
|
||||||
|
summary: entry.summary || "",
|
||||||
|
firstPrompt: entry.firstPrompt || "",
|
||||||
|
project: projectDir,
|
||||||
|
created: entry.created || "",
|
||||||
|
modified: entry.modified || "",
|
||||||
|
messageCount: entry.messageCount || 0,
|
||||||
|
path: resolved,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Missing or corrupt index - skip
|
||||||
|
}
|
||||||
|
|
||||||
|
return entries;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const entries of results) {
|
||||||
|
sessions.push(...entries);
|
||||||
}
|
}
|
||||||
|
|
||||||
sessions.sort((a, b) => {
|
sessions.sort((a, b) => {
|
||||||
|
|||||||
@@ -111,6 +111,42 @@ describe("session-discovery", () => {
|
|||||||
await fs.rm(tmpDir, { recursive: true });
|
await fs.rm(tmpDir, { recursive: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("rejects paths with traversal segments", async () => {
|
||||||
|
const tmpDir = path.join(os.tmpdir(), `sv-test-traversal-${Date.now()}`);
|
||||||
|
const projectDir = path.join(tmpDir, "traversal-project");
|
||||||
|
await fs.mkdir(projectDir, { recursive: true });
|
||||||
|
|
||||||
|
await fs.writeFile(
|
||||||
|
path.join(projectDir, "sessions-index.json"),
|
||||||
|
makeIndex([
|
||||||
|
{
|
||||||
|
sessionId: "evil-001",
|
||||||
|
fullPath: "/home/ubuntu/../../../etc/passwd",
|
||||||
|
created: "2025-10-15T10:00:00Z",
|
||||||
|
modified: "2025-10-15T11:00:00Z",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
sessionId: "evil-002",
|
||||||
|
fullPath: "/home/ubuntu/sessions/not-a-jsonl.txt",
|
||||||
|
created: "2025-10-15T10:00:00Z",
|
||||||
|
modified: "2025-10-15T11:00:00Z",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
sessionId: "good-001",
|
||||||
|
fullPath: "/home/ubuntu/.claude/projects/xyz/good-001.jsonl",
|
||||||
|
created: "2025-10-15T10:00:00Z",
|
||||||
|
modified: "2025-10-15T11:00:00Z",
|
||||||
|
},
|
||||||
|
])
|
||||||
|
);
|
||||||
|
|
||||||
|
const sessions = await discoverSessions(tmpDir);
|
||||||
|
expect(sessions).toHaveLength(1);
|
||||||
|
expect(sessions[0].id).toBe("good-001");
|
||||||
|
|
||||||
|
await fs.rm(tmpDir, { recursive: true });
|
||||||
|
});
|
||||||
|
|
||||||
it("uses fullPath from index entry", async () => {
|
it("uses fullPath from index entry", async () => {
|
||||||
const tmpDir = path.join(os.tmpdir(), `sv-test-fp-${Date.now()}`);
|
const tmpDir = path.join(os.tmpdir(), `sv-test-fp-${Date.now()}`);
|
||||||
const projectDir = path.join(tmpDir, "fp-project");
|
const projectDir = path.join(tmpDir, "fp-project");
|
||||||
|
|||||||
Reference in New Issue
Block a user