Skip to content
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

Bump express for CVE #2141

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Bump express for CVE #2141

merged 2 commits into from
Oct 25, 2024

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Oct 25, 2024

Description

Fix: CVE-2024-45590, CVE-2024-45296, CVE-2024-43796, CVE-2024-43800

Category

[Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation]
Maintenance

Why these changes are required?

CVE fixes

What is the old behavior before changes and new behavior after changes?

None

Issues Resolved

[List any issues this PR will resolve (Is this a backport? If so, please add backport PR # and/or commits #)]

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Copy link

codecov bot commented Oct 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.46%. Comparing base (9d0c35c) to head (c86d0ce).
Report is 1 commits behind head on 2.18.

Additional details and impacted files
@@           Coverage Diff           @@
##             2.18    #2141   +/-   ##
=======================================
  Coverage   71.46%   71.46%           
=======================================
  Files          97       97           
  Lines        2649     2649           
  Branches      411      411           
=======================================
  Hits         1893     1893           
  Misses        641      641           
  Partials      115      115           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@derek-ho derek-ho added backport 2.x backport to 2.x branch backport main labels Oct 25, 2024
@derek-ho derek-ho merged commit 40a984d into opensearch-project:2.18 Oct 25, 2024
20 of 21 checks passed
@derek-ho derek-ho deleted the 2.18-cve branch October 25, 2024 15:18
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2024
* Bump express for CVE

Signed-off-by: Derek Ho <[email protected]>

* Update body-parser

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit 40a984d)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

derek-ho pushed a commit that referenced this pull request Oct 25, 2024
* Bump express for CVE



* Update body-parser



---------


(cherry picked from commit 40a984d)

Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.

2 participants