Skip to content

fix: ensure resolved stays inside base path #5956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staaldraad wants to merge 3 commits into
base: develop
Choose a base branch
from
+27 −3
Open

fix: ensure resolved stays inside base path #5956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d52b978
fix: ensure resolved stays inside base path
staaldraad Jul 27, 2026
72499b9
fix: codex review
staaldraad Jul 27, 2026
3c4deae
Merge branch 'develop' into fix/cli-1993
staaldraad Jul 29, 2026
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
2 changes: 1 addition & 1 deletion apps/cli-go/internal/functions/download/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func downloadFunction(ctx context.Context, projectRef, slug, extractScriptPath s

resBuf := bytes.NewReader(resp.Body)
funcDir := filepath.Join(utils.FunctionsDir, slug)
args := []string{"run", "-A", extractScriptPath, funcDir, *meta.EntrypointPath}
args := []string{"run", "-A", extractScriptPath, funcDir, *meta.EntrypointPath, utils.FunctionsDir}
cmd := exec.CommandContext(ctx, denoPath, args...)
var errBuf bytes.Buffer
cmd.Stdin = resBuf
Expand Down
28 changes: 26 additions & 2 deletions apps/cli-go/internal/utils/denos/extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,18 @@ async function loadEszip(bytes: Uint8Array) {
async function extractEszip(
destPath: string,
entrypointUrl: string,
rootPath: string,
parser: Parser,
specifiers: string[],
) {
const entrypointPath = path.fromFileUrl(entrypointUrl);
const basePath = path.dirname(entrypointPath);
// Containment is enforced against rootPath (the shared functions
// directory), not destPath (this function's own directory): a common
// layout imports a sibling like "../_shared/cors.ts", which legitimately
// resolves one level above destPath, but must never resolve outside
// rootPath entirely.
const resolvedRoot = path.resolve(rootPath);
for (const specifier of specifiers) {
// skip remote dependencies
if (!specifier.startsWith("file:")) {
Expand All @@ -32,16 +39,33 @@ async function extractEszip(
const absPath = path.fromFileUrl(specifier);
const relPath = path.relative(basePath, absPath);
const dest = path.join(destPath, relPath);

const resolvedDest = path.resolve(dest);
const relToRoot = path.relative(resolvedRoot, resolvedDest);
if (
relToRoot === ".." ||
relToRoot.startsWith(`..${path.SEP}`) ||
path.isAbsolute(relToRoot)
) {
Comment thread
staaldraad marked this conversation as resolved.
throw new Error(
`Refusing to extract "${specifier}" outside of ${rootPath}`,
);
}

console.info(path.resolve(dest));
await write(dest, module);
}
}

async function extractSource(destPath: string, entrypointUrl: string) {
async function extractSource(
destPath: string,
entrypointUrl: string,
rootPath: string,
) {
const buf = await readAll(Deno.stdin);

const { parser, specifiers } = await loadEszip(buf);
await extractEszip(destPath, entrypointUrl, parser, specifiers);
await extractEszip(destPath, entrypointUrl, rootPath, parser, specifiers);
}

extractSource(...Deno.args);
Loading