From 65f634fe9d3a815b43c711d7707651ed4fc7c624 Mon Sep 17 00:00:00 2001 From: Jordan Kasper <30059011+jordangov@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:04:18 -0400 Subject: [PATCH 01/26] Added myself to the hero list --- open-source-heros.md | 1 + 1 file changed, 1 insertion(+) diff --git a/open-source-heros.md b/open-source-heros.md index 8c56228..1ecdd63 100644 --- a/open-source-heros.md +++ b/open-source-heros.md @@ -12,3 +12,4 @@ This is the list of heros. Add your name to the list below with your GitHub hand ## The List * @whitehouse 7e2aac5579f5e3fb61c2ba63f95cfb7a87cb3da8 +* @jordangov 6119660cad1e64ddc93cde48e2d617e3cc00071e From 7f86bd5a01791a390963e53bae6baf4965cb7803 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 15:34:13 -0400 Subject: [PATCH 02/26] added calculation of submission and checksum --- .github/workflows/hero-check.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 55d6867..a292ef2 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -15,7 +15,10 @@ jobs: repository: jordangov/defcon-poc # token needss to be able read repo contents, write to PRs, and read secrets token: ${{secrets.GH_TOKEN}} + # fetch-depth: 0 - name: Run script run: | - echo "user: ${{github.actor}}" - echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} + SUBMISSION=`git diff main | awk '/${{github.actor}}/{ print $3 }'` + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` + echo "Confirming submission: $SUBMISSION" + echo " equals checksum: $CHECKSUM" From 5ca6404b804c449d99a82866b4076933c079274a Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 15:39:17 -0400 Subject: [PATCH 03/26] adding fetch depth to compare with main --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index a292ef2..c90a046 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -15,7 +15,7 @@ jobs: repository: jordangov/defcon-poc # token needss to be able read repo contents, write to PRs, and read secrets token: ${{secrets.GH_TOKEN}} - # fetch-depth: 0 + fetch-depth: 0 - name: Run script run: | SUBMISSION=`git diff main | awk '/${{github.actor}}/{ print $3 }'` From 840e653e27f9677f4bc7189337e013668f5412ba Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 15:43:35 -0400 Subject: [PATCH 04/26] go to head before doiing diff --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index c90a046..7b49505 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - name: Run script run: | - SUBMISSION=`git diff main | awk '/${{github.actor}}/{ print $3 }'` + SUBMISSION=`git checkout HEAD > /dev/null && git diff main | awk '/\* @${{github.actor}}/{ print $3 }'` CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` echo "Confirming submission: $SUBMISSION" echo " equals checksum: $CHECKSUM" From 6a85aa50366104bc8b2dde3b5aef9b9e09631d86 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 15:49:06 -0400 Subject: [PATCH 05/26] fetch main from origin before diffing --- .github/workflows/hero-check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 7b49505..ba6b10d 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -18,7 +18,8 @@ jobs: fetch-depth: 0 - name: Run script run: | - SUBMISSION=`git checkout HEAD > /dev/null && git diff main | awk '/\* @${{github.actor}}/{ print $3 }'` + git fetch origin main + SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'` CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` echo "Confirming submission: $SUBMISSION" echo " equals checksum: $CHECKSUM" From 3cc371dc04644f9bd8af4e472f959f3b5d55758a Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 15:56:49 -0400 Subject: [PATCH 06/26] extract only checksum and conpare results with message --- .github/workflows/hero-check.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index ba6b10d..a053b6f 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,6 +20,7 @@ jobs: run: | git fetch origin main SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'` - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` - echo "Confirming submission: $SUBMISSION" - echo " equals checksum: $CHECKSUM" + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` | awk '/[a-z0-9]+/{ print $2 }' + echo "Confirming submission ($SUBMISSION) equals checksum..." + echo "checksum: $CHECKSUM" + if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; else echo "Try again!"; fi From 91063caffee63244206faff6fabbf054ba348e35 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:00:59 -0400 Subject: [PATCH 07/26] checksum needs work, and addign pipeline failure --- .github/workflows/hero-check.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index a053b6f..2de9e1f 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -17,10 +17,15 @@ jobs: token: ${{secrets.GH_TOKEN}} fetch-depth: 0 - name: Run script - run: | - git fetch origin main - SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'` - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` | awk '/[a-z0-9]+/{ print $2 }' - echo "Confirming submission ($SUBMISSION) equals checksum..." - echo "checksum: $CHECKSUM" - if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; else echo "Try again!"; fi + run: >- + git fetch origin main; + SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}`; + echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; + if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then + echo "You are an open source hero!"; + exit 0; + else + echo "Try again!"; + exit 1; + fi From 58351f5917cfa4072298cb053d1adb5d18e75314 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:03:25 -0400 Subject: [PATCH 08/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 2de9e1f..c80b36b 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,7 +20,7 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}`; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` | awk '/[a-z0-9]+/{ print $2 }'; echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From e22807d6617247964a0aa2d996adb46211091fb4 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:04:53 -0400 Subject: [PATCH 09/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index c80b36b..8a4d9c1 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,7 +20,7 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` | awk '/[a-z0-9]+/{ print $2 }'; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` | awk '/[a-z0-9]+/{ print $0 }'; echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From 96120f2042f6ff7c78a242fa5fba3489010dde1b Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:08:58 -0400 Subject: [PATCH 10/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 8a4d9c1..dec51a6 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,7 +20,7 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}` | awk '/[a-z0-9]+/{ print $0 }'; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt` | cat c.txt; echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From 66f5831521a20add0999ea88e202bf9d502c89f1 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:10:01 -0400 Subject: [PATCH 11/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index dec51a6..78cc8df 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,7 +20,7 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt` | cat c.txt; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt` && cat c.txt; echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From 7cd3a968a9599e8d297dbb2070ece6640d3fb553 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:11:35 -0400 Subject: [PATCH 12/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 78cc8df..ba29c9c 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,7 +20,7 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt` && cat c.txt; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt && cat c.txt;` echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From f0c5da633d1d5a1f3f3d4ff95bd7f7374f170012 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:14:38 -0400 Subject: [PATCH 13/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index ba29c9c..a0e1d1d 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -20,7 +20,9 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt && cat c.txt;` + echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt; + cat c.txt; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt && cat c.txt;`; echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From 94cee4a20412fcca39930db3181f74153baa378f Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:26:39 -0400 Subject: [PATCH 14/26] trying to resolve the checksum parsing --- .github/workflows/hero-check.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index a0e1d1d..b16c953 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -5,7 +5,7 @@ on: branches: [ "main" ] jobs: - test: + check for hero: runs-on: ubuntu-latest permissions: pull-requests: write @@ -20,9 +20,8 @@ jobs: run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; - echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt; - cat c.txt; - CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} -out c.txt && cat c.txt;`; + echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}; + CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} | awk '/[a-z0-9]+/{ print $2 }'`; echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "You are an open source hero!"; From 214b570ff3b918ead02ea0306a2773d0059ab60b Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:30:35 -0400 Subject: [PATCH 15/26] fixed job name --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index b16c953..4fbf785 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -5,7 +5,7 @@ on: branches: [ "main" ] jobs: - check for hero: + check-for-hero: runs-on: ubuntu-latest permissions: pull-requests: write From 9383197ecf0950aac0a44dc66cc5b48e340437c0 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:49:03 -0400 Subject: [PATCH 16/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 4fbf785..c3cdaf9 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -10,23 +10,40 @@ jobs: permissions: pull-requests: write steps: - - uses: actions/checkout@v4 + - name: Checkout Code + uses: actions/checkout@v4 with: repository: jordangov/defcon-poc # token needss to be able read repo contents, write to PRs, and read secrets token: ${{secrets.GH_TOKEN}} fetch-depth: 0 - - name: Run script + - name: Check Submission + id: check_sub run: >- git fetch origin main; SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}; CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} | awk '/[a-z0-9]+/{ print $2 }'`; - echo "Confirming submission ($SUBMISSION) equals checksum ($CHECKSUM)..."; + echo "Confirming submission ($SUBMISSION) equals checksum..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then - echo "You are an open source hero!"; - exit 0; + echo "RESULT=pass" >> "$GITHUB_OUTPUT"; + echo "MESSAGE=🤩 Wow, you're an open source hero! Find a volunteer with the special White House badge to claim your fame!" >> "$GITHUB_OUTPUT"; else - echo "Try again!"; - exit 1; + echo "RESULT=fail" >> "$GITHUB_OUTPUT"; + echo "MESSAGE=😔 Sorry, but that's not the right hash. Have you found all of the clues?" >> "$GITHUB_OUTPUT"; fi + - name: Post Message + uses: actions/github-script@v7 + with: + script: | + github.rest.issues.createComment({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: '${{ steps.check_sub.outputs.MESSAGE }}' + }) + - name: End Job + env: + RESULT: ${{ steps.check_sub.outputs.RESULT }} + run: >- + if [[ "$RESULT" = "pass" ]]; then exit 0; else exit 1; fi From 96861d5ad172ab549df8892affdad5dbee98da31 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:56:14 -0400 Subject: [PATCH 17/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index c3cdaf9..fbac6eb 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -26,12 +26,19 @@ jobs: CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} | awk '/[a-z0-9]+/{ print $2 }'`; echo "Confirming submission ($SUBMISSION) equals checksum..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then - echo "RESULT=pass" >> "$GITHUB_OUTPUT"; - echo "MESSAGE=🤩 Wow, you're an open source hero! Find a volunteer with the special White House badge to claim your fame!" >> "$GITHUB_OUTPUT"; + echo "Submissions match, they're an open source hero!" + echo "RESULT='pass'" >> "$GITHUB_OUTPUT"; + echo "MESSAGE='🤩 Wow, you're an open source hero! Find a volunteer with the special White House badge to claim your fame!'" >> "$GITHUB_OUTPUT"; else - echo "RESULT=fail" >> "$GITHUB_OUTPUT"; - echo "MESSAGE=😔 Sorry, but that's not the right hash. Have you found all of the clues?" >> "$GITHUB_OUTPUT"; + echo "Submissions do not match, need to try again." + echo "RESULT='fail'" >> "$GITHUB_OUTPUT"; + echo "MESSAGE='😔 Sorry, but that's not the right hash. Have you found all of the clues?'" >> "$GITHUB_OUTPUT"; fi + - name: Test Message + env: + MESSAGE: ${{ steps.check_sub.outputs.MESSAGE }} + run: | + echo $MESSAGE - name: Post Message uses: actions/github-script@v7 with: @@ -40,7 +47,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: '${{ steps.check_sub.outputs.MESSAGE }}' + body: 'test message' }) - name: End Job env: From 53ab0a3f09a95da89864976fe71138aacd23b381 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 16:59:08 -0400 Subject: [PATCH 18/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index fbac6eb..257c922 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -47,10 +47,14 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: 'test message' + body: steps.check_sub.outputs.MESSAGE }) - name: End Job env: RESULT: ${{ steps.check_sub.outputs.RESULT }} run: >- - if [[ "$RESULT" = "pass" ]]; then exit 0; else exit 1; fi + if [[ "$RESULT" = "pass" ]]; then + exit 0; + else + exit 1; + fi From b09f72021ff4df2d04f3f1bd3d2fa7ffe8961bb9 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:00:22 -0400 Subject: [PATCH 19/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 257c922..fae2537 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -47,7 +47,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: steps.check_sub.outputs.MESSAGE + body: '${{ steps.check_sub.outputs.MESSAGE }}' }) - name: End Job env: From 2a669889fbbcfb9467fba0a1f562f6082921b697 Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:01:31 -0400 Subject: [PATCH 20/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index fae2537..1fddb95 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -47,7 +47,7 @@ jobs: issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, - body: '${{ steps.check_sub.outputs.MESSAGE }}' + body: ${{ steps.check_sub.outputs.MESSAGE }} }) - name: End Job env: From 2ce9bec4d5f8755a803bf490bd41fbaf704352da Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:02:28 -0400 Subject: [PATCH 21/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index 1fddb95..f3bccdc 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -28,11 +28,11 @@ jobs: if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "Submissions match, they're an open source hero!" echo "RESULT='pass'" >> "$GITHUB_OUTPUT"; - echo "MESSAGE='🤩 Wow, you're an open source hero! Find a volunteer with the special White House badge to claim your fame!'" >> "$GITHUB_OUTPUT"; + echo "MESSAGE='🤩 Wow, you are an open source hero! Find a volunteer with the special White House badge to claim your fame!'" >> "$GITHUB_OUTPUT"; else echo "Submissions do not match, need to try again." echo "RESULT='fail'" >> "$GITHUB_OUTPUT"; - echo "MESSAGE='😔 Sorry, but that's not the right hash. Have you found all of the clues?'" >> "$GITHUB_OUTPUT"; + echo "MESSAGE='😔 Sorry, but that is not the right hash. Have you found all of the clues?'" >> "$GITHUB_OUTPUT"; fi - name: Test Message env: From 8eccd68fb024df1d2ac1e73110ca6b767efbc7de Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:04:04 -0400 Subject: [PATCH 22/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index f3bccdc..eb01d4e 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -27,11 +27,11 @@ jobs: echo "Confirming submission ($SUBMISSION) equals checksum..."; if [[ "$SUBMISSION" = "$CHECKSUM" ]]; then echo "Submissions match, they're an open source hero!" - echo "RESULT='pass'" >> "$GITHUB_OUTPUT"; + echo "RESULT=pass" >> "$GITHUB_OUTPUT"; echo "MESSAGE='🤩 Wow, you are an open source hero! Find a volunteer with the special White House badge to claim your fame!'" >> "$GITHUB_OUTPUT"; else echo "Submissions do not match, need to try again." - echo "RESULT='fail'" >> "$GITHUB_OUTPUT"; + echo "RESULT=fail" >> "$GITHUB_OUTPUT"; echo "MESSAGE='😔 Sorry, but that is not the right hash. Have you found all of the clues?'" >> "$GITHUB_OUTPUT"; fi - name: Test Message @@ -53,6 +53,7 @@ jobs: env: RESULT: ${{ steps.check_sub.outputs.RESULT }} run: >- + echo "RESULT=$RESULT" if [[ "$RESULT" = "pass" ]]; then exit 0; else From 2ee06c6a872bd4919f332a853e6b742bbb0b8aad Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:05:01 -0400 Subject: [PATCH 23/26] testing posting a message to the PR --- .github/workflows/hero-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index eb01d4e..f7e63ab 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -53,7 +53,7 @@ jobs: env: RESULT: ${{ steps.check_sub.outputs.RESULT }} run: >- - echo "RESULT=$RESULT" + echo "RESULT=$RESULT"; if [[ "$RESULT" = "pass" ]]; then exit 0; else From 0a9eef40cb9855600d7107e096b4cf6e82691d7c Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:06:02 -0400 Subject: [PATCH 24/26] testing the negative condition --- open-source-heros.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-source-heros.md b/open-source-heros.md index 1ecdd63..d00339d 100644 --- a/open-source-heros.md +++ b/open-source-heros.md @@ -12,4 +12,4 @@ This is the list of heros. Add your name to the list below with your GitHub hand ## The List * @whitehouse 7e2aac5579f5e3fb61c2ba63f95cfb7a87cb3da8 -* @jordangov 6119660cad1e64ddc93cde48e2d617e3cc00071e +* @jordangov 6119660cad1e64ddc93cde48e2d617e3cc00071ezzz From ca1a7ada6481130928521b3a4e33d930f4daed5a Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:09:51 -0400 Subject: [PATCH 25/26] final touches for v1 --- .github/workflows/hero-check.yml | 5 ----- README.md | 2 ++ open-source-heros.md | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index f7e63ab..b887ab5 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -34,11 +34,6 @@ jobs: echo "RESULT=fail" >> "$GITHUB_OUTPUT"; echo "MESSAGE='😔 Sorry, but that is not the right hash. Have you found all of the clues?'" >> "$GITHUB_OUTPUT"; fi - - name: Test Message - env: - MESSAGE: ${{ steps.check_sub.outputs.MESSAGE }} - run: | - echo $MESSAGE - name: Post Message uses: actions/github-script@v7 with: diff --git a/README.md b/README.md index 0b85800..c967f15 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # DEF CON 32 Open Source Heros > This repo is a **proof of concept** for the Open Source Hero Badge at DEF CON 32. +> +> Check out the [open-source-heros.md](open-source-heros.md) file for instructions. \ No newline at end of file diff --git a/open-source-heros.md b/open-source-heros.md index d00339d..1ecdd63 100644 --- a/open-source-heros.md +++ b/open-source-heros.md @@ -12,4 +12,4 @@ This is the list of heros. Add your name to the list below with your GitHub hand ## The List * @whitehouse 7e2aac5579f5e3fb61c2ba63f95cfb7a87cb3da8 -* @jordangov 6119660cad1e64ddc93cde48e2d617e3cc00071ezzz +* @jordangov 6119660cad1e64ddc93cde48e2d617e3cc00071e From 2f20b9a866fa3f939a02a78cf3dbec532e5e484b Mon Sep 17 00:00:00 2001 From: Jordan Kasper Date: Tue, 2 Jul 2024 17:13:28 -0400 Subject: [PATCH 26/26] fixing typo --- .github/workflows/hero-check.yml | 2 +- README.md | 4 ++-- open-source-heros.md => open-source-heroes.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename open-source-heros.md => open-source-heroes.md (81%) diff --git a/.github/workflows/hero-check.yml b/.github/workflows/hero-check.yml index b887ab5..7c81ff6 100644 --- a/.github/workflows/hero-check.yml +++ b/.github/workflows/hero-check.yml @@ -21,7 +21,7 @@ jobs: id: check_sub run: >- git fetch origin main; - SUBMISSION=`git diff origin/main..HEAD open-source-heros.md | awk '/\* @${{github.actor}}/{ print $3 }'`; + SUBMISSION=`git diff origin/main..HEAD open-source-heroes.md | awk '/\* @${{github.actor}}/{ print $3 }'`; echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}}; CHECKSUM=`echo -n "${{github.actor}}-${{secrets.SALT}}" | openssl dgst -${{secrets.ALGO}} | awk '/[a-z0-9]+/{ print $2 }'`; echo "Confirming submission ($SUBMISSION) equals checksum..."; diff --git a/README.md b/README.md index c967f15..e7cafc6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# DEF CON 32 Open Source Heros +# DEF CON 32 Open Source Heroes > This repo is a **proof of concept** for the Open Source Hero Badge at DEF CON 32. > -> Check out the [open-source-heros.md](open-source-heros.md) file for instructions. \ No newline at end of file +> Check out the [open-source-heroes.md](open-source-heroes.md) file for instructions. \ No newline at end of file diff --git a/open-source-heros.md b/open-source-heroes.md similarity index 81% rename from open-source-heros.md rename to open-source-heroes.md index 1ecdd63..374193f 100644 --- a/open-source-heros.md +++ b/open-source-heroes.md @@ -1,6 +1,6 @@ -# Open Source Heros +# Open Source Heroes -This is the list of heros. Add your name to the list below with your GitHub handle and the correct hash. +This is the list of heroes. Add your name to the list below with your GitHub handle and the correct hash. > **INSTRUCTIONS**: You must open a Pull Request to this repository, correctly adding your name to the list below along with the correct hash per the hints you have found elsewhere during DEF CON 32. >