From 1bd88779dda04e67b79ca90606092498f0abec96 Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Tue, 11 Nov 2025 16:19:58 -0500 Subject: [PATCH 1/7] Add format check to branch name --- .github/workflows/measure-disk-usage.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index 7d8ec3ea52a63..9a44af2e288e6 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -37,16 +37,23 @@ jobs: - name: Define command id: cmd + env: + HEAD_SHA: ${{ github.event.workflow_run.head_sha }} + EVENT_NAME: ${{ github.event.workflow_run.event }} + HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} run: | - cmd="ddev -v size status \ - --commit ${{ github.event.workflow_run.head_sha }} \ - --format json" + if ! [[ $HEAD_BRANCH =~ ^[A-Za-z0-9._/-]+$ ]]; then + echo "Branch name contains invalid characters. Exiting." + exit 1 + fi - if [ "${{ github.event.workflow_run.event }}" = "push" ] && [ "${{ github.event.workflow_run.head_branch }}" = "master" ]; then + cmd="ddev -v size status --commit \"$HEAD_SHA\" --format json" + + if [ "$EVENT_NAME" = "push" ] && [ "$HEAD_BRANCH" = "master" ]; then cmd="$cmd --to-dd-key ${{ secrets.DD_API_KEY }}" fi - echo "cmd=$cmd" >> $GITHUB_OUTPUT + - name: Measure disk usage (Uncompressed) env: From 0f59a16db6f77c8eda94f1b0b6c5ef80a8572cc4 Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Wed, 12 Nov 2025 08:31:03 -0500 Subject: [PATCH 2/7] test workflow --- .github/workflows/measure-disk-usage.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index 9a44af2e288e6..68c7bb87d0d28 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -1,11 +1,14 @@ name: Measure Disk Usage -run-name: "Measure Disk Usage [${{ github.event.workflow_run.head_sha }}]" +run-name: "Measure Disk Usage [${{ github.event.pull_request.head.sha }}]" on: - workflow_run: - workflows: ['Resolve Dependencies and Build Wheels'] - types: - - completed + pull_request: + branches: + - master + # workflow_run: + # workflows: ['Resolve Dependencies and Build Wheels'] + # types: + # - completed env: PYTHON_VERSION: "3.13" @@ -38,8 +41,8 @@ jobs: - name: Define command id: cmd env: - HEAD_SHA: ${{ github.event.workflow_run.head_sha }} - EVENT_NAME: ${{ github.event.workflow_run.event }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + EVENT_NAME: ${{ github.event.pull_request. }} HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} run: | if ! [[ $HEAD_BRANCH =~ ^[A-Za-z0-9._/-]+$ ]]; then From 444a4c7afd84d894abf1ee035bbe78f1e57d8765 Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Wed, 12 Nov 2025 08:37:15 -0500 Subject: [PATCH 3/7] test --- .github/workflows/measure-disk-usage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index 68c7bb87d0d28..a12828112b52b 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -3,12 +3,12 @@ run-name: "Measure Disk Usage [${{ github.event.pull_request.head.sha }}]" on: pull_request: - branches: + branches: - master # workflow_run: # workflows: ['Resolve Dependencies and Build Wheels'] # types: - # - completed + # - completed env: PYTHON_VERSION: "3.13" @@ -42,8 +42,8 @@ jobs: id: cmd env: HEAD_SHA: ${{ github.event.pull_request.head.sha }} - EVENT_NAME: ${{ github.event.pull_request. }} - HEAD_BRANCH: ${{ github.event.workflow_run.head_branch }} + EVENT_NAME: ${{ github.event_name }} + HEAD_BRANCH: ${{ github.event.pull_request.head.ref }} run: | if ! [[ $HEAD_BRANCH =~ ^[A-Za-z0-9._/-]+$ ]]; then echo "Branch name contains invalid characters. Exiting." From 7472c27c6bd7a6b35d96683d93f20dfcc4f681b3 Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Wed, 12 Nov 2025 10:35:45 -0500 Subject: [PATCH 4/7] test malicious name --- .github/workflows/measure-disk-usage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index a12828112b52b..484d74ddd6535 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -43,7 +43,7 @@ jobs: env: HEAD_SHA: ${{ github.event.pull_request.head.sha }} EVENT_NAME: ${{ github.event_name }} - HEAD_BRANCH: ${{ github.event.pull_request.head.ref }} + HEAD_BRANCH: 'master"]; echo "pwned"; #' run: | if ! [[ $HEAD_BRANCH =~ ^[A-Za-z0-9._/-]+$ ]]; then echo "Branch name contains invalid characters. Exiting." From df8ef3873ccef0a3bce3d3245c1717162773c8c2 Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Wed, 12 Nov 2025 10:37:52 -0500 Subject: [PATCH 5/7] test malicious name --- .github/workflows/measure-disk-usage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index 484d74ddd6535..3d641a348d88b 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -45,10 +45,10 @@ jobs: EVENT_NAME: ${{ github.event_name }} HEAD_BRANCH: 'master"]; echo "pwned"; #' run: | - if ! [[ $HEAD_BRANCH =~ ^[A-Za-z0-9._/-]+$ ]]; then - echo "Branch name contains invalid characters. Exiting." - exit 1 - fi + # if ! [[ $HEAD_BRANCH =~ ^[A-Za-z0-9._/-]+$ ]]; then + # echo "Branch name contains invalid characters. Exiting." + # exit 1 + # fi cmd="ddev -v size status --commit \"$HEAD_SHA\" --format json" From 0bc159b6740913769e1c18b874b7be94c4082b0e Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Wed, 12 Nov 2025 10:40:34 -0500 Subject: [PATCH 6/7] test malicious name --- .github/workflows/measure-disk-usage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index 3d641a348d88b..4fe6e6716de17 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -51,10 +51,11 @@ jobs: # fi cmd="ddev -v size status --commit \"$HEAD_SHA\" --format json" - + echo "Pre-injection" if [ "$EVENT_NAME" = "push" ] && [ "$HEAD_BRANCH" = "master" ]; then cmd="$cmd --to-dd-key ${{ secrets.DD_API_KEY }}" fi + echo "Post-injection" echo "cmd=$cmd" >> $GITHUB_OUTPUT From 02740acc72a1573167192a181ff2a1faa561d171 Mon Sep 17 00:00:00 2001 From: Lucia Sanchez Bella Date: Thu, 13 Nov 2025 12:24:19 -0500 Subject: [PATCH 7/7] Test naming the workflow --- .github/workflows/measure-disk-usage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/measure-disk-usage.yml b/.github/workflows/measure-disk-usage.yml index 4fe6e6716de17..19c37b2ebadee 100644 --- a/.github/workflows/measure-disk-usage.yml +++ b/.github/workflows/measure-disk-usage.yml @@ -15,6 +15,7 @@ env: jobs: measure-disk-usage: + name: Other Name runs-on: ubuntu-22.04 permissions: contents: read