Updating Log4j to 2.11.2 by saratvemulapalli · Pull Request #1696 · opensearch-project/OpenSearch

saratvemulapalli · 2021-12-10T16:02:39Z

Signed-off-by: Sarat Vemulapalli vemulapallisarat@gmail.com

Description

Updating Log4j to 2.11.2

Issues Resolved

[List any issues this PR will resolve]

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: Sarat Vemulapalli <vemulapallisarat@gmail.com>

mignaulo · 2021-12-10T19:07:34Z

Should this be updated to 2.15.0 instead, to handle CVE-2021-44228?

saratvemulapalli · 2021-12-10T19:09:30Z

Should this be updated to 2.15.0 instead, to handle CVE-2021-44228?

Yup the PR is out: #1698

reta · 2021-12-13T13:45:39Z

@saratvemulapalli @dblock was it by intention to commit binary files into repo? missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$1.class, ...

dblock · 2021-12-13T17:40:41Z

@saratvemulapalli @dblock was it by intention to commit binary files into repo? missing-doclet/bin/main/org/opensearch/missingdoclet/MissingDoclet$1.class, ...

I think this was a mistake @saratvemulapalli
let's make sure these things are properly .gitignored.

saratvemulapalli · 2021-12-13T17:45:22Z

@reta @dblock yes it was a mistake.

.gitattributes is causing problems on my machine (Linux x64).
I'll open up an issue.

Checking out a fresh clone of OpenSearch on linux, there are bunch of files which have diffs.

ubuntu@ip-172-31-42-176:~/OpenSearch$ git status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   client/rest/src/test/resources/test.crt
	modified:   distribution/src/bin/opensearch-service-mgr.exe
	modified:   distribution/src/bin/opensearch-service-x64.exe
	modified:   gradlew.bat
	modified:   libs/ssl-config/src/test/resources/certs/ca-all/ca.p12
	modified:   plugins/ingest-attachment/licenses/commons-collections4-LICENSE.txt
	modified:   plugins/ingest-attachment/licenses/commons-collections4-NOTICE.txt
	modified:   plugins/ingest-attachment/licenses/slf4j-api-LICENSE.txt
	modified:   plugins/ingest-attachment/licenses/xz-LICENSE.txt
	modified:   plugins/ingest-attachment/licenses/xz-NOTICE.txt
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/sample-files/bad_tika.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/sample-files/encrypted.pdf
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/sample-files/issue-22077.doc
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/sample-files/issue-22077.vsdx
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/sample-files/testEPUB.epub
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/EmbeddedOutlook.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/EmbeddedPDF.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/test.doc.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testAnnotations.pdf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testBulletPoints.key.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testComment.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testEXCEL.xlsx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testEXCEL_1img.xlsx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xls.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testEXCEL_embeded.xlsx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testEXCEL_textbox.xlsx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testKeynote.key.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testMasterFooter.odp.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testMasterSlideTable.key.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testODFwithOOo3.odt.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testOptionalHyphen.rtf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPDFFileEmbInAnnotation.pdf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPDFPackage.pdf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPDFVarious.pdf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPDF_bom.pdf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT.ppsx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_2imgs.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_autodate.ppt.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_embedded_two_slides.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_embeded.ppt.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_embeded.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_masterText2.ppt.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPPT_masterText2.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPages.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPagesComments.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaLower.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPagesHeadersFootersAlphaUpper.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanLower.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPagesHeadersFootersRomanUpper.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testPagesLayout.pages.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testRTFVarious.rtf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testTables.key.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_3imgs.doc.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_embedded_rtf.doc.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_embeded.doc.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_embeded.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_missing_text.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_no_format.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWORD_various.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/testWordArt.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/test_embedded_package.rtf.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/test_embedded_zip.pptx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/test_recursive_embedded.docx.zip
	modified:   plugins/ingest-attachment/src/test/resources/org/opensearch/ingest/attachment/test/tika-files/test_recursive_embedded_npe.docx.zip
	modified:   plugins/repository-hdfs/licenses/commons-codec-LICENSE.txt
	modified:   plugins/repository-hdfs/licenses/commons-codec-NOTICE.txt
	modified:   server/licenses/joda-time-LICENSE.txt
	modified:   server/src/test/resources/indices/bwc/unsupported-2.4.5.zip

Updating Log4j to 2.11.2

85a4dc5

Signed-off-by: Sarat Vemulapalli <vemulapallisarat@gmail.com>

saratvemulapalli requested a review from a team as a code owner December 10, 2021 16:02

CEHENKLE approved these changes Dec 10, 2021

View reviewed changes

CEHENKLE merged commit e0e6995 into main Dec 10, 2021

dblock added the v1.2.1 label Dec 10, 2021

saratvemulapalli mentioned this pull request Dec 13, 2021

[BUG] OpenSearch clone causing unexpected diffs via git #1713

Closed

reta mentioned this pull request Dec 13, 2021

Fixing .gitattributes for binary content, removing *.class files #1717

Merged

5 tasks

dblock deleted the log4j branch January 5, 2022 15:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updating Log4j to 2.11.2#1696

Updating Log4j to 2.11.2#1696
CEHENKLE merged 1 commit intomainfrom
log4j

saratvemulapalli commented Dec 10, 2021

Uh oh!

mignaulo commented Dec 10, 2021

Uh oh!

saratvemulapalli commented Dec 10, 2021

Uh oh!

reta commented Dec 13, 2021

Uh oh!

dblock commented Dec 13, 2021

Uh oh!

saratvemulapalli commented Dec 13, 2021 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

saratvemulapalli commented Dec 10, 2021

Description

Issues Resolved

Check List

Uh oh!

mignaulo commented Dec 10, 2021

Uh oh!

saratvemulapalli commented Dec 10, 2021

Uh oh!

reta commented Dec 13, 2021

Uh oh!

dblock commented Dec 13, 2021

Uh oh!

saratvemulapalli commented Dec 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

saratvemulapalli commented Dec 13, 2021 •

edited

Loading