Skip to content

fix(security): expand $HOME before path validation in downloadFile (#3080) #3081

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

fix(security): expand $HOME before path validation in downloadFile (#3080) #3081

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@openrouter/spawn",
"version": "0.27.6",
"version": "0.27.7",
"type": "module",
"bin": {
"spawn": "cli.js"
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/aws/aws.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,15 +1178,15 @@ export async function uploadFile(localPath: string, remotePath: string): Promise
}

export async function downloadFile(remotePath: string, localPath: string): Promise<void> {
const normalizedRemote = validateRemotePath(remotePath, /^[a-zA-Z0-9/_.~$-]+$/);
const expandedRemote = remotePath.replace(/^\$HOME\//, "~/");
const normalizedRemote = validateRemotePath(expandedRemote, /^[a-zA-Z0-9/_.~-]+$/);
const keyOpts = getSshKeyOpts(await ensureSshKeys());
const expandedPath = normalizedRemote.replace(/^\$HOME/, "~");
const proc = Bun.spawn(
[
"scp",
...SSH_BASE_OPTS,
...keyOpts,
`${SSH_USER}@${_state.instanceIp}:${expandedPath}`,
`${SSH_USER}@${_state.instanceIp}:${normalizedRemote}`,
localPath,
],
{
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/digitalocean/digitalocean.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,17 +1448,17 @@ export async function uploadFile(localPath: string, remotePath: string, ip?: str

export async function downloadFile(remotePath: string, localPath: string, ip?: string): Promise<void> {
const serverIp = ip || _state.serverIp;
const normalizedRemote = validateRemotePath(remotePath, /^[a-zA-Z0-9/_.~$-]+$/);
const expandedRemote = remotePath.replace(/^\$HOME\//, "~/");
const normalizedRemote = validateRemotePath(expandedRemote, /^[a-zA-Z0-9/_.~-]+$/);

const keyOpts = getSshKeyOpts(await ensureSshKeys());
const expandedPath = normalizedRemote.replace(/^\$HOME/, "~");

const proc = Bun.spawn(
[
"scp",
...SSH_BASE_OPTS,
...keyOpts,
`root@${serverIp}:${expandedPath}`,
`root@${serverIp}:${normalizedRemote}`,
localPath,
],
{
Expand Down
13 changes: 6 additions & 7 deletions packages/cli/src/gcp/gcp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,10 +1028,9 @@ export async function uploadFile(localPath: string, remotePath: string): Promise
logError(`Invalid local path: ${localPath}`);
throw new Error("Invalid local path");
}
const normalizedRemote = validateRemotePath(remotePath, /^[a-zA-Z0-9/_.~$-]+$/);
const expandedRemote = remotePath.replace(/^\$HOME\//, "~/");
const normalizedRemote = validateRemotePath(expandedRemote, /^[a-zA-Z0-9/_.~-]+$/);
const username = resolveUsername();
// Expand $HOME on remote side
const expandedPath = normalizedRemote.replace(/^\$HOME/, "~");
const keyOpts = getSshKeyOpts(await ensureSshKeys());

const proc = Bun.spawn(
Expand All @@ -1040,7 +1039,7 @@ export async function uploadFile(localPath: string, remotePath: string): Promise
...SSH_BASE_OPTS,
...keyOpts,
localPath,
`${username}@${_state.serverIp}:${expandedPath}`,
`${username}@${_state.serverIp}:${normalizedRemote}`,
],
{
stdio: [
Expand All @@ -1067,17 +1066,17 @@ export async function downloadFile(remotePath: string, localPath: string): Promi
logError(`Invalid local path: ${localPath}`);
throw new Error("Invalid local path");
}
const normalizedRemote = validateRemotePath(remotePath, /^[a-zA-Z0-9/_.~$-]+$/);
const expandedRemote = remotePath.replace(/^\$HOME\//, "~/");
const normalizedRemote = validateRemotePath(expandedRemote, /^[a-zA-Z0-9/_.~-]+$/);
const username = resolveUsername();
const expandedPath = normalizedRemote.replace(/^\$HOME/, "~");
const keyOpts = getSshKeyOpts(await ensureSshKeys());

const proc = Bun.spawn(
[
"scp",
...SSH_BASE_OPTS,
...keyOpts,
`${username}@${_state.serverIp}:${expandedPath}`,
`${username}@${_state.serverIp}:${normalizedRemote}`,
localPath,
],
{
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/hetzner/hetzner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,17 +909,17 @@ export async function uploadFile(localPath: string, remotePath: string, ip?: str

export async function downloadFile(remotePath: string, localPath: string, ip?: string): Promise<void> {
const serverIp = ip || _state.serverIp;
const normalizedRemote = validateRemotePath(remotePath, /^[a-zA-Z0-9/_.~$-]+$/);
const expandedRemote = remotePath.replace(/^\$HOME\//, "~/");
const normalizedRemote = validateRemotePath(expandedRemote, /^[a-zA-Z0-9/_.~-]+$/);

const keyOpts = getSshKeyOpts(await ensureSshKeys());
const expandedPath = normalizedRemote.replace(/^\$HOME/, "~");

const proc = Bun.spawn(
[
"scp",
...SSH_BASE_OPTS,
...keyOpts,
`root@${serverIp}:${expandedPath}`,
`root@${serverIp}:${normalizedRemote}`,
localPath,
],
{
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/sprite/sprite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,10 +657,10 @@ export async function uploadFileSprite(localPath: string, remotePath: string): P

/** Download a file from the remote sprite by catting it to stdout. */
export async function downloadFileSprite(remotePath: string, localPath: string): Promise<void> {
const normalizedRemote = validateRemotePath(remotePath, /^[a-zA-Z0-9/_.~$-]+$/);
const expandedRemote = remotePath.replace(/^\$HOME\//, "~/");
const normalizedRemote = validateRemotePath(expandedRemote, /^[a-zA-Z0-9/_.~-]+$/);

const spriteCmd = getSpriteCmd()!;
const expandedPath = normalizedRemote.replace(/^\$HOME/, "~");

await spriteRetry("sprite download", async () => {
const proc = Bun.spawn(
Expand All @@ -672,7 +672,7 @@ export async function downloadFileSprite(remotePath: string, localPath: string):
_state.name,
"--",
"cat",
expandedPath,
normalizedRemote,
],
{
stdio: [
Expand Down
Loading