Skip to content

fix: resolve symlinks before path validation #186

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
Baqauye wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve symlinks before path validation #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/lib/task-origin-validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,11 @@ export async function buildAndValidateSignature(options: TaskOriginVerifyOptions

// Validate paths are within the allowed directory if specified
if (allowedDir) {
assertWithinDir(taskFolderPath, allowedDir);
assertWithinDir(signatureFile, allowedDir);
const resolvedTaskFolderPath = await fs.realpath(taskFolderPath);
const resolvedSignatureFile = await fs.realpath(signatureFile);

assertWithinDir(resolvedTaskFolderPath, allowedDir);
assertWithinDir(resolvedSignatureFile, allowedDir);
}

// Extract the bundle containing both the signature and certificate chain
Expand Down Expand Up @@ -254,8 +257,11 @@ export async function verifyTaskOrigin(options: TaskOriginVerifyOptions): Promis

// Validate paths are within the allowed directory if specified
if (allowedDir) {
assertWithinDir(taskFolderPath, allowedDir);
assertWithinDir(signatureFile, allowedDir);
const resolvedTaskFolderPath = await fs.realpath(taskFolderPath);
const resolvedSignatureFile = await fs.realpath(signatureFile);

assertWithinDir(resolvedTaskFolderPath, allowedDir);
assertWithinDir(resolvedSignatureFile, allowedDir);
}

// Make sure that the task folder path and signature file exist
Expand Down