MoerAI
111b796820
Root cause: when a file:// prompt URI resolves outside the project root, resolvePromptAppend returns the warning '[WARNING: Path rejected: $URI]' with no indication of WHY the path was rejected. Issue #3554 reports that this is confusing because the docs explicitly advertise support for absolute, home-relative, and cross-project file:// paths, yet the code intentionally restricts file:// prompt resolution to the project boundary (commit 98659783, security hardening).
Fix: extend the warning message so it now includes the resolved project root and an explicit hint that file:// prompts must reside within the project boundary. The security restriction itself is preserved unchanged.
Verification: added a regression test that asserts the rejection warning matches /outside project root/i. Test fails before the fix, passes after. Full resolve-file-uri.test.ts suite: 11 pass / 0 fail. typecheck clean.
43 lines
1.4 KiB
TypeScript
43 lines
1.4 KiB
TypeScript
import { existsSync, readFileSync } from "node:fs"
|
|
import { homedir } from "node:os"
|
|
import { isAbsolute, resolve } from "node:path"
|
|
import { isWithinProject } from "../../shared/contains-path"
|
|
import { log } from "../../shared/logger"
|
|
|
|
export function resolvePromptAppend(promptAppend: string, configDir?: string): string {
|
|
if (!promptAppend.startsWith("file://")) return promptAppend
|
|
|
|
const encoded = promptAppend.slice(7)
|
|
|
|
let filePath: string
|
|
try {
|
|
const decoded = decodeURIComponent(encoded)
|
|
const expanded = decoded.startsWith("~/") ? decoded.replace(/^~\//, `${homedir()}/`) : decoded
|
|
filePath = isAbsolute(expanded)
|
|
? expanded
|
|
: resolve(configDir ?? process.cwd(), expanded)
|
|
} catch {
|
|
return `[WARNING: Malformed file URI (invalid percent-encoding): ${promptAppend}]`
|
|
}
|
|
|
|
const projectRoot = configDir ?? process.cwd()
|
|
if (!isWithinProject(filePath, projectRoot)) {
|
|
log("[resolve-file-uri] Rejected file URI outside project root", {
|
|
promptAppend,
|
|
filePath,
|
|
projectRoot,
|
|
})
|
|
return `[WARNING: Path rejected: ${promptAppend} (resolved outside project root ${projectRoot}; file:// prompts must reside within the project boundary)]`
|
|
}
|
|
|
|
if (!existsSync(filePath)) {
|
|
return `[WARNING: Could not resolve file URI: ${promptAppend}]`
|
|
}
|
|
|
|
try {
|
|
return readFileSync(filePath, "utf8")
|
|
} catch {
|
|
return `[WARNING: Could not read file: ${promptAppend}]`
|
|
}
|
|
}
|