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

address CVE-2024-4068 #823

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Conversation

jackiehanyang
Copy link
Collaborator

@jackiehanyang jackiehanyang commented Jul 29, 2024

Description

address CVE-2024-4068 and update yarn.lock file

Issues Resolved

opensearch-project/OpenSearch-Dashboards#6911

Check List

  • New functionality includes testing.
    • All tests pass
  • 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: Jackie Han <[email protected]>
@jackiehanyang jackiehanyang merged commit 25726fb into opensearch-project:main Jul 29, 2024
12 of 13 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 29, 2024
Signed-off-by: Jackie Han <[email protected]>
(cherry picked from commit 25726fb)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 29, 2024
Signed-off-by: Jackie Han <[email protected]>
(cherry picked from commit 25726fb)
jackiehanyang added a commit that referenced this pull request Jul 29, 2024
Signed-off-by: Jackie Han <[email protected]>
(cherry picked from commit 25726fb)

Co-authored-by: Jackie Han <[email protected]>
jackiehanyang added a commit that referenced this pull request Jul 29, 2024
Signed-off-by: Jackie Han <[email protected]>
(cherry picked from commit 25726fb)

Co-authored-by: Jackie Han <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-823-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 25726fb0534b15dc70fe87641a4c4dd92c456327
# Push it to GitHub
git push --set-upstream origin backport/backport-823-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

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

owaiskazi19 pushed a commit to owaiskazi19/anomaly-detection-dashboards-plugin that referenced this pull request Aug 23, 2024
Signed-off-by: Jackie Han <[email protected]>
(cherry picked from commit 25726fb)
owaiskazi19 added a commit that referenced this pull request Aug 23, 2024
Signed-off-by: Jackie Han <[email protected]>
(cherry picked from commit 25726fb)

Co-authored-by: Jackie Han <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 backport 2.x backport 2.16 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants