fix: harden runWrangler against shell injection and silence DEP0190 #1248
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@opennextjs/cloudflare": patch | ||
| --- | ||
|
|
||
| fix: harden `runWrangler` against shell injection and silence Node.js DEP0190. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import { afterEach, beforeEach, describe, expect, it } from "vitest"; | ||
|
|
||
| import { quoteShellMeta } from "./helpers.js"; | ||
|
|
||
| describe("quoteShellMeta", () => { | ||
| describe("on Windows", () => { | ||
| let originalPlatform: PropertyDescriptor | undefined; | ||
|
|
||
| beforeEach(() => { | ||
| originalPlatform = Object.getOwnPropertyDescriptor(process, "platform"); | ||
| Object.defineProperty(process, "platform", { value: "win32" }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| if (originalPlatform) { | ||
| Object.defineProperty(process, "platform", originalPlatform); | ||
| } | ||
| }); | ||
|
|
||
| it("escapes empty strings", () => { | ||
| expect(quoteShellMeta("")).toBe('^"^"'); | ||
| }); | ||
|
|
||
| it("escapes simple alphanumeric values", () => { | ||
| expect(quoteShellMeta("simple-value")).toBe('^"simple-value^"'); | ||
| }); | ||
|
|
||
| it("does not leave bare carets in front of metacharacters inside the wrapping quotes", () => { | ||
| // Regression: an earlier implementation produced `"...^(...^)..."` which made the | ||
| // carets literal characters inside cmd.exe quotes, corrupting SQL with parens. | ||
| // The correct algorithm caret-escapes the wrapping quotes themselves, so the inner | ||
| // metacharacters stay un-escaped. | ||
| const sql = "CREATE TABLE foo (x INT);"; | ||
| const escaped = quoteShellMeta(sql); | ||
| expect(escaped).toBe('^"CREATE^ TABLE^ foo^ ^(x^ INT^)^;^"'); | ||
| // No bare `^(` or `^)` sitting inside an un-caret-escaped `"..."`. | ||
| expect(escaped).not.toMatch(/(?<!\^)"[^"]*\^[()][^"]*(?<!\^)"/); | ||
| }); | ||
|
|
||
| it("escapes paths containing spaces", () => { | ||
| expect(quoteShellMeta("C:\\Users\\Some User\\chunk.json")).toBe( | ||
| '^"C:\\Users\\Some^ User\\chunk.json^"' | ||
| ); | ||
| }); | ||
|
|
||
| it("escapes JSON values containing quotes and braces", () => { | ||
| expect(quoteShellMeta('KEY:{"foo":"bar baz"}')).toBe('^"KEY:{\\^"foo\\^":\\^"bar^ baz\\^"}^"'); | ||
| }); | ||
|
|
||
| it("doubles backslashes that precede a quote", () => { | ||
| // A backslash immediately before a quote needs doubling so the receiving program's | ||
| // argument parser sees a single literal backslash followed by an escaped quote. | ||
| expect(quoteShellMeta('\\"')).toBe('^"\\\\\\^"^"'); | ||
| }); | ||
| }); | ||
|
|
||
| describe("on POSIX", () => { | ||
| let originalPlatform: PropertyDescriptor | undefined; | ||
|
|
||
| beforeEach(() => { | ||
| originalPlatform = Object.getOwnPropertyDescriptor(process, "platform"); | ||
| Object.defineProperty(process, "platform", { value: "linux" }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| if (originalPlatform) { | ||
| Object.defineProperty(process, "platform", originalPlatform); | ||
| } | ||
| }); | ||
|
|
||
| it("single-quotes values containing whitespace", () => { | ||
| expect(quoteShellMeta("hello world")).toBe("'hello world'"); | ||
| }); | ||
|
|
||
| it("double-quotes values containing both single and double quotes", () => { | ||
| expect(quoteShellMeta(`it's "quoted"`)).toBe(`"it's \\"quoted\\""`); | ||
| }); | ||
|
|
||
| it("backslash-escapes shell metacharacters in bare values", () => { | ||
| expect(quoteShellMeta("a;b")).toBe("a\\;b"); | ||
| }); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.