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

Remediate CVE-2023-1370 and CVE-2023-20861 via version bumps #2606

Conversation

stephen-crawford
Copy link
Contributor

Description

Bumps JSON-Smart to version 2.4.10 to address CVE-2023-1370.
Bumps Spring-core to version 5.3.26 to address CVE-2023-20861.

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: Stephen Crawford <[email protected]>
@stephen-crawford stephen-crawford added backport 2.x backport to 2.x branch backport 1.x backport to 1.x branch backport 1.3 backport to 1.3 branch labels Mar 30, 2023
@stephen-crawford stephen-crawford added the backport 2.6 backport to 2.6 branch label Mar 30, 2023
@stephen-crawford stephen-crawford merged commit 9bcf4a4 into opensearch-project:main Mar 31, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

@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-2606-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9bcf4a432c6a66a16972d62d2fc0fe40328feb65
# Push it to GitHub
git push --set-upstream origin backport/backport-2606-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-2606-to-1.3.

@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:

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

RyanL1997 pushed a commit to RyanL1997/security that referenced this pull request Apr 4, 2023
stephen-crawford added a commit to stephen-crawford/security that referenced this pull request Apr 6, 2023
@stephen-crawford stephen-crawford deleted the JSONSmartAndSpringVersionBumps branch April 11, 2023 14:02
stephen-crawford added a commit to stephen-crawford/security that referenced this pull request Apr 11, 2023
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Apr 11, 2023
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Apr 20, 2023
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Maciej Mierzwa <[email protected]>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Apr 27, 2023
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Maciej Mierzwa <[email protected]>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Maciej Mierzwa <[email protected]>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
Signed-off-by: Stephen Crawford <[email protected]>
Signed-off-by: Maciej Mierzwa <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport to 1.x branch backport 1.3 backport to 1.3 branch backport 2.x backport to 2.x branch backport 2.6 backport to 2.6 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants