Skip to content

Commit fbc91c8

Browse files
waleedlatif1waleedlatif1
committed
fix(code-placeholders): harden shell placeholder interpolation in arithmetic contexts
1 parent 14e6c0a commit fbc91c8

3 files changed

Lines changed: 545 additions & 187 deletions

File tree

‎apps/sim/lib/execution/code-placeholders/compiler.test.ts‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,53 @@ describe('code placeholder compiler', () => {
10531053
'total=$(( $(( 1 + 1 )) + {{KEY}} ))',
10541054
'cat <<PAYLOAD\n$(( {{KEY}} * 2 ))\nPAYLOAD',
10551055
'cat <<PAYLOAD\n$[ {{KEY}} * 2 ]\nPAYLOAD',
1056+
'echo $(( $(cat <<EOF\n{{KEY}}\nEOF\n) + 1 ))',
1057+
"echo $(( $(cat <<'EOF'\n{{KEY}}\nEOF\n) + 1 ))",
1058+
"echo $(( $(cat <<-'EOF'\n\t{{KEY}}\n\tEOF\n) + 1 ))",
1059+
'[[ {{KEY}} -eq 0 ]] && echo zero',
1060+
'[[ "{{KEY}}" -eq 0 ]] && echo zero',
1061+
'if [[ 0 -lt {{KEY}} ]]; then echo positive; fi',
1062+
'[[ -n x && ( "{{KEY}}" -ge 1 ) ]]',
1063+
'[[ $(printf "%s" "{{KEY}}") -ne 0 ]]',
1064+
'[[ $(printf "%s" "{{KEY}}"; echo 1) -le 0 ]]',
1065+
'[[ $(cat <<EOF\n{{KEY}}\nEOF\n) -gt 0 ]]',
1066+
'let "x={{KEY}}"',
1067+
'let x={{KEY}}+1',
1068+
'declare -i x="{{KEY}}"',
1069+
'typeset -i x={{KEY}}',
1070+
'f() { local -i x="{{KEY}}"; }',
1071+
'declare -ai values=("{{KEY}}")',
1072+
'declare -x -i x="{{KEY}}"',
1073+
'let x="$(printf "%s" "{{KEY}}")"',
1074+
'declare -i x="$(printf "%s" "{{KEY}}")"',
1075+
'>/dev/null let x="{{KEY}}"',
1076+
'2>/dev/null let x="{{KEY}}"',
1077+
'builtin let x="{{KEY}}"',
1078+
'command let x="{{KEY}}"',
1079+
'a[{{KEY}}]=1',
1080+
'a[{{KEY}}]+=1',
1081+
'declare -i n; n="{{KEY}}"',
1082+
'declare -i n\nn="{{KEY}}"',
1083+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1084+
'a=(1 2); echo "${a[{{KEY}}]}"',
1085+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1086+
'a=(1 2); echo "${a[0]:{{KEY}}}"',
1087+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1088+
'a=(1 2); echo "${a[0]:0:{{KEY}}}"',
1089+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1090+
's=abc; echo "${s:{{KEY}}}"',
1091+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1092+
's=abc; echo "${s:0:{{KEY}}}"',
1093+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1094+
's=abc; echo "${s: -1:{{KEY}}}"',
1095+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1096+
'set -- a b; echo "${@:{{KEY}}}"',
1097+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1098+
's=abc; printf "%s\\n" "${missing:-"${s:{{KEY}}}"}"',
1099+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1100+
'cat <<PAYLOAD\n${a[{{KEY}}]}\nPAYLOAD',
1101+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1102+
'cat <<PAYLOAD\n${s:{{KEY}}}\nPAYLOAD',
10561103
])('rejects shell placeholders whose values enter arithmetic: %s', async (code) => {
10571104
await expect(
10581105
compileCodePlaceholders({
@@ -1087,6 +1134,65 @@ describe('code placeholder compiler', () => {
10871134
)
10881135
})
10891136

1137+
it.each([
1138+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1139+
'printf "%s\\n" "${missing:-https://{{KEY}}}"',
1140+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1141+
'printf "%s\\n" "${missing:-items[{{KEY}}]}"',
1142+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1143+
's=abc; printf "%s\\n" "${s#[{{KEY}}]}"',
1144+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1145+
's=abc; printf "%s\\n" "${s/[{{KEY}}]/x}"',
1146+
'f() { local -i n; }; n="{{KEY}}"',
1147+
'PREFIX="$(printf "%s" "{{KEY}}")" let total=2',
1148+
])('compiles parameter and prefix text that is not an arithmetic operand: %s', async (code) => {
1149+
// These forms use the value as pattern, default, or a shielded prefix — never arithmetic — so a
1150+
// conservative scanner must not reject them. Each would fail compilation if wrongly rejected.
1151+
await expect(
1152+
compileCodePlaceholders({
1153+
code,
1154+
language: CodeLanguage.Shell,
1155+
environmentVariables: { KEY: 'values[$(printf injected >&2)]' },
1156+
})
1157+
).resolves.toBeDefined()
1158+
})
1159+
1160+
it('compiles shell placeholders beside arithmetic that never evaluates them', async () => {
1161+
const value = 'values[$(printf injected >&2)]'
1162+
const compiled = await compileCodePlaceholders({
1163+
code: [
1164+
'[ "{{KEY}}" -eq 0 ] 2>/dev/null || printf "%s\\n" not-zero',
1165+
'[[ "{{KEY}}" == values* && 1 -eq 1 ]] && printf "%s\\n" matched',
1166+
'let total=1+1; printf "%s\\n" "{{KEY}}"',
1167+
'f() { local copy="{{KEY}}"; printf "%s\\n" "$copy"; }; f',
1168+
'declare copy="{{KEY}}"; printf "%s\\n" "$copy"',
1169+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1170+
'printf "%s\\n" "${missing:-{{KEY}}}"',
1171+
// biome-ignore lint/suspicious/noTemplateCurlyInString: shell parameter expansion, not a JS template
1172+
'a=(x y); printf "%s\\n" "${a[1]}{{KEY}}"',
1173+
'printf "%s\\n" "let {{KEY}}"',
1174+
'printf "%s\\n" "items[{{KEY}}]"',
1175+
'PREFIX="{{KEY}}" let total=2',
1176+
'# declare -i n',
1177+
'n="{{KEY}}"; printf "%s\\n" "$n"',
1178+
'let total=1 <<EOF',
1179+
'{{KEY}}',
1180+
'EOF',
1181+
'printf "%s\\n" "$total"',
1182+
'cat <<PAYLOAD',
1183+
'{{KEY}} $(( 1 + 1 ))',
1184+
'PAYLOAD',
1185+
].join('\n'),
1186+
language: CodeLanguage.Shell,
1187+
environmentVariables: { KEY: value },
1188+
})
1189+
1190+
expect(executeShell(`{\n${compiled.code}\n} 2>&1`, compiled.bindings)).toBe(
1191+
`not-zero\nmatched\n${value}\n${value}\n${value}\n${value}\ny${value}\n` +
1192+
`let ${value}\nitems[${value}]\n${value}\n1\n${value} 2\n`
1193+
)
1194+
})
1195+
10901196
it('discovers shell arithmetic placeholders without compiling missing values', async () => {
10911197
const code = 'total=$(( {{MISSING}} + {{KEY}} ))'
10921198
await expect(analyzeCodePlaceholders(code, CodeLanguage.Shell)).resolves.toEqual([

‎apps/sim/lib/execution/code-placeholders/shared.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,12 @@ export function createOffsetRangeLookup(
327327
* The placeholders lying wholly inside `[start, end]`. Occurrences are ordered and never
328328
* overlap, so the matches are one contiguous run found by bisection.
329329
*/
330-
export function occurrencesWithin(
331-
occurrences: readonly CodePlaceholderOccurrence[],
330+
export function occurrencesWithin<T extends Pick<CodePlaceholderOccurrence, 'start' | 'end'>>(
331+
occurrences: readonly T[],
332332
start: number,
333333
end: number
334-
): CodePlaceholderOccurrence[] {
335-
const matches: CodePlaceholderOccurrence[] = []
334+
): T[] {
335+
const matches: T[] = []
336336
for (
337337
let index = partitionPoint(occurrences, (occurrence) => occurrence.start < start);
338338
index < occurrences.length && occurrences[index].end <= end;

0 commit comments

Comments
 (0)