-
Notifications
You must be signed in to change notification settings - Fork 127
CSPL-4372: Enable triggering workflows from forks #1654
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
kubabuczak
wants to merge
23
commits into
develop
Choose a base branch
from
CSPL-4372-add-approval-gate-exec-in-target
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
65349ba
CSPL-4372: Add approval gate workflow and integrate into existing Git…
kubabuczak c9ac960
CSPL-4372: Update GitHub Actions to use checkout@v6 with merge commit…
kubabuczak e97904a
Potential fix for code scanning alert no. 183: Workflow does not cont…
kubabuczak 10ae2ca
Update GitHub Actions workflows to use actions/checkout@v4 for consis…
kubabuczak 60c7d46
Update GitHub Actions workflows to specify branches for pull_request_…
kubabuczak e8c5c12
Update distroless build-test-push workflow to include branch filters …
kubabuczak ea7ff8e
Refactor distroless build-test-push workflow to trigger on pull_reque…
kubabuczak 09fd53b
Integrate approval gate into distroless build-test-push workflow
kubabuczak 0e5846c
Add debug output for pull request details in approval gate workflow
kubabuczak be2ac54
Enhance approval gate workflow with detailed pull request JSON output
kubabuczak cba3ced
CSPL-4272 Update workflows to utilize commit SHA from approval gate a…
kubabuczak d1169a3
Potential fix for code scanning alert no. 222: Workflow does not cont…
kubabuczak 85f4c15
Add dependency on get-commit-info job in approval gate workflow
kubabuczak 3c29d08
Refactor build-test-push workflow by commenting out unit tests and re…
kubabuczak ae59ec1
Update distroless build-test-push workflow to trigger on specific bra…
kubabuczak 5be9f03
Enhance approval gate workflow with commit SHA and message retrieval
kubabuczak fa8ca1e
Add target checkout action for improved pull request handling
kubabuczak a557fd4
Add README for GitHub workflows and update workflow triggers
kubabuczak 4a2bfd8
Update workflows to replace target checkout action with actions/check…
kubabuczak 8f5effe
Implement checkout reference validation and enhance README documentation
kubabuczak 7979d7d
Remove target checkout action as it is no longer needed after replaci…
kubabuczak 47d6a20
Comment out branches-ignore in pull request triggers across workflows…
kubabuczak 7016522
Enhance approval gate workflow by removing redundant permissions
kubabuczak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # GitHub Workflows | ||
|
|
||
| ## PR Testing Strategy | ||
|
|
||
| ### Why Two Triggers? | ||
|
|
||
| GitHub's `pull_request` event doesn't expose secrets to fork PRs (for security). But we need secrets to run integration tests. The `pull_request_target` event does expose secrets—but it sets `GITHUB_SHA` to the **base branch**, not the PR. This means the default checkout gets the wrong code, and creates security risks if not handled carefully. | ||
|
|
||
| ### How We Handle It | ||
|
|
||
| | Trigger | Branch | Why | | ||
| |---------|--------|-----| | ||
| | `pull_request_target` | `develop` | Enables secrets for fork PRs; requires manual approval | | ||
| | `pull_request` | All except `develop` | Standard trigger for trusted maintainers | | ||
|
|
||
| ### Security Requirements | ||
|
|
||
| 1. **Always use `approval-gate.yml`** as a dependency for jobs needing secrets | ||
| 2. **Always specify `with.ref`** on all `actions/checkout` steps (enforced by `lint-workflows.yml`) | ||
| 3. **Always pass the approval gate's `commit-sha`** to prevent testing unapproved code | ||
|
|
||
| ### Checkout Patterns | ||
|
|
||
| **For workflows using approval-gate** (recommended for `pull_request_target`): | ||
|
|
||
| ```yaml | ||
| jobs: | ||
| approval-gate: | ||
| uses: ./.github/workflows/approval-gate.yml | ||
|
|
||
| build: | ||
| needs: approval-gate | ||
| steps: | ||
| - uses: actions/checkout@v6 | ||
| with: | ||
| ref: ${{ needs.approval-gate.outputs.commit-sha }} | ||
| ``` | ||
|
|
||
| **For simpler workflows** (e.g., `pull_request` or `push` triggers): | ||
|
|
||
| ```yaml | ||
| # Preferred: Define ref once at workflow level, reuse in all jobs | ||
| env: | ||
| CHECKOUT_REF: ${{ github.ref }} | ||
| jobs: | ||
| build: | ||
| steps: | ||
| - uses: actions/checkout@v6 | ||
| with: | ||
| ref: ${{ env.CHECKOUT_REF }} | ||
| ``` | ||
|
|
||
| > ⚠️ Without these safeguards, a malicious commit could be added after approval but before execution. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| #!/usr/bin/env python3 | ||
| """ | ||
| Check that all actions/checkout usages have 'with.ref' specified. | ||
|
|
||
| This ensures consistent and explicit checkout behavior across all workflows. | ||
| """ | ||
|
|
||
| import sys | ||
| from pathlib import Path | ||
|
|
||
| import yaml | ||
|
|
||
|
|
||
| def check_workflow_file(filepath: Path) -> list[dict]: | ||
| """ | ||
| Check a workflow file for actions/checkout usages without 'with.ref'. | ||
|
|
||
| Returns a list of violations. | ||
| """ | ||
| violations = [] | ||
|
|
||
| with open(filepath, "r") as f: | ||
| try: | ||
| data = yaml.safe_load(f) | ||
| except yaml.YAMLError as e: | ||
| print(f"Warning: Failed to parse {filepath}: {e}") | ||
| return [] | ||
|
|
||
| if not data or "jobs" not in data: | ||
| return [] | ||
|
|
||
| for job_name, job in data["jobs"].items(): | ||
| steps = job.get("steps", []) | ||
| for i, step in enumerate(steps): | ||
| uses = step.get("uses", "") | ||
| if "actions/checkout" in uses: | ||
| with_block = step.get("with", {}) | ||
| has_ref = isinstance(with_block, dict) and "ref" in with_block | ||
|
|
||
| if not has_ref: | ||
| violations.append({ | ||
| "file": str(filepath), | ||
| "job": job_name, | ||
| "step": i, | ||
| "uses": uses, | ||
| }) | ||
|
|
||
| return violations | ||
|
|
||
|
|
||
| def main(): | ||
| workflows_dir = Path(".github/workflows") | ||
|
|
||
| if not workflows_dir.exists(): | ||
| print("Error: .github/workflows directory not found") | ||
| sys.exit(1) | ||
|
|
||
| all_violations = [] | ||
|
|
||
| for pattern in ("*.yml", "*.yaml"): | ||
| for workflow_file in sorted(workflows_dir.glob(pattern)): | ||
| all_violations.extend(check_workflow_file(workflow_file)) | ||
|
|
||
| if all_violations: | ||
| print("❌ Found actions/checkout usages without 'with.ref' specified:\n") | ||
| for v in all_violations: | ||
| print(f" {v['file']}") | ||
| print(f" Job: {v['job']}, Step: {v['step']}") | ||
| print(f" Uses: {v['uses']}\n") | ||
| print(f"Total violations: {len(all_violations)}") | ||
| print("\nAll actions/checkout steps should specify 'with.ref' to ensure") | ||
| print("consistent and explicit checkout behavior.") | ||
| print("\nSee .github/README.md for security requirements and examples.") | ||
| sys.exit(1) | ||
| else: | ||
| print("✅ All actions/checkout usages have 'with.ref' specified") | ||
| sys.exit(0) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| name: Approval Gate | ||
| permissions: | ||
| contents: read | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| environment-name: | ||
| description: 'Environment name for approval' | ||
| required: false | ||
| type: string | ||
| default: 'external-contributor-approval' | ||
| outputs: | ||
| commit-sha: | ||
| description: 'The commit SHA (PR head for PRs, pushed commit for push events)' | ||
| value: ${{ jobs.get-commit-info.outputs.commit-sha }} | ||
| commit-message: | ||
| description: 'The commit message' | ||
| value: ${{ jobs.get-commit-info.outputs.commit-message }} | ||
|
|
||
| jobs: | ||
| # Get commit info from the PR head (not the base branch). | ||
| # This is necessary because with 'pull_request_target', GITHUB_SHA and the default | ||
| # checkout point to the BASE branch, not the PR's code. We explicitly use | ||
| # 'github.event.pull_request.head.sha' to get the actual PR commit info. | ||
| # For 'push' events, we fall back to 'github.sha' (the pushed commit). | ||
| get-commit-info: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| commit-sha: ${{ steps.get-sha.outputs.commit_sha }} | ||
| commit-message: ${{ steps.get-message.outputs.commit_message }} | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v6 | ||
| with: | ||
| ref: ${{ github.event.pull_request.head.sha || github.sha }} | ||
| - name: Get commit SHA | ||
| id: get-sha | ||
| run: | | ||
| COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}" | ||
| echo "commit_sha=${COMMIT_SHA}" >> $GITHUB_OUTPUT | ||
| echo "Commit SHA: ${COMMIT_SHA}" | ||
| - name: Get commit message | ||
| id: get-message | ||
| run: | | ||
| COMMIT_MSG=$(git log -1 --pretty=%B) | ||
| echo "commit_message<<EOF" >> $GITHUB_OUTPUT | ||
| echo "$COMMIT_MSG" >> $GITHUB_OUTPUT | ||
| echo "EOF" >> $GITHUB_OUTPUT | ||
| echo "Commit message:" | ||
| echo "$COMMIT_MSG" | ||
| approval-gate: | ||
|
||
| needs: get-commit-info | ||
| runs-on: ubuntu-latest | ||
| environment: ${{ | ||
| (github.event_name == 'pull_request_target' && | ||
| !contains(fromJSON('["MEMBER", "OWNER", "COLLABORATOR"]'), github.event.pull_request.author_association)) | ||
| && inputs.environment-name | ||
| || '' | ||
| }} | ||
| steps: | ||
| - name: Approval status | ||
| run: | | ||
| echo "Event: ${{ github.event_name }}" | ||
| echo "Author association: ${{ github.event.pull_request.author_association }}" | ||
| echo "Approval granted or not required" | ||
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.