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 kafka CVE-2023-25194, update kafka client to 3.4.0 #2484

Merged
merged 2 commits into from
Feb 27, 2023

Conversation

xie-shujian
Copy link
Contributor

@xie-shujian xie-shujian commented Feb 25, 2023

Description

  • fix kafka CVE-2023-25194
  • upgrade kafka client to 3.4.0, and upgrade three related jar
  • upgrade spring kafka test to 2.9.6, add one more kafka coordinator package

Issues Resolved

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: Shujian Xie <xiesj@live.com>
Signed-off-by: Peter Nied <peternied@hotmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Feb 25, 2023

Codecov Report

Merging #2484 (fd9cb92) into main (2df8acd) will decrease coverage by 0.01%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #2484      +/-   ##
============================================
- Coverage     61.19%   61.19%   -0.01%     
+ Complexity     3325     3324       -1     
============================================
  Files           260      260              
  Lines         18494    18494              
  Branches       3268     3268              
============================================
- Hits          11318    11317       -1     
  Misses         5578     5578              
- Partials       1598     1599       +1     
Impacted Files Coverage Δ
...search/security/transport/SecurityInterceptor.java 75.38% <0.00%> (-0.77%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nicely done!

@DarshitChanpura DarshitChanpura merged commit 7547d03 into opensearch-project:main Feb 27, 2023
@DarshitChanpura
Copy link
Member

Backwards Compatibility failure for Windows CI is unrelated to changes in this PR.

@stephen-crawford stephen-crawford added 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 labels Feb 27, 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-2484-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7547d035ff11a00257f6c7e8316499e2138790e8
# Push it to GitHub
git push --set-upstream origin backport/backport-2484-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-2484-to-1.x.

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

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

@peternied
Copy link
Member

@scrawfor99 FYI - these changes will not clearly backport to the 1.X/1.3 branches. They will need to manually be converted since the build script were rewrittne

DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Feb 27, 2023
…oject#2484)

Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)
DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Feb 27, 2023
…oject#2484)

Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)
DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Feb 27, 2023
…oject#2484)

Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)
DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Feb 27, 2023
…oject#2484)

Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)
DarshitChanpura pushed a commit to DarshitChanpura/security that referenced this pull request Feb 27, 2023
…oject#2484)

Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)
stephen-crawford pushed a commit that referenced this pull request Feb 27, 2023
Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)

Co-authored-by: xieshujian <xiesj@live.com>
stephen-crawford pushed a commit that referenced this pull request Feb 27, 2023
Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)

Co-authored-by: xieshujian <xiesj@live.com>
stephen-crawford pushed a commit that referenced this pull request Feb 27, 2023
Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)

Co-authored-by: xieshujian <xiesj@live.com>
stephen-crawford pushed a commit that referenced this pull request Feb 27, 2023
Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
(cherry picked from commit 7547d03)

Co-authored-by: xieshujian <xiesj@live.com>
Rishikesh1159 added a commit to Rishikesh1159/security that referenced this pull request Mar 15, 2023
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Apr 27, 2023
…oject#2484)

Signed-off-by: Shujian Xie <xiesj@live.com>

Signed-off-by: Peter Nied <peternied@hotmail.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
@cwperks cwperks mentioned this pull request Jun 2, 2023
3 tasks
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.

CVE-2023-25194 (High) detected in kafka-clients-3.0.2.jar
5 participants