Skip to content

Bump aws sdk to version 2.30.18 to mitigate CVE-2025-24970 #3565

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

Bump aws sdk to version 2.30.18 to mitigate CVE-2025-24970 #3565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f45c3
Bump aws sdk to version 2.30.18 to mitigate CVE-2025-24970
peterzhuamazon Feb 19, 2025
ecbb727
More bumps
peterzhuamazon Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ml-algorithms/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@ dependencies {
}
}

implementation platform('software.amazon.awssdk:bom:2.29.12')
api 'software.amazon.awssdk:auth:2.29.12'
implementation platform('software.amazon.awssdk:bom:2.30.18')
api 'software.amazon.awssdk:auth:2.30.18'
implementation 'software.amazon.awssdk:apache-client'
implementation ('com.amazonaws:aws-encryption-sdk-java:2.4.1') {
exclude group: 'org.bouncycastle', module: 'bcprov-ext-jdk18on'
}
implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'

compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.29.12'
compileOnly group: 'software.amazon.awssdk', name: 's3', version: '2.29.12'
compileOnly group: 'software.amazon.awssdk', name: 'regions', version: '2.29.12'
compileOnly group: 'software.amazon.awssdk', name: 'aws-core', version: '2.30.18'
compileOnly group: 'software.amazon.awssdk', name: 's3', version: '2.30.18'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does core uses awssdk? I was wondering if we could use something like implementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") so that we don't have to worry about version from plugin level?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Core did have a pointer here: https://github.com/opensearch-project/OpenSearch/blob/main/gradle/libs.versions.toml#L55

However, netty has its own pointer so they just updated netty directly:
opensearch-project/OpenSearch@c82fffe

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update core to the new version first.

compileOnly group: 'software.amazon.awssdk', name: 'regions', version: '2.30.18'

implementation 'com.jayway.jsonpath:json-path:2.9.0'
implementation group: 'org.json', name: 'json', version: '20231013'
implementation group: 'software.amazon.awssdk', name: 'netty-nio-client', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 'netty-nio-client', version: '2.30.18'
testImplementation("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
testImplementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
testImplementation group: 'com.networknt' , name: 'json-schema-validator', version: '1.4.0'
Expand All @@ -94,7 +94,7 @@ lombok {
configurations.all {
resolutionStrategy.force 'com.google.protobuf:protobuf-java:3.25.5'
resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
resolutionStrategy.force 'software.amazon.awssdk:bom:2.29.12'
resolutionStrategy.force 'software.amazon.awssdk:bom:2.30.18'
}


Expand Down
12 changes: 6 additions & 6 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ dependencies {
implementation project(':opensearch-ml-memory')
compileOnly "com.google.guava:guava:32.1.3-jre"

implementation group: 'software.amazon.awssdk', name: 'aws-core', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 's3', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 'regions', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 'aws-core', version: '2.30.18'
implementation group: 'software.amazon.awssdk', name: 's3', version: '2.30.18'
implementation group: 'software.amazon.awssdk', name: 'regions', version: '2.30.18'

implementation group: 'software.amazon.awssdk', name: 'aws-xml-protocol', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 'aws-xml-protocol', version: '2.30.18'

implementation group: 'software.amazon.awssdk', name: 'aws-query-protocol', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 'aws-query-protocol', version: '2.30.18'

implementation group: 'software.amazon.awssdk', name: 'protocol-core', version: '2.29.12'
implementation group: 'software.amazon.awssdk', name: 'protocol-core', version: '2.30.18'

zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${opensearch_build}"
compileOnly "org.opensearch:opensearch-job-scheduler-spi:${opensearch_build}"
Expand Down
Loading