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

Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879. #4791

Merged
merged 3 commits into from
Oct 14, 2022

Conversation

mch2
Copy link
Member

@mch2 mch2 commented Oct 14, 2022

Signed-off-by: Marc Handalian handalm@amazon.com

Description

Address CVE-2022-33879 and bump to latest Tika version.

Issues Resolved

N/A

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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: Marc Handalian <handalm@amazon.com>
@mch2 mch2 requested review from a team and reta as code owners October 14, 2022 00:11
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Marc Handalian <handalm@amazon.com>
CHANGELOG.md Outdated
@@ -55,6 +55,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Bumps `hadoop-hdfs` from 3.3.3 to 3.3.4 ([#4644](https://github.com/opensearch-project/OpenSearch/pull/4644))
- Bumps `jna` from 5.11.0 to 5.12.1 ([#4656](https://github.com/opensearch-project/OpenSearch/pull/4656))
- Update Jackson Databind to 2.13.4.2 (addressing CVE-2022-42003) ([#4779](https://github.com/opensearch-project/OpenSearch/pull/4779))
- Bumps `tika` from 2.4.0 to 2.5.0 ([#]())
Copy link
Member

Choose a reason for hiding this comment

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

PR info is missing from the change.

Copy link
Member Author

Choose a reason for hiding this comment

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

updated now.

Signed-off-by: Marc Handalian <handalm@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@saratvemulapalli saratvemulapalli added >upgrade Label used when upgrading library dependencies (e.g., Lucene) dependencies Pull requests that update a dependency file backport 2.x Backport to 2.x branch v3.0.0 Issues and PRs related to version 3.0.0 labels Oct 14, 2022
@saratvemulapalli saratvemulapalli merged commit f1995b9 into opensearch-project:main Oct 14, 2022
@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-4791-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f1995b951abab34935bf8e5dee91097efbf5503e
# Push it to GitHub
git push --set-upstream origin backport/backport-4791-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-4791-to-2.x.

mch2 added a commit to mch2/OpenSearch that referenced this pull request Oct 14, 2022
…project#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit f1995b9)
mch2 added a commit to mch2/OpenSearch that referenced this pull request Oct 14, 2022
…project#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit f1995b9)
@mch2
Copy link
Member Author

mch2 commented Oct 14, 2022

Manual backport to 2.x #4794

@mch2 mch2 deleted the CVE-2022-33879 branch October 14, 2022 17:57
VachaShah pushed a commit that referenced this pull request Oct 26, 2022
* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit f1995b9)
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah pushed a commit to mch2/OpenSearch that referenced this pull request Oct 26, 2022
…project#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit f1995b9)
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah pushed a commit to VachaShah/OpenSearch that referenced this pull request Oct 26, 2022
…project#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah pushed a commit to VachaShah/OpenSearch that referenced this pull request Oct 26, 2022
…project#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
VachaShah pushed a commit that referenced this pull request Oct 26, 2022
* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit f1995b9)
Signed-off-by: Vacha Shah <vachshah@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
reta pushed a commit that referenced this pull request Oct 26, 2022
#4929)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879. (#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>

* Update CHANGELOG

Signed-off-by: Vacha Shah <vachshah@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
Signed-off-by: Vacha Shah <vachshah@amazon.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
ashking94 pushed a commit to ashking94/OpenSearch that referenced this pull request Nov 7, 2022
…project#4791)

* Bump Tika from 2.4.0 to 2.5.0 addressing CVE-2022-33879.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add missing SHAs.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Update changelog with PR info.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Signed-off-by: Marc Handalian <handalm@amazon.com>
@ryanbogan ryanbogan added the backport 1.3 Backport to 1.3 branch label Jan 26, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 128

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 Backport to 1.3 branch backport 2.x Backport to 2.x branch dependencies Pull requests that update a dependency file >upgrade Label used when upgrading library dependencies (e.g., Lucene) v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants