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

Fixed CVEs for OS 1.3.15 patch release #1001

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

mohitamg
Copy link
Contributor

@mohitamg mohitamg commented Mar 2, 2024

Description

CVE fixes for:-
CVE-2022-38900
CVE-2021-3807
CVE-2021-43138
CVE-2022-25858
CVE-2022-37603
CVE-2023-26136
CVE-2022-37599
CVE-2022-37601

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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.

Copy link

codecov bot commented Mar 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.37%. Comparing base (550c6e4) to head (746a5d1).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff            @@
##             main    #1001    +/-   ##
========================================
  Coverage   63.37%   63.37%            
========================================
  Files         341      341            
  Lines       11554    11554            
  Branches     2112     2243   +131     
========================================
  Hits         7322     7322            
  Misses       3658     3658            
  Partials      574      574            

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

@mohitamg mohitamg force-pushed the CVEFixes branch 2 times, most recently from 0cedf70 to db71d24 Compare March 7, 2024 09:50
@mohitamg mohitamg force-pushed the CVEFixes branch 2 times, most recently from f5ac335 to 2073506 Compare March 13, 2024 10:31
@r1walz r1walz merged commit 8a385b8 into opensearch-project:main Mar 13, 2024
14 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@r1walz
Copy link
Contributor

r1walz commented Mar 13, 2024

Hi, @mohitamg. Thanks for working on this! I see that the backports failed. Can you please pick them up?

This was referenced Mar 13, 2024
Hailong-am pushed a commit to Hailong-am/index-management-dashboards-plugin that referenced this pull request Dec 10, 2024
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