moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Cleanup Biff8EncryptionKey usage and use HPSF constants instead of duplicated strings

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1830705 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2018-05-01 18:22:00 +00:00
parent 32b370fb67
commit 83eb0ca821
18 changed files with 265 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/examples/src/org/apache/poi/hpsf/examples/ReadTitle.java
View File

@ -46,8 +46,7 @@ public class ReadTitle
{ {
final String filename = args[0]; final String filename = args[0];
POIFSReader r = new POIFSReader(); POIFSReader r = new POIFSReader();
r.registerListener(new MyPOIFSReaderListener(), r.registerListener(new MyPOIFSReaderListener(), SummaryInformation.DEFAULT_STREAM_NAME);
"\005SummaryInformation");
r.read(new FileInputStream(filename)); r.read(new FileInputStream(filename));
} }

67
src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java
View File

@ -52,11 +52,6 @@ import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
public class TestHxxFEncryption { public class TestHxxFEncryption {
@AfterClass
public static void clearPass() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
@Parameter(value = 0) @Parameter(value = 0)
public POIDataSamples sampleDir; public POIDataSamples sampleDir;
@ -99,12 +94,14 @@ public class TestHxxFEncryption {
@Test @Test
public void extract() throws IOException, OpenXML4JException, XmlException { public void extract() throws IOException, OpenXML4JException, XmlException {
Biff8EncryptionKey.setCurrentUserPassword(password);
File f = sampleDir.getFile(file); File f = sampleDir.getFile(file);
POITextExtractor te = ExtractorFactory.createExtractor(f); Biff8EncryptionKey.setCurrentUserPassword(password);
try (POITextExtractor te = ExtractorFactory.createExtractor(f)) {
String actual = te.getText().trim(); String actual = te.getText().trim();
assertEquals(expected, actual); assertEquals(expected, actual);
te.close(); } finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
@Test @Test
@ -118,50 +115,51 @@ public class TestHxxFEncryption {
} }
public void newPassword(String newPass) throws IOException, OpenXML4JException, XmlException { public void newPassword(String newPass) throws IOException, OpenXML4JException, XmlException {
Biff8EncryptionKey.setCurrentUserPassword(password);
File f = sampleDir.getFile(file); File f = sampleDir.getFile(file);
POITextExtractor te1 = ExtractorFactory.createExtractor(f); Biff8EncryptionKey.setCurrentUserPassword(password);
try (POITextExtractor te1 = ExtractorFactory.createExtractor(f)) {
Biff8EncryptionKey.setCurrentUserPassword(newPass); Biff8EncryptionKey.setCurrentUserPassword(newPass);
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
POIDocument doc = (POIDocument)te1.getDocument(); try (POIDocument doc = (POIDocument) te1.getDocument()) {
doc.write(bos); doc.write(bos);
doc.close(); }
te1.close();
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
POITextExtractor te2 = ExtractorFactory.createExtractor(bis); try (POITextExtractor te2 = ExtractorFactory.createExtractor(bis)) {
String actual = te2.getText().trim(); String actual = te2.getText().trim();
assertEquals(expected, actual); assertEquals(expected, actual);
te2.close(); }
} finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
/** changing the encryption mode and key size in poor mans style - see comments below */ /** changing the encryption mode and key size in poor mans style - see comments below */
@Test @Test
public void changeEncryption() throws IOException, OpenXML4JException, XmlException { public void changeEncryption() throws IOException, OpenXML4JException, XmlException {
File f = sampleDir.getFile(file);
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
Biff8EncryptionKey.setCurrentUserPassword(password); Biff8EncryptionKey.setCurrentUserPassword(password);
File f = sampleDir.getFile(file); try (POITextExtractor te1 = ExtractorFactory.createExtractor(f)) {
POITextExtractor te1 = ExtractorFactory.createExtractor(f);
// first remove encryption // first remove encryption
Biff8EncryptionKey.setCurrentUserPassword(null); Biff8EncryptionKey.setCurrentUserPassword(null);
POIDocument doc = (POIDocument)te1.getDocument(); try (POIDocument doc = (POIDocument) te1.getDocument()) {
doc.write(bos); doc.write(bos);
doc.close(); }
te1.close();
// then use default setting, which is cryptoapi // then use default setting, which is cryptoapi
String newPass = "newPass"; String newPass = "newPass";
POITextExtractor te2 = ExtractorFactory.createExtractor(new ByteArrayInputStream(bos.toByteArray())); try (POITextExtractor te2 = ExtractorFactory.createExtractor(new ByteArrayInputStream(bos.toByteArray()))) {
Biff8EncryptionKey.setCurrentUserPassword(newPass); Biff8EncryptionKey.setCurrentUserPassword(newPass);
doc = (POIDocument)te2.getDocument(); try (POIDocument doc = (POIDocument) te2.getDocument()) {
bos.reset(); bos.reset();
doc.write(bos); doc.write(bos);
doc.close(); }
te2.close(); }
// and finally update cryptoapi setting // and finally update cryptoapi setting
POITextExtractor te3 = ExtractorFactory.createExtractor(new ByteArrayInputStream(bos.toByteArray())); try (POITextExtractor te3 = ExtractorFactory.createExtractor(new ByteArrayInputStream(bos.toByteArray()));
doc = (POIDocument)te3.getDocument(); POIDocument doc = (POIDocument) te3.getDocument()) {
// need to cache data (i.e. read all data) before changing the key size // need to cache data (i.e. read all data) before changing the key size
if (doc instanceof HSLFSlideShowImpl) { if (doc instanceof HSLFSlideShowImpl) {
HSLFSlideShowImpl hss = (HSLFSlideShowImpl)doc; HSLFSlideShowImpl hss = (HSLFSlideShowImpl) doc;
hss.getPictureData(); hss.getPictureData();
hss.getDocumentSummaryInformation(); hss.getDocumentSummaryInformation();
} }
@ -172,16 +170,17 @@ public class TestHxxFEncryption {
ei.getHeader().setKeySize(0x78); ei.getHeader().setKeySize(0x78);
bos.reset(); bos.reset();
doc.write(bos); doc.write(bos);
doc.close(); }
te3.close();
// check the setting // check the setting
POITextExtractor te4 = ExtractorFactory.createExtractor(new ByteArrayInputStream(bos.toByteArray())); try (POITextExtractor te4 = ExtractorFactory.createExtractor(new ByteArrayInputStream(bos.toByteArray()));
doc = (POIDocument)te4.getDocument(); POIDocument doc = (POIDocument) te4.getDocument()) {
ei = doc.getEncryptionInfo(); EncryptionInfo ei = doc.getEncryptionInfo();
assertNotNull(ei); assertNotNull(ei);
assertTrue(ei.getHeader() instanceof CryptoAPIEncryptionHeader); assertTrue(ei.getHeader() instanceof CryptoAPIEncryptionHeader);
assertEquals(0x78, ei.getHeader().getKeySize()); assertEquals(0x78, ei.getHeader().getKeySize());
doc.close(); }
te4.close(); } finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
} }

6
src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
View File

@ -28,7 +28,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument; import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl; import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.hwpf.HWPFTestDataSamples; import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
@ -91,8 +93,8 @@ public final class TestPOIDocumentScratchpad {
doc.writeProperties(outFS); doc.writeProperties(outFS);
// Should now hold them // Should now hold them
assertNotNull(outFS.createDocumentInputStream("\005SummaryInformation")); assertNotNull(outFS.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME));
assertNotNull(outFS.createDocumentInputStream("\005DocumentSummaryInformation")); assertNotNull(outFS.createDocumentInputStream(DocumentSummaryInformation.DEFAULT_STREAM_NAME));
outFS.close(); outFS.close();
} }

86
src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
View File

@ -59,40 +59,35 @@ import org.junit.Test;
public class TestDocumentEncryption { public class TestDocumentEncryption {
POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
@Before
@After // also afterwards to not affect other tests running in the same JVM
public void resetPassword() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
@Test @Test
public void cryptoAPIDecryptionOther() throws Exception { public void cryptoAPIDecryptionOther() throws Exception {
Biff8EncryptionKey.setCurrentUserPassword("hello");
String encPpts[] = { String encPpts[] = {
"Password_Protected-56-hello.ppt", "Password_Protected-56-hello.ppt",
"Password_Protected-hello.ppt", "Password_Protected-hello.ppt",
"Password_Protected-np-hello.ppt", "Password_Protected-np-hello.ppt",
}; };
for (String pptFile : encPpts) { Biff8EncryptionKey.setCurrentUserPassword("hello");
try { try {
NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true); for (String pptFile : encPpts) {
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs); try (NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
new HSLFSlideShow(hss).close(); HSLFSlideShow ppt = new HSLFSlideShow(fs)) {
fs.close(); assertTrue(ppt.getSlides().size() > 0);
} catch (EncryptedPowerPointFileException e) { } catch (EncryptedPowerPointFileException e) {
fail(pptFile+" can't be decrypted"); fail(pptFile + " can't be decrypted");
} }
} }
// password is reset in @After } finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
@Test @Test
public void cryptoAPIChangeKeySize() throws Exception { public void cryptoAPIChangeKeySize() throws Exception {
String pptFile = "cryptoapi-proc2356.ppt"; String pptFile = "cryptoapi-proc2356.ppt";
Biff8EncryptionKey.setCurrentUserPassword("crypto"); Biff8EncryptionKey.setCurrentUserPassword("crypto");
NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true); try (NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs); HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs)) {
// need to cache data (i.e. read all data) before changing the key size // need to cache data (i.e. read all data) before changing the key size
List<HSLFPictureData> picsExpected = hss.getPictureData(); List<HSLFPictureData> picsExpected = hss.getPictureData();
hss.getDocumentSummaryInformation(); hss.getDocumentSummaryInformation();
@ -103,50 +98,51 @@ public class TestDocumentEncryption {
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
hss.write(bos); hss.write(bos);
hss.close();
fs.close();
fs = new NPOIFSFileSystem(new ByteArrayInputStream(bos.toByteArray())); try (NPOIFSFileSystem fs2 = new NPOIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
hss = new HSLFSlideShowImpl(fs); HSLFSlideShowImpl hss2 = new HSLFSlideShowImpl(fs2)) {
List<HSLFPictureData> picsActual = hss.getPictureData(); List<HSLFPictureData> picsActual = hss2.getPictureData();
assertEquals(picsExpected.size(), picsActual.size()); assertEquals(picsExpected.size(), picsActual.size());
for (int i = 0; i < picsExpected.size(); i++) { for (int i = 0; i < picsExpected.size(); i++) {
assertArrayEquals(picsExpected.get(i).getRawData(), picsActual.get(i).getRawData()); assertArrayEquals(picsExpected.get(i).getRawData(), picsActual.get(i).getRawData());
} }
hss.close(); }
fs.close(); } finally {
// password is reset in @After Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
@Test @Test
public void cryptoAPIEncryption() throws Exception { public void cryptoAPIEncryption() throws Exception {
/* documents with multiple edits need to be normalized for encryption */ /* documents with multiple edits need to be normalized for encryption */
String pptFile = "57272_corrupted_usereditatom.ppt"; String pptFile = "57272_corrupted_usereditatom.ppt";
NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true); ByteArrayOutputStream encrypted = new ByteArrayOutputStream();
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs); ByteArrayOutputStream expected = new ByteArrayOutputStream();
ByteArrayOutputStream actual = new ByteArrayOutputStream();
try {
try (NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs)) {
hss.normalizeRecords(); hss.normalizeRecords();
// normalized ppt // normalized ppt
ByteArrayOutputStream expected = new ByteArrayOutputStream();
hss.write(expected); hss.write(expected);
// encrypted // encrypted
Biff8EncryptionKey.setCurrentUserPassword("hello"); Biff8EncryptionKey.setCurrentUserPassword("hello");
ByteArrayOutputStream encrypted = new ByteArrayOutputStream();
hss.write(encrypted); hss.write(encrypted);
hss.close(); }
fs.close();
// decrypted // decrypted
ByteArrayInputStream bis = new ByteArrayInputStream(encrypted.toByteArray()); ByteArrayInputStream bis = new ByteArrayInputStream(encrypted.toByteArray());
fs = new NPOIFSFileSystem(bis); try (NPOIFSFileSystem fs = new NPOIFSFileSystem(bis);
hss = new HSLFSlideShowImpl(fs); HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs)) {
Biff8EncryptionKey.setCurrentUserPassword(null); Biff8EncryptionKey.setCurrentUserPassword(null);
ByteArrayOutputStream actual = new ByteArrayOutputStream();
hss.write(actual); hss.write(actual);
hss.close(); }
fs.close(); } finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
assertArrayEquals(expected.toByteArray(), actual.toByteArray()); assertArrayEquals(expected.toByteArray(), actual.toByteArray());
} }
@ -156,9 +152,8 @@ public class TestDocumentEncryption {
// taken from a msdn blog: // taken from a msdn blog:
// http://blogs.msdn.com/b/openspecification/archive/2009/05/08/dominic-salemno.aspx // http://blogs.msdn.com/b/openspecification/archive/2009/05/08/dominic-salemno.aspx
Biff8EncryptionKey.setCurrentUserPassword("crypto"); Biff8EncryptionKey.setCurrentUserPassword("crypto");
NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile("cryptoapi-proc2356.ppt")); try (NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile("cryptoapi-proc2356.ppt"));
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs); HSLFSlideShow ss = new HSLFSlideShow(fs)) {
HSLFSlideShow ss = new HSLFSlideShow(hss);
HSLFSlide slide = ss.getSlides().get(0); HSLFSlide slide = ss.getSlides().get(0);
String rawText = HSLFTextParagraph.getRawText(slide.getTextParagraphs().get(0)); String rawText = HSLFTextParagraph.getRawText(slide.getTextParagraphs().get(0));
@ -175,7 +170,7 @@ public class TestDocumentEncryption {
}; };
MessageDigest md = CryptoFunctions.getMessageDigest(HashAlgorithm.sha1); MessageDigest md = CryptoFunctions.getMessageDigest(HashAlgorithm.sha1);
List<HSLFPictureData> pd = hss.getPictureData(); List<HSLFPictureData> pd = ss.getSlideShowImpl().getPictureData();
int i = 0; int i = 0;
for (HSLFPictureData p : pd) { for (HSLFPictureData p : pd) {
byte hash[] = md.digest(p.getData()); byte hash[] = md.digest(p.getData());
@ -184,10 +179,11 @@ public class TestDocumentEncryption {
i++; i++;
} }
DocumentEncryptionAtom dea = hss.getDocumentEncryptionAtom(); DocumentEncryptionAtom dea = ss.getSlideShowImpl().getDocumentEncryptionAtom();
assertNotNull(dea); assertNotNull(dea);
POIFSFileSystem fs2 = ((CryptoAPIDecryptor) dea.getEncryptionInfo().getDecryptor()).getSummaryEntries(fs.getRoot(), "EncryptedSummary"); CryptoAPIDecryptor dec = (CryptoAPIDecryptor) dea.getEncryptionInfo().getDecryptor();
try (POIFSFileSystem fs2 = dec.getSummaryEntries(fs.getRoot(), "EncryptedSummary")) {
PropertySet ps = PropertySetFactory.create(fs2.getRoot(), SummaryInformation.DEFAULT_STREAM_NAME); PropertySet ps = PropertySetFactory.create(fs2.getRoot(), SummaryInformation.DEFAULT_STREAM_NAME);
assertNotNull(ps); assertNotNull(ps);
assertTrue(ps.isSummaryInformation()); assertTrue(ps.isSummaryInformation());
@ -196,9 +192,9 @@ public class TestDocumentEncryption {
assertNotNull(ps); assertNotNull(ps);
assertTrue(ps.isDocumentSummaryInformation()); assertTrue(ps.isDocumentSummaryInformation());
assertEquals("On-screen Show (4:3)", ps.getProperties()[1].getValue()); assertEquals("On-screen Show (4:3)", ps.getProperties()[1].getValue());
ss.close(); }
fs.close(); } finally {
fs2.close(); Biff8EncryptionKey.setCurrentUserPassword(null);
// password is reset in @After }
} }
} }

6
src/testcases/org/apache/poi/TestPOIDocumentMain.java
View File

@ -25,7 +25,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument; import org.apache.poi.hpsf.HPSFPropertiesOnlyDocument;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
@ -89,10 +91,10 @@ public final class TestPOIDocumentMain {
// Should now hold them // Should now hold them
assertNotNull( assertNotNull(
outFS.createDocumentInputStream("\005SummaryInformation") outFS.createDocumentInputStream(SummaryInformation.DEFAULT_STREAM_NAME)
); );
assertNotNull( assertNotNull(
outFS.createDocumentInputStream("\005DocumentSummaryInformation") outFS.createDocumentInputStream(DocumentSummaryInformation.DEFAULT_STREAM_NAME)
); );
} }

