From c2b14f1e72157697bb8700e9f6f377e0f90e4bb4 Mon Sep 17 00:00:00 2001
From: Spencer Schrock <sschrock@google.com>
Date: Fri, 15 Nov 2024 17:23:57 -0700
Subject: [PATCH] allow the ghcr image when finding scorecard job (#708)

---
 .../testdata/workflow-valid-e2e-ghcr.yml      | 69 +++++++++++++++++++
 app/server/verify_workflow.go                 |  3 +-
 app/server/verify_workflow_test.go            |  2 +
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 app/server/testdata/workflow-valid-e2e-ghcr.yml

diff --git a/app/server/testdata/workflow-valid-e2e-ghcr.yml b/app/server/testdata/workflow-valid-e2e-ghcr.yml
new file mode 100644
index 00000000..48f491db
--- /dev/null
+++ b/app/server/testdata/workflow-valid-e2e-ghcr.yml
@@ -0,0 +1,69 @@
+name: scorecard-golang
+on:
+  workflow_dispatch:
+  # Only the default branch is supported.
+  branch_protection_rule:
+  schedule:
+    - cron: '0 2 * * *'
+  push:
+    branches: [ main ]
+
+# Declare default permissions as read only.
+
+jobs:
+  scorecard-golang:
+    name: Scorecard Golang
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      actions: read
+      contents: read
+      id-token: write # needed for keyless signing
+    strategy:
+      max-parallel: 2
+      fail-fast: false
+      matrix:
+        results_format: [sarif, json, default]
+        publish_results: [false, true]
+        include:
+          - results_format: sarif
+            upload_result: true
+          - results_format: json
+            upload_result: false
+          - results_format: default
+            upload_result: false
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2.4.0
+        with:
+          persist-credentials: false
+      - name: "Run analysis"
+        id: scorecard-run
+        uses: docker://ghcr.io/ossf/scorecard-action:latest
+        with:
+          entrypoint: "/scorecard-action"
+          results_file: results.${{ matrix.results_format }}
+          results_format: ${{ matrix.results_format }}
+          # Read-only PAT token. To create it,
+          # follow the steps in https://github.com/ossf/scorecard-action#pat-token-creation.
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          # Publish the results to enable scorecard badges. For more details, see
+          # https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories, `publish_results` will automatically be set to `false`,
+          # regardless of the value entered here.
+          publish_results: ${{ matrix.publish_results }}
+      # Upload the results as artifacts (optional).
+      - name: "Upload artifact"
+        if: steps.scorecard-run.outcome == 'success'
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        with:
+          name: ${{ matrix.results_format }} file
+          path: results.${{ matrix.results_format }}
+          retention-days: 5
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        if: matrix.upload_result == true && steps.scorecard-run.outcome == 'success'
+        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
+        with:
+          sarif_file: results.sarif
diff --git a/app/server/verify_workflow.go b/app/server/verify_workflow.go
index aaa69692..8109881c 100644
--- a/app/server/verify_workflow.go
+++ b/app/server/verify_workflow.go
@@ -204,7 +204,8 @@ func findScorecardJob(jobs map[string]*actionlint.Job) *actionlint.Job {
 			}
 			stepName, _ := parseStep(stepUses.Value)
 			if stepName == "ossf/scorecard-action" ||
-				stepName == "gcr.io/openssf/scorecard-action" {
+				stepName == "gcr.io/openssf/scorecard-action" ||
+				stepName == "ghcr.io/ossf/scorecard-action" {
 				return job
 			}
 		}
diff --git a/app/server/verify_workflow_test.go b/app/server/verify_workflow_test.go
index 1607b131..156d03fe 100644
--- a/app/server/verify_workflow_test.go
+++ b/app/server/verify_workflow_test.go
@@ -50,6 +50,7 @@ func TestVerifyValidWorkflows(t *testing.T) {
 		"testdata/workflow-valid.yml",
 		"testdata/workflow-valid-noglobalperm.yml",
 		"testdata/workflow-valid-e2e.yml",
+		"testdata/workflow-valid-e2e-ghcr.yml",
 		"testdata/workflow-valid-tagged-action.yml",
 	}
 
@@ -173,6 +174,7 @@ func FuzzVerifyWorkflow(f *testing.F) {
 		"testdata/workflow-valid.yml",
 		"testdata/workflow-valid-noglobalperm.yml",
 		"testdata/workflow-valid-e2e.yml",
+		"testdata/workflow-valid-e2e-ghcr.yml",
 		"testdata/workflow-valid-tagged-action.yml",
 	}
 	for _, file := range testfiles {