Fix: CVE-2020-36518, CVE-2022-24823#1704
Conversation
Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com>
dlvenable
left a comment
There was a problem hiding this comment.
Let's just be sure the tests all pass on these changes.
Codecov Report
@@ Coverage Diff @@
## main #1704 +/- ##
=========================================
Coverage 93.32% 93.32%
Complexity 1351 1351
=========================================
Files 178 178
Lines 3969 3969
Branches 317 317
=========================================
Hits 3704 3704
Misses 189 189
Partials 76 76 Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
|
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.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-1704-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 23911dd95707750a8cf51888daf5b56685e4d2f4
# Push it to GitHub
git push --set-upstream origin backport/backport-1704-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.xThen, create a pull request where the |
|
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.5 1.5
# Navigate to the new working tree
cd .worktrees/backport-1.5
# Create a new branch
git switch --create backport/backport-1704-to-1.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 23911dd95707750a8cf51888daf5b56685e4d2f4
# Push it to GitHub
git push --set-upstream origin backport/backport-1704-to-1.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.5Then, create a pull request where the |
|
The backport has merge conflicts with 1.5 and 1.x. |
Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com> Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com>
Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com> Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com>
Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com> Signed-off-by: Asif Sohail Mohammed <nsifmoh@amazon.com>
Signed-off-by: Asif Sohail Mohammed nsifmoh@amazon.com
Description
CVE-2020-36518:
jackson-databind-2.13.1fromgatling-charts-highcharts-3.7.4CVE-2022-24823:
netty-common-4.1.74.Finalfrombom-2.17.209Issues Resolved
Check List
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.