Skip to content

Commit 6fbce95

Browse files
authored
fix: prevent script injection in workflows (release/v0.2.x) (#617)
Move github.event references to env vars to prevent script injection vulnerabilities in run steps. This change follows the same pattern as the main branch fix. By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
1 parent 23196f3 commit 6fbce95

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/post_release_version_bump.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
required: true
99

1010
env:
11+
VERSION: ${{ github.event.inputs.version }}
1112
AWS_DEFAULT_REGION: us-east-1
1213

1314
permissions:
@@ -96,9 +97,9 @@ jobs:
9697
9798
- name: Update version to next development version in main
9899
run: |
99-
DEV_VERSION="${{ github.event.inputs.version }}.dev0"
100+
DEV_VERSION="${{ env.VERSION }}.dev0"
100101
sed -i 's/__version__ = ".*"/__version__ = "'$DEV_VERSION'"/' aws-opentelemetry-distro/src/amazon/opentelemetry/distro/version.py
101-
VERSION="${{ github.event.inputs.version }}"
102+
VERSION="${{ env.VERSION }}"
102103
sed -i 's/python:v.*"/python:v'$VERSION'"/' .github/workflows/daily_scan.yml
103104
git add aws-opentelemetry-distro/src/amazon/opentelemetry/distro/version.py
104105
git add .github/workflows/daily_scan.yml
@@ -109,7 +110,7 @@ jobs:
109110
env:
110111
GITHUB_TOKEN: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}
111112
run: |
112-
DEV_VERSION="${{ github.event.inputs.version }}.dev0"
113+
DEV_VERSION="${{ env.VERSION }}.dev0"
113114
gh pr create --title "Post release $VERSION: Update version to $DEV_VERSION" \
114115
--body "This PR prepares the main branch for the next development cycle by updating the version to $DEV_VERSION and updating the image version to be scanned to the latest released.
115116

.github/workflows/pre_release_prepare.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
default: 'false'
1313

1414
env:
15+
VERSION: ${{ github.event.inputs.version }}
16+
IS_PATCH: ${{ github.event.inputs.is_patch }}
1517
AWS_DEFAULT_REGION: us-east-1
1618

1719
permissions:
@@ -56,7 +58,7 @@ jobs:
5658
5759
- name: Create branches
5860
run: |
59-
IS_PATCH=${{ github.event.inputs.is_patch }}
61+
IS_PATCH=${{ env.IS_PATCH }}
6062
if [[ "$IS_PATCH" != "true" && "$IS_PATCH" != "false" ]]; then
6163
echo "Invalid input for IS_PATCH. Must be 'true' or 'false'."
6264
exit 1
@@ -102,5 +104,5 @@ jobs:
102104
--body "This PR updates the version to ${VERSION}.
103105
104106
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice." \
105-
--head v${{ github.event.inputs.version }}_release \
107+
--head v${{ env.VERSION }}_release \
106108
--base release/v${MAJOR_MINOR}.x

.github/workflows/release_build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
required: true
88

99
env:
10+
VERSION: ${{ github.event.inputs.version }}
1011
AWS_DEFAULT_REGION: us-east-1
1112
AWS_PUBLIC_ECR_REGION: us-east-1
1213
AWS_PRIVATE_ECR_REGION: us-west-2
@@ -88,15 +89,15 @@ jobs:
8889
TWINE_USERNAME: '__token__'
8990
TWINE_PASSWORD: ${{ env.TEST_PYPI_TOKEN_API_TOKEN }}
9091
run: |
91-
twine upload --repository testpypi --skip-existing --verbose dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl
92+
twine upload --repository testpypi --skip-existing --verbose dist/aws_opentelemetry_distro-${{ env.VERSION }}-py3-none-any.whl
9293
9394
# Publish to prod PyPI
9495
- name: Publish to PyPI
9596
env:
9697
TWINE_USERNAME: '__token__'
9798
TWINE_PASSWORD: ${{ env.PROD_PYPI_TOKEN_API_TOKEN }}
9899
run: |
99-
twine upload --skip-existing --verbose dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl
100+
twine upload --skip-existing --verbose dist/aws_opentelemetry_distro-${{ env.VERSION }}-py3-none-any.whl
100101
101102
# Publish to public ECR
102103
- name: Build and push public ECR image
@@ -107,7 +108,7 @@ jobs:
107108
file: ./Dockerfile
108109
platforms: linux/amd64,linux/arm64
109110
tags: |
110-
${{ env.RELEASE_PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
111+
${{ env.RELEASE_PUBLIC_REPOSITORY }}:v${{ env.VERSION }}
111112
112113
# Publish to private ECR
113114
- name: Build and push private ECR image
@@ -118,7 +119,7 @@ jobs:
118119
file: ./Dockerfile
119120
platforms: linux/amd64,linux/arm64
120121
tags: |
121-
${{ env.RELEASE_PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
122+
${{ env.RELEASE_PRIVATE_REPOSITORY }}:v${{ env.VERSION }}
122123
123124
# Publish to GitHub releases
124125
- name: Create GH release
@@ -127,7 +128,7 @@ jobs:
127128
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
128129
run: |
129130
gh release create --target "$GITHUB_REF_NAME" \
130-
--title "Release v${{ github.event.inputs.version }}" \
131+
--title "Release v${{ env.VERSION }}" \
131132
--draft \
132-
"v${{ github.event.inputs.version }}" \
133-
dist/aws_opentelemetry_distro-${{ github.event.inputs.version }}-py3-none-any.whl
133+
"v${{ env.VERSION }}" \
134+
dist/aws_opentelemetry_distro-${{ env.VERSION }}-py3-none-any.whl

0 commit comments

Comments
 (0)