fix(prompts): reject unsafe template indexes · openclaw/openclaw@8ac0c35

Recent Commits to openclaw:main

steipete · 2026-05-29 · via Recent Commits to openclaw:main

File tree

packages/agent-core/src/harness

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { substituteArgs } from "./prompt-templates.js";`
	`3`	`+`
	`4`	`+describe("prompt template argument substitution", () => {`
	`5`	`+it("rejects unsafe positional placeholders", () => {`
	`6`	`+expect(substituteArgs("$9007199254740992", ["first", "second"])).toBe("");`
	`7`	`+});`
	`8`	`+`
	`9`	`+it("rejects unsafe slice starts and lengths", () => {`
	`10`	`+const args = ["alpha", "beta", "gamma"];`
	`11`	`+`
	`12`	`+expect(substituteArgs("${@:9007199254740992}", args)).toBe("");`
	`13`	`+expect(substituteArgs("${@:1:9007199254740992}", args)).toBe("");`
	`14`	`+});`
	`15`	`+`
	`16`	`+it("preserves zero slice compatibility", () => {`
	`17`	`+expect(substituteArgs("${@:0:0}", ["alpha", "beta"])).toBe("");`
	`18`	`+expect(substituteArgs("${@:0:1}", ["alpha", "beta"])).toBe("alpha");`
	`19`	`+});`
	`20`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -287,19 +287,38 @@ export function parseCommandArgs(argsString: string): string[] {`
`287`	`287`	`return args;`
`288`	`288`	`}`
`289`	`289`
	`290`	`+function parseSafeNonNegativeInteger(raw: string): number \| undefined {`
	`291`	`+const parsed = Number(raw);`
	`292`	`+return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : undefined;`
	`293`	`+}`
	`294`	`+`
`290`	`295`	/** Substitute prompt template placeholders (`$1`, `$@`, `$ARGUMENTS`, `${@:N}`, `${@:N:L}`) with command arguments. */
`291`	`296`	`export function substituteArgs(content: string, args: string[]): string {`
`292`	`297`	`let result = content;`
`293`		`-result = result.replace(/\$(\d+)/g, (_, num: string) => args[Number.parseInt(num, 10) - 1] ?? "");`
	`298`	`+result = result.replace(/\$(\d+)/g, (_, num: string) => {`
	`299`	`+const parsed = parseSafeNonNegativeInteger(num);`
	`300`	`+if (parsed === undefined \|\| parsed <= 0) {`
	`301`	`+return "";`
	`302`	`+}`
	`303`	`+return args[parsed - 1] ?? "";`
	`304`	`+});`
`294`	`305`	`result = result.replace(`
`295`	`306`	`/\$\{@:(\d+)(?::(\d+))?\}/g,`
`296`	`307`	`(_, startStr: string, lengthStr?: string) => {`
`297`		`-let start = Number.parseInt(startStr, 10) - 1;`
	`308`	`+const parsedStart = parseSafeNonNegativeInteger(startStr);`
	`309`	`+if (parsedStart === undefined) {`
	`310`	`+return "";`
	`311`	`+}`
	`312`	`+let start = parsedStart - 1;`
`298`	`313`	`if (start < 0) {`
`299`	`314`	`start = 0;`
`300`	`315`	`}`
`301`	`316`	`if (lengthStr) {`
`302`		`-return args.slice(start, start + Number.parseInt(lengthStr, 10)).join(" ");`
	`317`	`+const length = parseSafeNonNegativeInteger(lengthStr);`
	`318`	`+if (length === undefined) {`
	`319`	`+return "";`
	`320`	`+}`
	`321`	`+return args.slice(start, start + length).join(" ");`
`303`	`322`	`}`
`304`	`323`	`return args.slice(start).join(" ");`
`305`	`324`	`},`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { substituteArgs } from "./prompt-templates.js";`
	`3`	`+`
	`4`	`+describe("prompt template argument substitution", () => {`
	`5`	`+it("rejects unsafe positional placeholders", () => {`
	`6`	`+expect(substituteArgs("$9007199254740992", ["first", "second"])).toBe("");`
	`7`	`+});`
	`8`	`+`
	`9`	`+it("rejects unsafe slice starts and lengths", () => {`
	`10`	`+const args = ["alpha", "beta", "gamma"];`
	`11`	`+`
	`12`	`+expect(substituteArgs("${@:9007199254740992}", args)).toBe("");`
	`13`	`+expect(substituteArgs("${@:1:9007199254740992}", args)).toBe("");`
	`14`	`+});`
	`15`	`+`
	`16`	`+it("preserves zero slice compatibility", () => {`
	`17`	`+expect(substituteArgs("${@:0:0}", ["alpha", "beta"])).toBe("");`
	`18`	`+expect(substituteArgs("${@:0:1}", ["alpha", "beta"])).toBe("alpha");`
	`19`	`+});`
	`20`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,11 @@ export function parseCommandArgs(argsString: string): string[] {`
`54`	`54`	`return args;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+function parseSafeNonNegativeInteger(raw: string): number \| undefined {`
	`58`	`+const parsed = Number(raw);`
	`59`	`+return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : undefined;`
	`60`	`+}`
	`61`	`+`
`57`	`62`	`/**`
`58`	`63`	`* Substitute argument placeholders in template content`
`59`	`64`	`* Supports:`
`@@ -71,21 +76,32 @@ export function substituteArgs(content: string, args: string[]): string {`
`71`	`76`	`// Replace $1, $2, etc. with positional args FIRST (before wildcards)`
`72`	`77`	`// This prevents wildcard replacement values containing $<digit> patterns from being re-substituted`
`73`	`78`	`result = result.replace(/\$(\d+)/g, (_, num) => {`
`74`		`-const index = Number.parseInt(num, 10) - 1;`
	`79`	`+const parsed = parseSafeNonNegativeInteger(num);`
	`80`	`+if (parsed === undefined \|\| parsed <= 0) {`
	`81`	`+return "";`
	`82`	`+}`
	`83`	`+const index = parsed - 1;`
`75`	`84`	`return args[index] ?? "";`
`76`	`85`	`});`
`77`	`86`
`78`	`87`	`// Replace ${@:start} or ${@:start:length} with sliced args (bash-style)`
`79`	`88`	`// Process BEFORE simple $@ to avoid conflicts`
`80`	`89`	`result = result.replace(/\$\{@:(\d+)(?::(\d+))?\}/g, (_, startStr, lengthStr) => {`
`81`		`-let start = Number.parseInt(startStr, 10) - 1; // Convert to 0-indexed (user provides 1-indexed)`
	`90`	`+const parsedStart = parseSafeNonNegativeInteger(startStr);`
	`91`	`+if (parsedStart === undefined) {`
	`92`	`+return "";`
	`93`	`+}`
	`94`	`+let start = parsedStart - 1; // Convert to 0-indexed (user provides 1-indexed)`
`82`	`95`	`// Treat 0 as 1 (bash convention: args start at 1)`
`83`	`96`	`if (start < 0) {`
`84`	`97`	`start = 0;`
`85`	`98`	`}`
`86`	`99`
`87`	`100`	`if (lengthStr) {`
`88`		`-const length = Number.parseInt(lengthStr, 10);`
	`101`	`+const length = parseSafeNonNegativeInteger(lengthStr);`
	`102`	`+if (length === undefined) {`
	`103`	`+return "";`
	`104`	`+}`
`89`	`105`	`return args.slice(start, start + length).join(" ");`
`90`	`106`	`}`
`91`	`107`	`return args.slice(start).join(" ");`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree