From bb2fed7971ad9a488923d3f6308fab143b102b5e Mon Sep 17 00:00:00 2001 From: Jhoanor Date: Wed, 18 Mar 2020 07:44:47 +0100 Subject: [PATCH 1/6] Update OLE2Bleach.java --- .../src/main/java/xyz/docbleach/module/ole2/OLE2Bleach.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/module-office/src/main/java/xyz/docbleach/module/ole2/OLE2Bleach.java b/module/module-office/src/main/java/xyz/docbleach/module/ole2/OLE2Bleach.java index 1b24c227..f220f622 100644 --- a/module/module-office/src/main/java/xyz/docbleach/module/ole2/OLE2Bleach.java +++ b/module/module-office/src/main/java/xyz/docbleach/module/ole2/OLE2Bleach.java @@ -6,7 +6,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.function.Predicate; -import org.apache.poi.hpsf.ClassID; +import org.apache.poi.hpsf.ClassIDPredefined; import org.apache.poi.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.DocumentEntry; import org.apache.poi.poifs.filesystem.DocumentInputStream; @@ -52,7 +52,7 @@ public void sanitize(InputStream inputStream, OutputStream outputStream, BleachS // @TODO: Filter based on Storage Class ID - see issue #23 sanitize(session, fsIn, fs); - if (ClassID.EXCEL97.equals(fs.getRoot().getStorageClsid())) { + if (ClassIDPredefined.EXCEL_V8.equals(fs.getRoot().getStorageClsid())) { ExcelRecordCleaner.cleanupAndSaveExcel97(fs, outputStream); } else { fs.writeFilesystem(outputStream); @@ -80,7 +80,7 @@ protected void sanitize(BleachSession session, DirectoryEntry rootIn, DirectoryE .and(new ObjectRemover(session)) .and(new SummaryInformationSanitiser(session)); - LOGGER.debug("Root ClassID: {}", rootIn.getStorageClsid()); + LOGGER.debug("Root ClassIDPredefined: {}", rootIn.getStorageClsid()); // https://blogs.msdn.microsoft.com/heaths/2006/02/27/identifying-windows-installer-file-types/ rootOut.setStorageClsid(rootIn.getStorageClsid()); From 538212185eda784ac789b3632146433fa8e3918b Mon Sep 17 00:00:00 2001 From: Jhoanor Date: Wed, 18 Mar 2020 08:51:03 +0100 Subject: [PATCH 2/6] Update PDEmbeddedFileBleach.java --- .../java/xyz/docbleach/module/pdf/PDEmbeddedFileBleach.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/module-pdf/src/main/java/xyz/docbleach/module/pdf/PDEmbeddedFileBleach.java b/module/module-pdf/src/main/java/xyz/docbleach/module/pdf/PDEmbeddedFileBleach.java index 71285ee0..9b889c46 100644 --- a/module/module-pdf/src/main/java/xyz/docbleach/module/pdf/PDEmbeddedFileBleach.java +++ b/module/module-pdf/src/main/java/xyz/docbleach/module/pdf/PDEmbeddedFileBleach.java @@ -31,10 +31,10 @@ private void sanitizeEmbeddedFile(PDComplexFileSpecification fileSpec) { LOGGER.trace("Embedded file found: {}", fileSpec.getFilename()); fileSpec.setEmbeddedFile(sanitizeEmbeddedFile(fileSpec.getEmbeddedFile())); - fileSpec.setEmbeddedFileDos(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileDos())); - fileSpec.setEmbeddedFileMac(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileMac())); + //fileSpec.setEmbeddedFileDos(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileDos())); + //fileSpec.setEmbeddedFileMac(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileMac())); fileSpec.setEmbeddedFileUnicode(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileUnicode())); - fileSpec.setEmbeddedFileUnix(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileUnix())); + //fileSpec.setEmbeddedFileUnix(sanitizeEmbeddedFile(fileSpec.getEmbeddedFileUnix())); } private PDEmbeddedFile sanitizeEmbeddedFile(PDEmbeddedFile file) { From ce6b1372bc71b0c23ce563dcbff280286cba3130 Mon Sep 17 00:00:00 2001 From: Jhoanor Date: Thu, 25 Jun 2020 15:12:04 +0200 Subject: [PATCH 3/6] Update BleachTestBase.java --- api/src/test/java/xyz/docbleach/api/BleachTestBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/test/java/xyz/docbleach/api/BleachTestBase.java b/api/src/test/java/xyz/docbleach/api/BleachTestBase.java index 0a991633..6e7f08cc 100644 --- a/api/src/test/java/xyz/docbleach/api/BleachTestBase.java +++ b/api/src/test/java/xyz/docbleach/api/BleachTestBase.java @@ -1,6 +1,6 @@ package xyz.docbleach.api; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; From 8a65bf72d65249b6b83a76af1a923b3b62be6fe1 Mon Sep 17 00:00:00 2001 From: Jhoanor Date: Thu, 25 Jun 2020 15:23:00 +0200 Subject: [PATCH 4/6] Update SummaryInformationSanitiserTest.java --- .../module/ole2/SummaryInformationSanitiserTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/module-office/src/test/java/xyz/docbleach/module/ole2/SummaryInformationSanitiserTest.java b/module/module-office/src/test/java/xyz/docbleach/module/ole2/SummaryInformationSanitiserTest.java index 1f760f8a..8b56e0b2 100644 --- a/module/module-office/src/test/java/xyz/docbleach/module/ole2/SummaryInformationSanitiserTest.java +++ b/module/module-office/src/test/java/xyz/docbleach/module/ole2/SummaryInformationSanitiserTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; From 2b7483d04a6626c642f7497ee5dc938aefa613cd Mon Sep 17 00:00:00 2001 From: Jhoanor Date: Thu, 25 Jun 2020 17:37:26 +0200 Subject: [PATCH 5/6] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ad7cbc8f..1d3fa76a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,8 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 3.3.3 test From 5812789d9168e9a3ef852a3bf9bfb6f284582b4e Mon Sep 17 00:00:00 2001 From: Jhoanor Date: Fri, 5 Nov 2021 10:39:41 +0100 Subject: [PATCH 6/6] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d3fa76a..ea2db4d5 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.mockito mockito-core - 3.3.3 + 4.0.0 test