Skip to content

Fix path traversal: contain template path within the workspace #92

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

Fix path traversal: contain template path within the workspace #92

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
25 changes: 23 additions & 2 deletions src/messageParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,39 @@ export class Parser {
document: vscode.TextDocument;
messageList: MessageList;
} & L10nYamlPathAndOptions): string | undefined {
let candidate: string | undefined;
if (messageList.templatePath) {
return path.isAbsolute(messageList.templatePath)
candidate = path.isAbsolute(messageList.templatePath)
? messageList.templatePath
: path.join(path.dirname(document.uri.fsPath), messageList.templatePath);
} else if (l10nOptions !== undefined) {
const templateRootFromOptions = l10nOptions?.['arb-dir'] ?? 'lib/l10n';
const templatePathFromOptions = l10nOptions?.['template-arb-file'] ?? 'app_en.arb';

return path.isAbsolute(templatePathFromOptions)
candidate = path.isAbsolute(templatePathFromOptions)
? templatePathFromOptions
: path.join(path.dirname(l10nYamlPath), templateRootFromOptions, templatePathFromOptions);
}

if (candidate === undefined) {
return undefined;
}

// Security: the template path is derived from workspace content that an
// untrusted party may control — the `@@x-template` field of an .arb file,
// or `arb-dir` / `template-arb-file` in l10n.yaml — and is passed straight
// to fs.readFileSync below. Without containment, a crafted value such as
// `@@x-template: "../../../../etc/passwd"` (or an absolute path) lets a
// repository read any file the editing user can open, outside the project.
// Refuse any resolved path that escapes the workspace folder.
const resolved = path.resolve(candidate);
const workspaceRoot = path.resolve(
vscode.workspace.getWorkspaceFolder(document.uri)?.uri.fsPath
?? path.dirname(document.uri.fsPath));
if (resolved !== workspaceRoot && !resolved.startsWith(workspaceRoot + path.sep)) {
return undefined;
}
return resolved;
}

parseAndDecorate({
Expand Down