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

Patch 1.3 MED+ CVE's #1626

Merged
merged 3 commits into from
May 11, 2023
Merged

Conversation

seankao-az
Copy link
Collaborator

@seankao-az seankao-az commented May 11, 2023

Description

Patched CVE's

(*) This requires the use of jetty-server@11.0.14 instead of jetty-server@11.0.12
However, the latest version of wiremock@3.0.0-beta-8 still uses jetty-server@11.0.12
Wiremock is used in testing only. We can probably exempt these CVE's after we make sure that wiremock is the only source of these CVE's.

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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: Sean Kao <seankao@amazon.com>
Signed-off-by: Sean Kao <seankao@amazon.com>
Change subprojects to allprojects to enforce root using same version
Patched CVE's:
* CVE-2019-10782
* CVE-2020-8908

And fix style violations

Signed-off-by: Sean Kao <seankao@amazon.com>
@codecov
Copy link

codecov bot commented May 11, 2023

Codecov Report

Merging #1626 (a24e50f) into 1.3 (04976fb) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                1.3    #1626   +/-   ##
=========================================
  Coverage     98.40%   98.40%           
  Complexity     2746     2746           
=========================================
  Files           266      266           
  Lines          6758     6758           
  Branches        427      427           
=========================================
  Hits           6650     6650           
  Misses          107      107           
  Partials          1        1           
Flag Coverage Δ
sql-engine 98.40% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ensearch/storage/script/core/ExpressionScript.java 100.00% <ø> (ø)
...pensearch/sql/protocol/response/format/Format.java 100.00% <ø> (ø)

@seankao-az seankao-az marked this pull request as ready for review May 11, 2023 22:26
@seankao-az seankao-az merged commit 9cef2aa into opensearch-project:1.3 May 11, 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-1626-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9cef2aa75d1d8a2b3c13a7bbb0adc4ba609812f3
# Push it to GitHub
git push --set-upstream origin backport/backport-1626-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-1626-to-1.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.

5 participants