-
Notifications
You must be signed in to change notification settings - Fork 127
Harden CI: Artifactory OIDC, fork-aware workflows, composer.lock #253
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
Open
MichaelGHSeg
wants to merge
4
commits into
master
Choose a base branch
from
ci/harden-build-publish
base: master
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.
Open
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0cc60e3
Harden CI: Artifactory OIDC, fork-aware workflows, composer.lock
MichaelGHSeg 24e1c32
fix(ci): correct Artifactory OIDC provider name and exchange pattern
MichaelGHSeg 60329da
fix(ci): SHA-pin codecov/codecov-action per Semgrep recommendation
MichaelGHSeg d27ab0f
fix(ci): harden OIDC error redaction to cover all token fields
MichaelGHSeg 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,56 @@ | ||
| name: "Artifactory OIDC - PHP/Composer" | ||
| description: "Exchange GitHub OIDC token for Artifactory access and configure Composer to resolve through Artifactory" | ||
|
|
||
| inputs: | ||
| artifactory_url: | ||
| description: "Artifactory base URL (e.g. https://segment.jfrog.io)" | ||
| required: true | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Exchange OIDC token for Artifactory access token | ||
| id: oidc | ||
| shell: bash | ||
| env: | ||
| ARTIFACTORY_URL: ${{ inputs.artifactory_url }} | ||
| run: | | ||
| # Request OIDC token from GitHub | ||
| OIDC_TOKEN=$(curl -sS -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" \ | ||
| "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=jfrog-github" | jq -r '.value') | ||
|
|
||
| if [ -z "$OIDC_TOKEN" ] || [ "$OIDC_TOKEN" = "null" ]; then | ||
| echo "::error::Failed to obtain OIDC token" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Exchange OIDC token for Artifactory access token | ||
| ART_TOKEN=$(curl -sS -X POST \ | ||
| "$ARTIFACTORY_URL/access/api/v1/oidc/token" \ | ||
| -H "Content-Type: application/json" \ | ||
| -d "{\"grant_type\": \"urn:ietf:params:oauth:grant-type:token-exchange\", \"subject_token\": \"$OIDC_TOKEN\", \"subject_token_type\": \"urn:ietf:params:oauth:token-type:id_token\", \"provider_name\": \"github\"}" \ | ||
| | jq -r '.access_token') | ||
|
|
||
| if [ -z "$ART_TOKEN" ] || [ "$ART_TOKEN" = "null" ]; then | ||
| echo "::error::Failed to exchange OIDC token for Artifactory access token" | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "::add-mask::$ART_TOKEN" | ||
| echo "art_token=$ART_TOKEN" >> "$GITHUB_OUTPUT" | ||
|
|
||
| - name: Configure Composer to use Artifactory | ||
| shell: bash | ||
| env: | ||
| ART_TOKEN: ${{ steps.oidc.outputs.art_token }} | ||
| ARTIFACTORY_URL: ${{ inputs.artifactory_url }} | ||
| run: | | ||
| HOST=$(echo "$ARTIFACTORY_URL" | sed 's|https://||') | ||
|
|
||
| # Configure Composer to use the Artifactory Packagist mirror | ||
| composer config --global repositories.packagist composer "https://:${ART_TOKEN}@${HOST}/artifactory/api/composer/virtual-php-thirdparty" | ||
|
|
||
| # Disable the default packagist.org to force all resolution through Artifactory | ||
| composer config --global repositories.packagist.org false | ||
|
|
||
| echo "Composer configured to resolve packages through Artifactory" |
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,158 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: [master, main] | ||
| pull_request: | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| id-token: write | ||
| contents: read | ||
|
|
||
| env: | ||
| ARTIFACTORY_URL: ${{ vars.ARTIFACTORY_URL }} | ||
|
|
||
| jobs: | ||
| coding-standard: | ||
| name: Coding Standards | ||
| runs-on: ${{ github.event.pull_request.head.repo.fork && 'ubuntu-latest' || 'ubuntu-x64' }} | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
|
|
||
| - name: Set up PHP | ||
| uses: shivammathur/setup-php@cf4cade2721270509d5b1c766dad417c269cbb11 # v2 | ||
| with: | ||
| php-version: "8.2" | ||
| coverage: none | ||
| tools: cs2pr | ||
|
|
||
| - name: Configure Artifactory | ||
| if: ${{ !github.event.pull_request.head.repo.fork }} | ||
| uses: ./.github/actions/artifactory-oidc | ||
| with: | ||
| artifactory_url: ${{ vars.ARTIFACTORY_URL }} | ||
|
|
||
| - name: Install Composer dependencies | ||
| run: composer install --no-scripts --no-interaction --prefer-dist | ||
|
|
||
| - name: Check coding standards | ||
| continue-on-error: true | ||
| run: ./vendor/bin/phpcs -s --report-full --report-checkstyle=./phpcs-report.xml | ||
|
|
||
| - name: Show PHPCS results in PR | ||
| run: cs2pr ./phpcs-report.xml | ||
|
|
||
| lint: | ||
| name: "Lint: PHP ${{ matrix.php }}" | ||
| runs-on: ${{ github.event.pull_request.head.repo.fork && 'ubuntu-latest' || 'ubuntu-x64' }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php: ["8.1", "8.2", "8.3", "8.4"] | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
|
|
||
| - name: Set up PHP | ||
| uses: shivammathur/setup-php@cf4cade2721270509d5b1c766dad417c269cbb11 # v2 | ||
| with: | ||
| php-version: ${{ matrix.php }} | ||
| coverage: none | ||
| tools: cs2pr | ||
|
|
||
| - name: Configure Artifactory | ||
| if: ${{ !github.event.pull_request.head.repo.fork }} | ||
| uses: ./.github/actions/artifactory-oidc | ||
| with: | ||
| artifactory_url: ${{ vars.ARTIFACTORY_URL }} | ||
|
|
||
| - name: Install Composer dependencies | ||
| run: composer install --no-scripts --no-interaction --prefer-dist | ||
|
|
||
| - name: Lint against parse errors | ||
| run: composer lint | ||
|
|
||
| test: | ||
| name: "Test: PHP ${{ matrix.php }}" | ||
| needs: [coding-standard, lint] | ||
| runs-on: ${{ github.event.pull_request.head.repo.fork && 'ubuntu-latest' || 'ubuntu-x64' }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php: ["8.1", "8.2", "8.3", "8.4"] | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
|
|
||
| - name: Set up PHP | ||
| uses: shivammathur/setup-php@cf4cade2721270509d5b1c766dad417c269cbb11 # v2 | ||
| with: | ||
| php-version: ${{ matrix.php }} | ||
| coverage: xdebug | ||
| ini-values: error_reporting=E_ALL, display_errors=On | ||
| extensions: curl, json, mbstring | ||
|
|
||
| - name: Configure Artifactory | ||
| if: ${{ !github.event.pull_request.head.repo.fork }} | ||
| uses: ./.github/actions/artifactory-oidc | ||
| with: | ||
| artifactory_url: ${{ vars.ARTIFACTORY_URL }} | ||
|
|
||
| - name: Install Composer dependencies | ||
| run: composer install --no-scripts --no-interaction --prefer-dist | ||
|
|
||
| - name: Run tests | ||
| run: ./vendor/bin/phpunit --no-coverage | ||
|
|
||
| - name: Run tests with coverage | ||
| if: ${{ matrix.php == '8.2' }} | ||
| run: ./vendor/bin/phpunit | ||
|
|
||
| - name: Upload coverage to Codecov | ||
| if: ${{ success() && matrix.php == '8.2' }} | ||
| uses: codecov/codecov-action@v5 | ||
|
MichaelGHSeg marked this conversation as resolved.
Outdated
|
||
| with: | ||
| files: ./build/logs/clover.xml | ||
| fail_ci_if_error: true | ||
| env: | ||
| CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} | ||
|
|
||
| build-verification: | ||
| name: Build Verification | ||
| needs: [test] | ||
| runs-on: ${{ github.event.pull_request.head.repo.fork && 'ubuntu-latest' || 'ubuntu-x64' }} | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
|
|
||
| - name: Set up PHP | ||
| uses: shivammathur/setup-php@cf4cade2721270509d5b1c766dad417c269cbb11 # v2 | ||
| with: | ||
| php-version: "8.2" | ||
| coverage: none | ||
|
|
||
| - name: Configure Artifactory | ||
| if: ${{ !github.event.pull_request.head.repo.fork }} | ||
| uses: ./.github/actions/artifactory-oidc | ||
| with: | ||
| artifactory_url: ${{ vars.ARTIFACTORY_URL }} | ||
|
|
||
| - name: Install Composer dependencies (production) | ||
| run: composer install --no-scripts --no-interaction --prefer-dist --no-dev --optimize-autoloader | ||
|
|
||
| - name: Verify autoload | ||
| run: php -r "require 'vendor/autoload.php'; echo 'Autoload OK' . PHP_EOL;" | ||
|
|
||
| - name: Verify package structure | ||
| run: | | ||
| # Ensure required files exist for Packagist | ||
| test -f composer.json | ||
| test -f LICENSE.md | ||
| test -d lib | ||
| echo "Package structure verified" | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| composer.lock | ||
| vendor | ||
| composer.phar | ||
| test/analytics.log | ||
|
|
||
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.