Skip to content

Commit f8a302d

Browse files
committed
ci: avoid template expansion in native actions
Pass composite action inputs through environment variables before shell execution so zizmor does not treat arch and binary values as attacker-controllable template injection.
1 parent 0633676 commit f8a302d

4 files changed

Lines changed: 35 additions & 11 deletions

File tree

‎.github/actions/build-linux-native-package/action.yaml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,22 @@ runs:
1717

1818
- name: Build Linux static binary
1919
shell: bash
20+
env:
21+
NIX_GITHUB_TOKEN: ${{ inputs.nix-github-token }}
2022
run: |
21-
if [ "${{ inputs.nix-github-token }}" = "false" ]; then
23+
if [ "$NIX_GITHUB_TOKEN" = "false" ]; then
2224
NIX_CONFIG="access-tokens =" nix build .#ccusage-static
2325
else
2426
nix build .#ccusage-static
2527
fi
2628
2729
- name: Verify Linux binary is static
2830
shell: bash
31+
env:
32+
BINARY: ${{ inputs.binary }}
2933
run: |
30-
file "${{ inputs.binary }}"
31-
if ldd "${{ inputs.binary }}" > "$RUNNER_TEMP/ldd.txt" 2>&1; then
34+
file "$BINARY"
35+
if ldd "$BINARY" > "$RUNNER_TEMP/ldd.txt" 2>&1; then
3236
cat "$RUNNER_TEMP/ldd.txt"
3337
grep -Eiq 'not a dynamic executable|statically linked' "$RUNNER_TEMP/ldd.txt"
3438
else
@@ -38,11 +42,16 @@ runs:
3842
3943
- name: Stage native package
4044
shell: bash
41-
run: node apps/ccusage/scripts/stage-native-package.mjs --platform linux --arch "${{ inputs.arch }}" --binary "${{ inputs.binary }}"
45+
env:
46+
ARCH: ${{ inputs.arch }}
47+
BINARY: ${{ inputs.binary }}
48+
run: node apps/ccusage/scripts/stage-native-package.mjs --platform linux --arch "$ARCH" --binary "$BINARY"
4249

4350
- name: Archive native package binary
4451
shell: bash
45-
run: tar -cf "ccusage-native-linux-${{ inputs.arch }}.tar" "packages/ccusage-linux-${{ inputs.arch }}/bin"
52+
env:
53+
ARCH: ${{ inputs.arch }}
54+
run: tar -cf "ccusage-native-linux-$ARCH.tar" "packages/ccusage-linux-$ARCH/bin"
4655

4756
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4857
with:

‎.github/actions/build-macos-cargo-native-package/action.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ runs:
1616

1717
- name: Stage native package
1818
shell: bash
19-
run: node apps/ccusage/scripts/stage-native-package.mjs --platform darwin --arch "${{ inputs.arch }}" --binary "${{ inputs.binary }}"
19+
env:
20+
ARCH: ${{ inputs.arch }}
21+
BINARY: ${{ inputs.binary }}
22+
run: node apps/ccusage/scripts/stage-native-package.mjs --platform darwin --arch "$ARCH" --binary "$BINARY"
2023

2124
- name: Archive native package binary
2225
shell: bash
23-
run: tar -cf "ccusage-native-darwin-${{ inputs.arch }}.tar" "packages/ccusage-darwin-${{ inputs.arch }}/bin"
26+
env:
27+
ARCH: ${{ inputs.arch }}
28+
run: tar -cf "ccusage-native-darwin-$ARCH.tar" "packages/ccusage-darwin-$ARCH/bin"
2429

2530
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
2631
with:

‎.github/actions/build-macos-nix-native-package/action.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ runs:
1818

1919
- name: Stage native package
2020
shell: bash
21-
run: node apps/ccusage/scripts/stage-native-package.mjs --platform darwin --arch "${{ inputs.arch }}" --binary "${{ inputs.binary }}"
21+
env:
22+
ARCH: ${{ inputs.arch }}
23+
BINARY: ${{ inputs.binary }}
24+
run: node apps/ccusage/scripts/stage-native-package.mjs --platform darwin --arch "$ARCH" --binary "$BINARY"
2225

2326
- name: Archive native package binary
2427
shell: bash
25-
run: tar -cf "ccusage-native-darwin-${{ inputs.arch }}.tar" "packages/ccusage-darwin-${{ inputs.arch }}/bin"
28+
env:
29+
ARCH: ${{ inputs.arch }}
30+
run: tar -cf "ccusage-native-darwin-$ARCH.tar" "packages/ccusage-darwin-$ARCH/bin"
2631

2732
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
2833
with:

‎.github/actions/build-windows-native-package/action.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@ runs:
2020

2121
- name: Stage native package
2222
shell: bash
23-
run: node apps/ccusage/scripts/stage-native-package.mjs --platform win32 --arch "${{ inputs.arch }}" --binary "${{ inputs.binary }}"
23+
env:
24+
ARCH: ${{ inputs.arch }}
25+
BINARY: ${{ inputs.binary }}
26+
run: node apps/ccusage/scripts/stage-native-package.mjs --platform win32 --arch "$ARCH" --binary "$BINARY"
2427

2528
- name: Archive native package binary
2629
shell: bash
27-
run: tar -cf "ccusage-native-win32-${{ inputs.arch }}.tar" "packages/ccusage-win32-${{ inputs.arch }}/bin"
30+
env:
31+
ARCH: ${{ inputs.arch }}
32+
run: tar -cf "ccusage-native-win32-$ARCH.tar" "packages/ccusage-win32-$ARCH/bin"
2833

2934
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3035
with:

0 commit comments

Comments
 (0)