4
src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
View File

@ -53,8 +53,8 @@ public final class TestBasic {
private static final POIDataSamples samples = POIDataSamples.getHPSFInstance(); private static final POIDataSamples samples = POIDataSamples.getHPSFInstance();
private static final String[] POI_FILES = { private static final String[] POI_FILES = {
"\005SummaryInformation", SummaryInformation.DEFAULT_STREAM_NAME,
"\005DocumentSummaryInformation", DocumentSummaryInformation.DEFAULT_STREAM_NAME,
"WordDocument", "WordDocument",
"\001CompObj", "\001CompObj",
"1Table" "1Table"

2
src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
View File

@ -56,7 +56,7 @@ public final class TestEmptyProperties {
private static final String[] POI_FILES = { private static final String[] POI_FILES = {
"PerfectOffice_MAIN", "PerfectOffice_MAIN",
"\005SummaryInformation", SummaryInformation.DEFAULT_STREAM_NAME,
"Main" "Main"
}; };

2
src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
View File

@ -43,7 +43,7 @@ public class TestUnicode {
static final String POI_FS = "TestUnicode.xls"; static final String POI_FS = "TestUnicode.xls";
static final String[] POI_FILES = { static final String[] POI_FILES = {
"\005DocumentSummaryInformation", DocumentSummaryInformation.DEFAULT_STREAM_NAME,
}; };
File data; File data;
POIFile[] poiFiles; POIFile[] poiFiles;

3
src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java
View File

@ -90,9 +90,6 @@ public abstract class BaseXLSIteratingTest {
@Test @Test
public void testMain() throws Exception { public void testMain() throws Exception {
// we had intermittent problems when this was set differently somehow, let's try to set it here so it always is set correctly for these tests
Biff8EncryptionKey.setCurrentUserPassword(null);
String fileName = file.getName(); String fileName = file.getName();
if (EXCLUDED.containsKey(fileName)) { if (EXCLUDED.containsKey(fileName)) {
thrown.expect(EXCLUDED.get(fileName)); thrown.expect(EXCLUDED.get(fileName));

26
src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
View File

@ -46,12 +46,6 @@ public final class TestHSSFEventFactory extends TestCase {
return HSSFTestDataSamples.openSampleFileStream(sampleFileName); return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
} }
// to not affect other tests running in the same JVM
@After
public void resetPassword() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
public void testWithMissingRecords() throws Exception { public void testWithMissingRecords() throws Exception {
HSSFRequest req = new HSSFRequest(); HSSFRequest req = new HSSFRequest();
@ -156,7 +150,6 @@ public final class TestHSSFEventFactory extends TestCase {
req.addListenerForAllRecords(mockListen); req.addListenerForAllRecords(mockListen);
// Without a password, can't be read // Without a password, can't be read
Biff8EncryptionKey.setCurrentUserPassword(null);
POIFSFileSystem fs = new POIFSFileSystem(openSample("xor-encryption-abc.xls")); POIFSFileSystem fs = new POIFSFileSystem(openSample("xor-encryption-abc.xls"));
HSSFEventFactory factory = new HSSFEventFactory(); HSSFEventFactory factory = new HSSFEventFactory();
@ -168,7 +161,7 @@ public final class TestHSSFEventFactory extends TestCase {
// With the password, is properly processed // With the password, is properly processed
Biff8EncryptionKey.setCurrentUserPassword("abc"); Biff8EncryptionKey.setCurrentUserPassword("abc");
try {
req = new HSSFRequest(); req = new HSSFRequest();
mockListen = new MockHSSFListener(); mockListen = new MockHSSFListener();
req.addListenerForAllRecords(mockListen); req.addListenerForAllRecords(mockListen);
@ -176,28 +169,28 @@ public final class TestHSSFEventFactory extends TestCase {
// Check we got the sheet and the contents // Check we got the sheet and the contents
Record[] recs = mockListen.getRecords(); Record[] recs = mockListen.getRecords();
assertTrue( recs.length > 50 ); assertTrue(recs.length > 50);
// Has one sheet, with values 1,2,3 in column A rows 1-3 // Has one sheet, with values 1,2,3 in column A rows 1-3
boolean hasSheet=false, hasA1=false, hasA2=false, hasA3=false; boolean hasSheet = false, hasA1 = false, hasA2 = false, hasA3 = false;
for (Record r : recs) { for (Record r : recs) {
if (r instanceof BoundSheetRecord) { if (r instanceof BoundSheetRecord) {
BoundSheetRecord bsr = (BoundSheetRecord)r; BoundSheetRecord bsr = (BoundSheetRecord) r;
assertEquals("Sheet1", bsr.getSheetname()); assertEquals("Sheet1", bsr.getSheetname());
hasSheet = true; hasSheet = true;
} }
if (r instanceof NumberRecord) { if (r instanceof NumberRecord) {
NumberRecord nr = (NumberRecord)r; NumberRecord nr = (NumberRecord) r;
if (nr.getColumn() == 0 && nr.getRow() == 0) { if (nr.getColumn() == 0 && nr.getRow() == 0) {
assertEquals(1, (int)nr.getValue()); assertEquals(1, (int) nr.getValue());
hasA1 = true; hasA1 = true;
} }
if (nr.getColumn() == 0 && nr.getRow() == 1) { if (nr.getColumn() == 0 && nr.getRow() == 1) {
assertEquals(2, (int)nr.getValue()); assertEquals(2, (int) nr.getValue());
hasA2 = true; hasA2 = true;
} }
if (nr.getColumn() == 0 && nr.getRow() == 2) { if (nr.getColumn() == 0 && nr.getRow() == 2) {
assertEquals(3, (int)nr.getValue()); assertEquals(3, (int) nr.getValue());
hasA3 = true; hasA3 = true;
} }
} }
@ -207,5 +200,8 @@ public final class TestHSSFEventFactory extends TestCase {
assertTrue("Numeric record for A1 not found", hasA1); assertTrue("Numeric record for A1 not found", hasA1);
assertTrue("Numeric record for A2 not found", hasA2); assertTrue("Numeric record for A2 not found", hasA2);
assertTrue("Numeric record for A3 not found", hasA3); assertTrue("Numeric record for A3 not found", hasA3);
} finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
} }

9
src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
View File

@ -41,12 +41,6 @@ import org.junit.Test;
* *
*/ */
public final class TestExcelExtractor { public final class TestExcelExtractor {
// to not affect other tests running in the same JVM
@After
public void resetPassword() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
private static ExcelExtractor createExtractor(String sampleFileName) throws IOException { private static ExcelExtractor createExtractor(String sampleFileName) throws IOException {
File file = HSSFTestDataSamples.getSampleFile(sampleFileName); File file = HSSFTestDataSamples.getSampleFile(sampleFileName);
POIFSFileSystem fs = new POIFSFileSystem(file); POIFSFileSystem fs = new POIFSFileSystem(file);
@ -355,9 +349,10 @@ public final class TestExcelExtractor {
Biff8EncryptionKey.setCurrentUserPassword("password"); Biff8EncryptionKey.setCurrentUserPassword("password");
try (ExcelExtractor extractor = createExtractor("password.xls")) { try (ExcelExtractor extractor = createExtractor("password.xls")) {
String text = extractor.getText(); String text = extractor.getText();
assertContains(text, "ZIP");
} finally {
Biff8EncryptionKey.setCurrentUserPassword(null); Biff8EncryptionKey.setCurrentUserPassword(null);
assertContains(text, "ZIP");
} }
} }

26
src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
View File

@ -36,12 +36,6 @@ import org.junit.rules.ExpectedException;
* @author Josh Micich * @author Josh Micich
*/ */
public final class TestRecordFactoryInputStream { public final class TestRecordFactoryInputStream {
// to not affect other tests running in the same JVM
@After
public void resetPassword() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
/** /**
* Hex dump of a BOF record and most of a FILEPASS record. * Hex dump of a BOF record and most of a FILEPASS record.
* A 16 byte saltHash should be added to complete the second record * A 16 byte saltHash should be added to complete the second record
@ -82,7 +76,6 @@ public final class TestRecordFactoryInputStream {
+ SAMPLE_WINDOW1_ENCR1 + SAMPLE_WINDOW1_ENCR1
); );
Biff8EncryptionKey.setCurrentUserPassword(null);
expectedEx.expect(EncryptedDocumentException.class); expectedEx.expect(EncryptedDocumentException.class);
expectedEx.expectMessage("Default password is invalid for salt/verifier/verifierHash"); expectedEx.expectMessage("Default password is invalid for salt/verifier/verifierHash");
createRFIS(dataWrongDefault); createRFIS(dataWrongDefault);
@ -100,7 +93,6 @@ public final class TestRecordFactoryInputStream {
+ SAMPLE_WINDOW1_ENCR1 + SAMPLE_WINDOW1_ENCR1
); );
Biff8EncryptionKey.setCurrentUserPassword(null);
RecordFactoryInputStream rfis = createRFIS(dataCorrectDefault); RecordFactoryInputStream rfis = createRFIS(dataCorrectDefault);
confirmReadInitialRecords(rfis); confirmReadInitialRecords(rfis);
} }
@ -121,12 +113,15 @@ public final class TestRecordFactoryInputStream {
+ SAMPLE_WINDOW1_ENCR2 + SAMPLE_WINDOW1_ENCR2
); );
Biff8EncryptionKey.setCurrentUserPassword("passw0rd");
expectedEx.expect(EncryptedDocumentException.class); expectedEx.expect(EncryptedDocumentException.class);
expectedEx.expectMessage("Supplied password is invalid for salt/verifier/verifierHash"); expectedEx.expectMessage("Supplied password is invalid for salt/verifier/verifierHash");
Biff8EncryptionKey.setCurrentUserPassword("passw0rd");
try {
createRFIS(dataWrongDefault); createRFIS(dataWrongDefault);
} finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
@Test @Test
@ -135,18 +130,19 @@ public final class TestRecordFactoryInputStream {
final String SAMPLE_WINDOW1_ENCR2 = "3D 00 12 00" final String SAMPLE_WINDOW1_ENCR2 = "3D 00 12 00"
+ "45, B9, 90, FE, B6, C6, EC, 73, EE, 3F, 52, 45, 97, DB, E3, C1, D6, FE"; + "45, B9, 90, FE, B6, C6, EC, 73, EE, 3F, 52, 45, 97, DB, E3, C1, D6, FE";
Biff8EncryptionKey.setCurrentUserPassword("passw0rd");
byte[] dataCorrectDefault = HexRead.readFromString("" byte[] dataCorrectDefault = HexRead.readFromString(""
+ COMMON_HEX_DATA + COMMON_HEX_DATA
+ "C728659A C38E35E0 568A338F C3FC9D70" // correct saltHash for supplied password (and docId/saltHash) + "C728659A C38E35E0 568A338F C3FC9D70" // correct saltHash for supplied password (and docId/saltHash)
+ SAMPLE_WINDOW1_ENCR2 + SAMPLE_WINDOW1_ENCR2
); );
Biff8EncryptionKey.setCurrentUserPassword("passw0rd");
try {
RecordFactoryInputStream rfis = createRFIS(dataCorrectDefault); RecordFactoryInputStream rfis = createRFIS(dataCorrectDefault);
Biff8EncryptionKey.setCurrentUserPassword(null);
confirmReadInitialRecords(rfis); confirmReadInitialRecords(rfis);
} finally {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }

10
src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
View File

@ -102,12 +102,6 @@ import org.junit.Test;
* define the test in the base class {@link BaseTestBugzillaIssues}</b> * define the test in the base class {@link BaseTestBugzillaIssues}</b>
*/ */
public final class TestBugs extends BaseTestBugzillaIssues { public final class TestBugs extends BaseTestBugzillaIssues {
// to not affect other tests running in the same JVM
@After
public void resetPassword() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
public TestBugs() { public TestBugs() {
super(HSSFITestDataProvider.instance); super(HSSFITestDataProvider.instance);
} }
@ -2207,8 +2201,6 @@ public final class TestBugs extends BaseTestBugzillaIssues {
*/ */
@Test @Test
public void bug50833() throws Exception { public void bug50833() throws Exception {
Biff8EncryptionKey.setCurrentUserPassword(null);
HSSFWorkbook wb1 = openSample("50833.xls"); HSSFWorkbook wb1 = openSample("50833.xls");
HSSFSheet s = wb1.getSheetAt(0); HSSFSheet s = wb1.getSheetAt(0);
assertEquals("Sheet1", s.getSheetName()); assertEquals("Sheet1", s.getSheetName());
@ -2602,8 +2594,8 @@ public final class TestBugs extends BaseTestBugzillaIssues {
@Test(expected = EncryptedDocumentException.class) @Test(expected = EncryptedDocumentException.class)
public void bug35897() throws Exception { public void bug35897() throws Exception {
// password is abc // password is abc
try {
Biff8EncryptionKey.setCurrentUserPassword("abc"); Biff8EncryptionKey.setCurrentUserPassword("abc");
try {
openSample("xor-encryption-abc.xls").close(); openSample("xor-encryption-abc.xls").close();
} finally { } finally {
Biff8EncryptionKey.setCurrentUserPassword(null); Biff8EncryptionKey.setCurrentUserPassword(null);

29
src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
View File

@ -30,11 +30,6 @@ import org.junit.Test;
public class TestCryptoAPI { public class TestCryptoAPI {
final HSSFITestDataProvider ssTests = HSSFITestDataProvider.instance; final HSSFITestDataProvider ssTests = HSSFITestDataProvider.instance;
@AfterClass
public static void resetPW() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
@Test @Test
public void bug59857() throws IOException { public void bug59857() throws IOException {
// XOR-Obfuscation // XOR-Obfuscation
@ -52,19 +47,17 @@ public class TestCryptoAPI {
private void validateContent(String wbFile, String password, String textExpected) throws IOException { private void validateContent(String wbFile, String password, String textExpected) throws IOException {
Biff8EncryptionKey.setCurrentUserPassword(password); Biff8EncryptionKey.setCurrentUserPassword(password);
HSSFWorkbook wb = ssTests.openSampleWorkbook(wbFile); try (HSSFWorkbook wb = ssTests.openSampleWorkbook(wbFile);
ExcelExtractor ee1 = new ExcelExtractor(wb); ExcelExtractor ee1 = new ExcelExtractor(wb)
String textActual = ee1.getText(); ) {
assertContains(textActual, textExpected);
Biff8EncryptionKey.setCurrentUserPassword("bla"); Biff8EncryptionKey.setCurrentUserPassword("bla");
HSSFWorkbook wbBla = ssTests.writeOutAndReadBack(wb); try (HSSFWorkbook wbBla = ssTests.writeOutAndReadBack(wb);
ExcelExtractor ee2 = new ExcelExtractor(wbBla); ExcelExtractor ee2 = new ExcelExtractor(wbBla)) {
textActual = ee2.getText(); assertContains(ee1.getText(), textExpected);
assertContains(textActual, textExpected); assertContains(ee2.getText(), textExpected);
ee2.close(); }
ee1.close(); } finally {
wbBla.close(); Biff8EncryptionKey.setCurrentUserPassword(null);
wb.close(); }
} }
} }

10
src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
View File

@ -23,8 +23,12 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.Entry;
import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
/** /**
@ -49,7 +53,7 @@ public final class TestNonStandardWorkbookStreamNames {
// Ensure that we have a WORKBOOK entry and a summary // Ensure that we have a WORKBOOK entry and a summary
assertTrue(root.hasEntry("WORKBOOK")); assertTrue(root.hasEntry("WORKBOOK"));
assertTrue(root.hasEntry("\005SummaryInformation")); assertTrue(root.hasEntry(SummaryInformation.DEFAULT_STREAM_NAME));
// But not a Workbook one // But not a Workbook one
assertFalse(root.hasEntry("Workbook")); assertFalse(root.hasEntry("Workbook"));
@ -73,7 +77,7 @@ public final class TestNonStandardWorkbookStreamNames {
// But not a Workbook one and not a Summary one // But not a Workbook one and not a Summary one
assertFalse(root.hasEntry("Workbook")); assertFalse(root.hasEntry("Workbook"));
assertFalse(root.hasEntry("\\005SummaryInformation")); assertFalse(root.hasEntry(SummaryInformation.DEFAULT_STREAM_NAME));
wb.close(); wb.close();
} }
@ -127,7 +131,7 @@ public final class TestNonStandardWorkbookStreamNames {
assertFalse(root.hasEntry("WORKBOOK")); assertFalse(root.hasEntry("WORKBOOK"));
// As we preserved, should also have a few other streams // As we preserved, should also have a few other streams
assertTrue(root.hasEntry("\005SummaryInformation")); assertTrue(root.hasEntry(SummaryInformation.DEFAULT_STREAM_NAME));
wb2.close(); wb2.close();
} }
} }

18
src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java
View File

@ -21,6 +21,7 @@ import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFTestDataSamples;
@ -36,12 +37,6 @@ public class TestXorEncryption {
private static final HSSFTestDataSamples samples = new HSSFTestDataSamples(); private static final HSSFTestDataSamples samples = new HSSFTestDataSamples();
// to not affect other tests running in the same JVM
@After
public void resetPassword() {
Biff8EncryptionKey.setCurrentUserPassword(null);
}
@Test @Test
public void testXorEncryption() throws IOException { public void testXorEncryption() throws IOException {
// Xor-Password: abc // Xor-Password: abc
@ -61,15 +56,16 @@ public class TestXorEncryption {
@SuppressWarnings("static-access") @SuppressWarnings("static-access")
@Test @Test
public void testUserFile() throws IOException { public void testUserFile() throws IOException {
File f = samples.getSampleFile("xor-encryption-abc.xls");
Biff8EncryptionKey.setCurrentUserPassword("abc"); Biff8EncryptionKey.setCurrentUserPassword("abc");
NPOIFSFileSystem fs = new NPOIFSFileSystem(samples.getSampleFile("xor-encryption-abc.xls"), true); try (NPOIFSFileSystem fs = new NPOIFSFileSystem(f, true);
HSSFWorkbook hwb = new HSSFWorkbook(fs.getRoot(), true); HSSFWorkbook hwb = new HSSFWorkbook(fs.getRoot(), true)) {
HSSFSheet sh = hwb.getSheetAt(0); HSSFSheet sh = hwb.getSheetAt(0);
assertEquals(1.0, sh.getRow(0).getCell(0).getNumericCellValue(), 0.0); assertEquals(1.0, sh.getRow(0).getCell(0).getNumericCellValue(), 0.0);
assertEquals(2.0, sh.getRow(1).getCell(0).getNumericCellValue(), 0.0); assertEquals(2.0, sh.getRow(1).getCell(0).getNumericCellValue(), 0.0);
assertEquals(3.0, sh.getRow(2).getCell(0).getNumericCellValue(), 0.0); assertEquals(3.0, sh.getRow(2).getCell(0).getNumericCellValue(), 0.0);
hwb.close(); } finally {
fs.close(); Biff8EncryptionKey.setCurrentUserPassword(null);
}
} }
} }

6
src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
View File

@ -20,6 +20,8 @@ package org.apache.poi.poifs.property;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.poifs.storage.RawDataUtil; import org.apache.poi.poifs.storage.RawDataUtil;
import org.apache.poi.util.LocaleUtil; import org.apache.poi.util.LocaleUtil;
@ -68,8 +70,8 @@ public final class TestDocumentProperty extends TestCase {
byte[] input = RawDataUtil.decode(hexData); byte[] input = RawDataUtil.decode(hexData);
verifyReadingProperty(1, input, 128, "Workbook"); verifyReadingProperty(1, input, 128, "Workbook");
verifyReadingProperty(2, input, 256, "\005SummaryInformation"); verifyReadingProperty(2, input, 256, SummaryInformation.DEFAULT_STREAM_NAME);
verifyReadingProperty(3, input, 384, "\005DocumentSummaryInformation"); verifyReadingProperty(3, input, 384, DocumentSummaryInformation.DEFAULT_STREAM_NAME);
} }
private void verifyReadingProperty(int index, byte[] input, int offset, String name) private void verifyReadingProperty(int index, byte[] input, int offset, String name)

7
src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
View File

@ -25,6 +25,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import org.apache.poi.hpsf.DocumentSummaryInformation;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.poifs.storage.BlockAllocationTableReader; import org.apache.poi.poifs.storage.BlockAllocationTableReader;
import org.apache.poi.poifs.storage.HeaderBlock; import org.apache.poi.poifs.storage.HeaderBlock;
@ -79,11 +81,10 @@ public final class TestPropertyTable {
DocumentProperty workbook = new DocumentProperty("Workbook", 0x00046777); DocumentProperty workbook = new DocumentProperty("Workbook", 0x00046777);
workbook.setStartBlock(0); workbook.setStartBlock(0);
DocumentProperty summary1 = new DocumentProperty("\005SummaryInformation", 0x00001000); DocumentProperty summary1 = new DocumentProperty(SummaryInformation.DEFAULT_STREAM_NAME, 0x00001000);
summary1.setStartBlock(0x00000234); summary1.setStartBlock(0x00000234);
DocumentProperty summary2 = new DocumentProperty("\005DocumentSummaryInformation", DocumentProperty summary2 = new DocumentProperty(DocumentSummaryInformation.DEFAULT_STREAM_NAME, 0x00001000);
0x00001000);
summary2.setStartBlock(0x0000023C); summary2.setStartBlock(0x0000023C);
table.addProperty(workbook); table.addProperty(workbook);