Skip to content

Commit 6730ea3

Browse files
fix(deps): Upgrade vulnerable dependencies to resolve CVEs (#953)
* fix(deps): Upgrade vulnerable dependencies to resolve CVEs Upgrade Bouncy Castle bcprov-jdk15to18 1.78.1 -> 1.84 and bcpkix-jdk18on 1.79 -> 1.84 to fix CVE-2026-5598, CVE-2026-0636, and CVE-2026-5588. Upgrade plexus-utils force from 3.3.0 -> 4.0.2 to fix CVE-2025-67030. Update license SHA1 files for Bouncy Castle, Netty 4.1.131 -> 4.1.135, and Jackson 2.18.2 -> 2.18.6 (aligned with OpenSearch core 2.19.6). Signed-off-by: Ajay Raj Nelapudi <ajnelapu@amazon.com> * ci: Pin all GitHub Actions to full-length commit SHAs Pin actions to immutable commit SHAs to comply with opensearch-project org security policy. Also upgrade actions/setup-java v1 -> v4 and actions/checkout v2 -> v4 in gradle.yml. Signed-off-by: Ajay Raj Nelapudi <ajnelapu@amazon.com> * ci: Add dead opendistro PR link to lycheeignore The opendistro-for-elasticsearch repo was migrated and PR #389 no longer exists, causing lychee link checker to fail. Signed-off-by: Ajay Raj Nelapudi <ajnelapu@amazon.com> --------- Signed-off-by: Ajay Raj Nelapudi <ajnelapu@amazon.com> Co-authored-by: Ajay Raj Nelapudi <ajnelapu@amazon.com>
1 parent c0432e6 commit 6730ea3

42 files changed

Lines changed: 46 additions & 41 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/add-untriaged.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
apply-label:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/github-script@v6
11+
- uses: actions/github-script@00f12e3e20659f42342b1c0226afda7f7c042325 # v6
1212
with:
1313
script: |
1414
github.rest.issues.addLabels({

.github/workflows/backport.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
steps:
1616
- name: GitHub App token
1717
id: github_app_token
18-
uses: tibdex/github-app-token@v1.5.0
18+
uses: tibdex/github-app-token@918e03f91c95714f3d75f0140b3a5c5f738300df # v1.5.0
1919
with:
2020
app_id: ${{ secrets.APP_ID }}
2121
private_key: ${{ secrets.APP_PRIVATE_KEY }}
2222
installation_id: 22958780
2323

2424
- name: Backport
25-
uses: VachaShah/backport@v1.1.4
25+
uses: VachaShah/backport@c2be57a934c3c4bb88508ca4a9023f3ce85339dc # v1.1.4
2626
with:
2727
github_token: ${{ steps.github_app_token.outputs.token }}
28-
branch_name: backport/backport-${{ github.event.number }}
28+
branch_name: backport/backport-${{ github.event.number }}

.github/workflows/cd.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Performance Analyzer package
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
1515
with:
1616
path: ./tmp/pa
1717
- name: Set up JDK 1.12
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
1919
with:
20+
distribution: temurin
2021
java-version: 1.12
2122
- name: Build Artifacts
2223
working-directory: ./tmp/pa
@@ -31,7 +32,7 @@ jobs:
3132
cp $deb_artifact artifacts/
3233
3334
- name: Configure AWS Credentials
34-
uses: aws-actions/configure-aws-credentials@v1
35+
uses: aws-actions/configure-aws-credentials@6a64f289c4a4b67a1e2c44cc4bd9d6f7bc59b156 # v1
3536
with:
3637
aws-access-key-id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }}
3738
aws-secret-access-key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }}
@@ -62,7 +63,7 @@ jobs:
6263
aws s3 cp --quiet $deb ${s3_prefix}${deb_outfile}
6364
6465
- name: Upload Workflow Artifacts
65-
uses: actions/upload-artifact@v1
66+
uses: actions/upload-artifact@34622df80861c3ed63eb2bff892de2f1fbf4c9da # v1
6667
with:
6768
name: artifacts
6869
path: ./tmp/pa/artifacts/

.github/workflows/create-documentation-issue.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414
steps:
1515
- name: GitHub App token
1616
id: github_app_token
17-
uses: tibdex/github-app-token@v1.5.0
17+
uses: tibdex/github-app-token@918e03f91c95714f3d75f0140b3a5c5f738300df # v1.5.0
1818
with:
1919
app_id: ${{ secrets.APP_ID }}
2020
private_key: ${{ secrets.APP_PRIVATE_KEY }}
2121
installation_id: 22958780
2222

