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

Fix CVE-2024-4067. #1074

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Conversation

AWSHurneyt
Copy link
Collaborator

Description

Fix CVE GHSA-952p-6rrq-rcjv

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.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@AWSHurneyt AWSHurneyt merged commit 0a32d05 into opensearch-project:main Sep 4, 2024
9 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/alerting-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1074-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0a32d05b590e7821dd5fc2bf607e18c074bd9d10
# Push it to GitHub
git push --set-upstream origin backport-1074-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 4, 2024
* Fix CVE-2024-4067.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

(cherry picked from commit 0a32d05)
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 5, 2024
* Fix CVE-2024-4067.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

(cherry picked from commit 0a32d05)
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 5, 2024
* Fix CVE-2024-4067.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

(cherry picked from commit 0a32d05)
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 5, 2024
* Fix CVE-2024-4067.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

(cherry picked from commit 0a32d05)
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Sep 19, 2024
* Fix CVE-2024-4067.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.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.

3 participants