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

CVE-2020-8908 Upgrade checkstyle using bad guava version #395

Merged
merged 1 commit into from
Mar 7, 2023

Conversation

dzane17
Copy link
Contributor

@dzane17 dzane17 commented Mar 7, 2023

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
#348
CVE-2020-8908

Describe the solution you are proposing
Use checkstyle v9.3 so guava is >= v30.0. It was previously guava@28.2-jre

% ./gradlew :dependencies

\--- com.puppycrawl.tools:checkstyle:9.3
     ...
     +--- com.google.guava:guava:31.0.1-jre

Additional context
https://advisories.aws.barahmand.com/advisory/CVE-2020-8908

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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: David Zane <davizane@amazon.com>
@dzane17 dzane17 marked this pull request as ready for review March 7, 2023 22:06
@dzane17 dzane17 requested a review from a team March 7, 2023 22:06
@kaushalmahi12 kaushalmahi12 self-requested a review March 7, 2023 22:13
@dzane17 dzane17 merged commit 83ee108 into main Mar 7, 2023
@dzane17 dzane17 deleted the feature/guava branch March 7, 2023 22:20
@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-395-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 83ee1080781d095c4bda38b1531c7a3051ddcfe0
# Push it to GitHub
git push --set-upstream origin backport/backport-395-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-395-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants