Skip to content

Conversation

@gaiksaya
Copy link
Member

Description

Resolve pbkdf2 to resolve CVE-2025-6545 CVE-2025-6547

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

@amsiglan amsiglan merged commit dc5991d into opensearch-project:main Aug 12, 2025
9 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 12, 2025
Signed-off-by: Sayali Gaikawad <[email protected]>
(cherry picked from commit dc5991d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@gaiksaya gaiksaya deleted the fix-cve branch August 12, 2025 03:16
gaiksaya pushed a commit that referenced this pull request Aug 12, 2025
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 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/alerting-dashboards-plugin/backport-2.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.19
# Create a new branch
git switch --create backport-1280-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 dc5991defa701698e72be4034004e341cb202a0e
# Push it to GitHub
git push --set-upstream origin backport-1280-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.19

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

amsiglan pushed a commit to amsiglan/alerting-dashboards-plugin that referenced this pull request Oct 29, 2025
amsiglan added a commit that referenced this pull request Oct 29, 2025
* Resolve pbkdf2 to resolve CVE-2025-6545 CVE-2025-6547 (#1280)

Signed-off-by: Sayali Gaikawad <[email protected]>

* Bump form-data, cipher-base, sha.js version (#1296)

Signed-off-by: Peter Zhu <[email protected]>

---------

Signed-off-by: Sayali Gaikawad <[email protected]>
Signed-off-by: Peter Zhu <[email protected]>
Co-authored-by: Sayali Gaikawad <[email protected]>
Co-authored-by: Peter Zhu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants