-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
[CVE-2020-36518] Move Jackson-databind to 2.13.2 #2548
Conversation
Resolves CVE-2020-36518 Signed-off-by: Peter Nied <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@saratvemulapalli Could we get this change backported to 1.4? |
+1 |
I don't see why we wouldn't backport to 1.x, labeled. |
@dblock makes sense. Then should we also backport it to 1.3, 1.2, 1.1 and 1.0 branches where version has already been bumped to the potential next patch versions? Adding @saratvemulapalli @nknize for inputs. |
Resolves CVE-2020-36518 Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit d43235c)
Sure absolutely. Not sure if there is going to be 1.3.1/1.4. |
Good point! But they can be different topics. If we'll have next patch release on those branches, should this CVE fix be included? If yes, then it should be backported to all the branches. This is actually a general question on how far we backport CVE fixes. Is there any agreement documented anywhere? |
Usually depending on how severe the CVE is. |
Resolves CVE-2020-36518 Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit d43235c) Co-authored-by: Peter Nied <[email protected]>
The backport to
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-2548-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d43235c5cfc3f6253530bf51cb6fb4d6dd7e0154
# Push it to GitHub
git push --set-upstream origin backport/backport-2548-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 |
Resolves CVE-2020-36518 Signed-off-by: Peter Nied <[email protected]> (cherry picked from commit d43235c)
Description
Security took a fix for a opensearch-project/security#1687 and now is seeing a jar hell conflict. This will fix that conflict and fix the CVE in this version of OpenSearch
Check List
New functionality includes testing.All tests passNew functionality has been documented.New functionality has javadoc addedBy 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.