2323
- name: Checkout code
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
2525

2626
- name: Edit the issue template
2727
run: |
2828
echo "https://github.com/opensearch-project/performance-analyzer/pull/${{ env.PR_NUMBER }}." >> ./.github/ISSUE_TEMPLATE/documentation-issue.md
2929
3030
- name: Create Issue From File
3131
id: create-issue
32-
uses: peter-evans/create-issue-from-file@v4
32+
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f # v4
3333
with:
3434
title: Add documentation related to new feature
3535
content-filepath: ./.github/ISSUE_TEMPLATE/documentation-issue.md

.github/workflows/delete_backport_branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
if: startsWith(github.event.pull_request.head.ref,'backport/')
1111
steps:
1212
- name: Delete merged branch
13-
uses: SvanBoxel/delete-merged-branch@main
13+
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
1414
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gradle.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ jobs:
1919
name: Building PA package
2020
steps:
2121
- name: Set up JDK
22-
uses: actions/setup-java@v1
22+
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
2323
with:
24+
distribution: temurin
2425
java-version: ${{matrix.java}}
2526
# Performance Analyzer in ./tmp/performance-analyzer
2627
- name: Checkout Performance Analyzer package
27-
uses: actions/checkout@v2
28+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2829
with:
2930
path: ./tmp/performance-analyzer
3031
# Explicitly set the docker-compose program path so that our build scripts in RCA can run the program

.github/workflows/links.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ jobs:
66
check:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
1010
- name: Lychee Link Checker
11-
uses: lycheeverse/lychee-action@v2
11+
uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
1212
with:
1313
args: --accept=200,403,429 --exclude-file .lycheeignore **/*.html **/*.md **/*.txt **/*.json
1414
fail: true

.github/workflows/maven-publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
contents: write
1717

1818
steps:
19-
- uses: actions/setup-java@v3
19+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
2020
with:
21-
distribution: temurin # Temurin is a distribution of adoptium
21+
distribution: temurin
2222
java-version: 21
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2424

2525
- name: Load secret
26-
uses: 1password/load-secrets-action@v2
26+
uses: 1password/load-secrets-action@2ebe1bc766ed99dcfc292ae0308a9492144563c8 # v2
2727
with:
2828
# Export loaded secrets as environment variables
2929
export-env: true
@@ -33,7 +33,7 @@ jobs:
3333
MAVEN_SNAPSHOTS_S3_ROLE: op://opensearch-infra-secrets/maven-snapshots-s3/role
3434

3535
- name: Configure AWS credentials
36-
uses: aws-actions/configure-aws-credentials@v5
36+
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
3737
with:
3838
role-to-assume: ${{ env.MAVEN_SNAPSHOTS_S3_ROLE }}
3939
aws-region: us-east-1

.lycheeignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ http://www.junit.org/license
66
https://junit.org/license
77

88
# Add other problematic URLs here as needed
9+
10+
# Opendistro repo was migrated to opensearch-project; old PR links are dead
11+
https://github.com/opendistro-for-elasticsearch/performance-analyzer/pull/389

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ dependencies {
296296
force "org.apache.commons:commons-lang3:${versions.commonslang}"
297297
force "org.slf4j:slf4j-api:2.0.0"
298298
force "com.google.guava:guava:${guavaVersion}"
299-
force "org.codehaus.plexus:plexus-utils:3.3.0"
299+
force "org.codehaus.plexus:plexus-utils:4.0.2"
300300
force "org.apache.httpcomponents:httpcore:${versions.httpcore}"
301301
force "commons-codec:commons-codec:${versions.commonscodec}"
302302
force "io.netty:netty-codec-http2:${nettyVersion}"
@@ -308,8 +308,8 @@ dependencies {
308308

309309
implementation 'org.jooq:jooq:3.10.8'
310310
implementation "org.apache.commons:commons-lang3:${versions.commonslang}"
311-
implementation 'org.bouncycastle:bcprov-jdk15to18:1.78.1'
312-
implementation 'org.bouncycastle:bcpkix-jdk18on:1.79'
311+
implementation 'org.bouncycastle:bcprov-jdk15to18:1.84'
312+
implementation 'org.bouncycastle:bcpkix-jdk18on:1.84'
313313
implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
314314
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
315315
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"

0 commit comments

Comments
 (0)