Skip to content

Conversation

@LantaoJin
Copy link
Member

@LantaoJin LantaoJin commented Jul 18, 2025

Description

Fix CVE-2025-48924

opensearch-project/opensearch-build#5637

  • upgrade commons-lang3 to 3.18.0
  • remove commons-lang (introduced by net.hydromatic:aggdesigner-algorithm:6.0 which is not used in our code. aggdesigner is used when the schema contains Lattice entities)

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Lantao Jin <ltjin@amazon.com>
qianheng-aws
qianheng-aws previously approved these changes Jul 18, 2025
Signed-off-by: Lantao Jin <ltjin@amazon.com>
@penghuo penghuo merged commit 96d0d14 into opensearch-project:main Jul 21, 2025
31 of 32 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-3895-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 96d0d1434f7736f8e697722ec8ddd95122be7d2a
# Push it to GitHub
git push --set-upstream origin backport/backport-3895-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-3895-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19-dev failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.19-dev 2.19-dev
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.19-dev
# Create a new branch
git switch --create backport/backport-3895-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 96d0d1434f7736f8e697722ec8ddd95122be7d2a
# Push it to GitHub
git push --set-upstream origin backport/backport-3895-to-2.19-dev
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.19-dev

Then, create a pull request where the base branch is 2.19-dev and the compare/head branch is backport/backport-3895-to-2.19-dev.

LantaoJin added a commit to LantaoJin/search-plugins-sql that referenced this pull request Jul 22, 2025
LantaoJin added a commit to LantaoJin/search-plugins-sql that referenced this pull request Jul 22, 2025
)

* CVE-2025-48924: upgrade commons-lang3 to 3.18.0

Signed-off-by: Lantao Jin <ltjin@amazon.com>

* Exclude the dependency commons-lang

Signed-off-by: Lantao Jin <ltjin@amazon.com>

---------

Signed-off-by: Lantao Jin <ltjin@amazon.com>
(cherry picked from commit 96d0d14)
@LantaoJin LantaoJin added the backport-manually Filed a PR to backport manually. label Jul 22, 2025
penghuo pushed a commit that referenced this pull request Jul 22, 2025
* CVE-2025-48924: upgrade commons-lang3 to 3.18.0



* Exclude the dependency commons-lang



---------


(cherry picked from commit 96d0d14)

Signed-off-by: Lantao Jin <ltjin@amazon.com>
qianheng-aws pushed a commit that referenced this pull request Jul 28, 2025
#3902)

* [Backport 2.x] CVE-2025-48924: upgrade commons-lang3 to 3.18.0 (#3895)

Signed-off-by: Lantao Jin <ltjin@amazon.com>

* enfore resolutionStrategy to 3.18.0

Signed-off-by: Lantao Jin <ltjin@amazon.com>

---------

Signed-off-by: Lantao Jin <ltjin@amazon.com>
@gaiksaya
Copy link
Member

Hi everyone,
Can we please backport to 2.19 branch? Looks like it is showing up there too

@gaiksaya
Copy link
Member

Tried #4693 please see if it makes sense

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.x backport 2.19-dev backport-failed backport-manually Filed a PR to backport manually. enhancement New feature or request security fix Security fix generated by WhiteSource

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants