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

Add exlusion for logback-core to resolve CVE-2023-6378 #4049

Merged

Conversation

stephen-crawford
Copy link
Contributor

Description

[Describe what this change achieves]
This change adds an exclusion for the transitive logback-core dependency that the Security plugin was still using as a test dependency.

This should resolve the flagging of CVE-2023-6378 even though we should not have been directly impacted.

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 <steecraw@amazon.com>
Copy link

codecov bot commented Feb 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (321604c) 65.60% compared to head (415f9f5) 65.84%.
Report is 7 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4049      +/-   ##
==========================================
+ Coverage   65.60%   65.84%   +0.23%     
==========================================
  Files         298      298              
  Lines       21247    21289      +42     
  Branches     3457     3467      +10     
==========================================
+ Hits        13940    14018      +78     
+ Misses       5585     5535      -50     
- Partials     1722     1736      +14     

see 7 files with indirect coverage changes

@willyborankin willyborankin merged commit babf012 into opensearch-project:main Feb 14, 2024
83 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 14, 2024
### Description
[Describe what this change achieves]
This change adds an exclusion for the transitive logback-core dependency
that the Security plugin was still using as a test dependency.

This should resolve the flagging of CVE-2023-6378 even though we should
not have been directly impacted.

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [x] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
(cherry picked from commit babf012)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
stephen-crawford pushed a commit that referenced this pull request Feb 14, 2024
…#4050)

Backport babf012 from #4049.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@stephen-crawford stephen-crawford added the backport 1.x backport to 1.x branch label Feb 14, 2024
@opensearch-trigger-bot
Copy link
Contributor

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

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

stephen-crawford added a commit that referenced this pull request Feb 15, 2024
…VE-2023-6378 (#4051)

### Description
This change forces is a manual backport of the same type of change in
#4049 . Instead of excluding the the logback-classic and logback-core
transient dependencies we now just force them to be versions 1.2.13.
This resolves CVE-2023-6378

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [x] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
dlin2028 pushed a commit to dlin2028/security that referenced this pull request May 1, 2024
…oject#4049)

### Description
[Describe what this change achieves]
This change adds an exclusion for the transitive logback-core dependency
that the Security plugin was still using as a test dependency.

This should resolve the flagging of CVE-2023-6378 even though we should
not have been directly impacted.

### Check List
- [ ] ~New functionality includes testing~
- [ ] ~New functionality has been documented~
- [x] 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
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 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants