From 19a885a5d7440d4faad11588ec0d0303dbacd7fc Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Sat, 16 May 2009 17:59:42 +0000
Subject: [PATCH] Apply changes from BUREAU Nicolas from patch #47183 -
 attachment support for hsmf

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@775501 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/changes.xml   |   1 +
 src/documentation/content/xdocs/status.xml    |   1 +
 .../src/org/apache/poi/hsmf/MAPIMessage.java  |  10 ++
 .../poi/hsmf/datatypes/AttachmentChunks.java  |  45 +++++++++
 .../apache/poi/hsmf/datatypes/ByteChunk.java  |  60 ++++++++++++
 .../poi/hsmf/parsers/POIFSChunkParser.java    |  59 +++++++++++-
 .../org/apache/poi/hsmf/AllTests.java         |   1 +
 .../poi/hsmf/data/attachment_test_msg.msg     | Bin 0 -> 52224 bytes
 .../model/TestFileWithAttachmentsRead.java    |  86 ++++++++++++++++++
 9 files changed, 260 insertions(+), 3 deletions(-)
 create mode 100644 src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
 create mode 100644 src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
 create mode 100644 src/scratchpad/testcases/org/apache/poi/hsmf/data/attachment_test_msg.msg
 create mode 100644 src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index cdb6bdfe8..34b132702 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -37,6 +37,7 @@
 
 		<!-- Don't forget to update status.xml too! -->
         <release version="3.5-beta6" date="2009-??-??">
+           <action dev="POI-DEVELOPERS" type="add">47183 - Attachment support for HSMF</action>
            <action dev="POI-DEVELOPERS" type="fix">47154 - Handle the cell format @ as the same as General</action>
            <action dev="POI-DEVELOPERS" type="fix">47048 - Fixed evaluation of defined names with the 'complex' flag set</action>
            <action dev="POI-DEVELOPERS" type="fix">46953 - More tweaks to PageSettingsBlock parsing logic in Sheet constructor</action>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 2008d00b3..bfbefcfab 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.5-beta6" date="2009-??-??">
+           <action dev="POI-DEVELOPERS" type="add">47183 - Attachment support for HSMF</action>
            <action dev="POI-DEVELOPERS" type="fix">47154 - Handle the cell format @ as the same as General</action>
            <action dev="POI-DEVELOPERS" type="fix">47048 - Fixed evaluation of defined names with the 'complex' flag set</action>
            <action dev="POI-DEVELOPERS" type="fix">46953 - More tweaks to PageSettingsBlock parsing logic in Sheet constructor</action>
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
index 46bebadcc..760745e90 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
+++ b/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Map;
 
 import org.apache.poi.hsmf.datatypes.Chunk;
 import org.apache.poi.hsmf.datatypes.Chunks;
@@ -159,4 +160,13 @@ public class MAPIMessage {
 	public String getMessageClass() throws ChunkNotFoundException {
 		return getStringFromChunk(chunks.messageClass);
 	}	
+	
+	/**
+	 * Gets the message attachments.
+	 * 
+	 * @return a map containing attachment name (String) and data (ByteArrayInputStream)
+	 */
+	public Map getAttachmentFiles() {
+		return this.chunkParser.getAttachmentList();
+	}	
 }
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
new file mode 100644
index 000000000..549e2d194
--- /dev/null
+++ b/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
@@ -0,0 +1,45 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.hsmf.datatypes;
+
+/**
+ * Collection of convenence chunks for standard parts of the MSG file attachment.
+ */
+public class AttachmentChunks {
+
+	public static final String namePrefix = "__attach_version1.0_#";
+	
+	/* String parts of Outlook Messages Attachments that are currently known */
+
+	public ByteChunk attachData;
+	public StringChunk attachExtension;
+	public StringChunk attachFileName;
+	public StringChunk attachLongFileName;
+	public StringChunk attachMimeTag;
+	
+	private AttachmentChunks(boolean newStringType) {
+		attachData = new ByteChunk(0x3701, 0x0102);
+		attachExtension = new StringChunk(0x3703, newStringType);
+		attachFileName = new StringChunk(0x3704, newStringType);
+		attachLongFileName = new StringChunk(0x3707, newStringType);
+		attachMimeTag = new StringChunk(0x370E, newStringType);
+	}
+	
+	public static AttachmentChunks getInstance(boolean newStringType) {
+		return new AttachmentChunks(newStringType);
+	}
+}
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java b/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
new file mode 100644
index 000000000..2ecb3f08b
--- /dev/null
+++ b/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
@@ -0,0 +1,60 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+package org.apache.poi.hsmf.datatypes;
+
+import java.io.ByteArrayOutputStream;
+
+/**
+ * A Chunk made up of a ByteArrayOutputStream.
+ */
+
+public class ByteChunk extends Chunk {
+
+	private ByteArrayOutputStream value;
+	
+	/**
+	 * Creates a Byte Chunk, for either the old
+	 *  or new style of string chunk types.
+	 */
+	public ByteChunk(int chunkId, boolean newStyleString) {
+		this(chunkId, getStringType(newStyleString));
+	}
+	private static int getStringType(boolean newStyleString) {
+		if(newStyleString)
+			return Types.NEW_STRING;
+		return Types.OLD_STRING;
+	}
+	
+	/**
+	 * Create a Byte Chunk, with the specified
+	 *  type.
+	 */
+	public ByteChunk(int chunkId, int type) {
+		this.chunkId = chunkId;
+		this.type = type;
+	}
+	
+	public ByteArrayOutputStream getValueByteArray() {
+		return this.value;
+	}
+
+	public void setValue(ByteArrayOutputStream value) {
+		this.value = value;
+	}
+
+	
+}
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
index 108a28b4c..500428505 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
+++ b/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
@@ -17,12 +17,16 @@
 
 package org.apache.poi.hsmf.parsers;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
+import org.apache.poi.hsmf.datatypes.AttachmentChunks;
 import org.apache.poi.hsmf.datatypes.Chunk;
 import org.apache.poi.hsmf.datatypes.Chunks;
 import org.apache.poi.hsmf.datatypes.Types;
@@ -89,14 +93,30 @@ public class POIFSChunkParser {
 	 *  appropriate for the chunks we find in the file.
 	 */
 	public Chunks identifyChunks() {
+		return Chunks.getInstance(this.isNewChunkVersion(this.directoryMap));
+	}
+	
+	/**
+	 * Returns a list of the standard chunk types, as 
+	 *  appropriate for the chunks we find in the file attachment.
+	 */
+	private AttachmentChunks identifyAttachmentChunks(Map attachmentMap) {
+		return AttachmentChunks.getInstance(this.isNewChunkVersion(attachmentMap));
+	}
+	
+	/**
+	 * Return chunk version of the map in parameter
+	 */
+	private boolean isNewChunkVersion(Map map) {
 		// Are they of the old or new type of strings?
 		boolean hasOldStrings = false;
 		boolean hasNewStrings = false;
 		String oldStringEnd = Types.asFileEnding(Types.OLD_STRING);
 		String newStringEnd = Types.asFileEnding(Types.NEW_STRING);
 		
-		for(Iterator i = directoryMap.keySet().iterator(); i.hasNext();) {
+		for(Iterator i = map.keySet().iterator(); i.hasNext();) {
 			String entry = (String)i.next();
+			
 			if(entry.endsWith( oldStringEnd )) {
 				hasOldStrings = true;
 			}
@@ -108,9 +128,9 @@ public class POIFSChunkParser {
 		if(hasOldStrings && hasNewStrings) {
 			throw new IllegalStateException("Your file contains string chunks of both the old and new types. Giving up");
 		} else if(hasNewStrings) {
-			return Chunks.getInstance(true);
+			return true;
 		}
-		return Chunks.getInstance(false);
+		return false;
 	}
 	
 	/**
@@ -165,6 +185,39 @@ public class POIFSChunkParser {
 		return getDocumentNode(this.directoryMap, chunk);
 	}
 	
+	/**
+	 * 
+	 * @return a map containing attachment name (String) and data (ByteArrayInputStream)
+	 */
+	public Map getAttachmentList() {
+		Map attachments = new HashMap();
+		List attachmentList = new ArrayList();
+		for(Iterator i = directoryMap.keySet().iterator(); i.hasNext();) {
+			String entry = (String)i.next();
+			
+			if(entry.startsWith(AttachmentChunks.namePrefix)) {
+				String attachmentIdString = entry.replace(AttachmentChunks.namePrefix, "");
+				try {
+					int attachmentId = Integer.parseInt(attachmentIdString);
+					attachmentList.add((HashMap)directoryMap.get(entry));
+				} catch (NumberFormatException nfe) {
+					System.err.println("Invalid attachment id");
+				}
+			}
+		}
+		for (Iterator iterator = attachmentList.iterator(); iterator.hasNext();) {
+			HashMap AttachmentChunkMap = (HashMap) iterator.next();
+			AttachmentChunks attachmentChunks = this.identifyAttachmentChunks(AttachmentChunkMap);
+			try {
+				Chunk fileName = this.getDocumentNode(AttachmentChunkMap, attachmentChunks.attachLongFileName);
+				Chunk content = this.getDocumentNode(AttachmentChunkMap, attachmentChunks.attachData);
+				attachments.put(fileName.toString(), new ByteArrayInputStream(content.getValueByteArray().toByteArray()));
+			} catch (ChunkNotFoundException e) {
+				System.err.println("Invalid attachment chunk");
+			}
+		}
+		return attachments;
+	}
 	
 	/**
 	 * Processes an iterator returned by a POIFS call to getRoot().getEntries()
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/AllTests.java b/src/scratchpad/testcases/org/apache/poi/hsmf/AllTests.java
index e117ab89e..d6f072dfe 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/AllTests.java
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/AllTests.java
@@ -35,6 +35,7 @@ public class AllTests
     suite.addTestSuite(org.apache.poi.hsmf.model.TestSimpleFileRead.class);
     suite.addTestSuite(org.apache.poi.hsmf.model.TestOutlook30FileRead.class);
     suite.addTestSuite(org.apache.poi.hsmf.model.TestChunkData.class);
+    suite.addTestSuite(org.apache.poi.hsmf.model.TestFileWithAttachmentsRead.class);
     
     return suite;
   }
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/data/attachment_test_msg.msg b/src/scratchpad/testcases/org/apache/poi/hsmf/data/attachment_test_msg.msg
new file mode 100644
index 0000000000000000000000000000000000000000..ea82d915ed0357ccc3e473873fa2c43efb988d0b
GIT binary patch
literal 52224
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

literal 0
HcmV?d00001

diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java
new file mode 100644
index 000000000..df105dc0c
--- /dev/null
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java
@@ -0,0 +1,86 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hsmf.model;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.poi.hsmf.MAPIMessage;
+import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
+
+/**
+ * Tests to verify that we can read attachments from msg file
+ * 
+ * @author Nicolas Bureau
+ */
+public class TestFileWithAttachmentsRead extends TestCase {
+	private MAPIMessage mapiMessage;
+
+	/**
+	 * Initialize this test, load up the attachment_test_msg.msg mapi message.
+	 * 
+	 * @throws Exception
+	 */
+	public TestFileWithAttachmentsRead() throws IOException {
+		String dirname = System.getProperty("HSMF.testdata.path");
+		this.mapiMessage = new MAPIMessage(dirname + "/attachment_test_msg.msg");
+	}
+
+	/**
+	 * Test to see if we can retrieve attachments.
+	 * 
+	 * @throws ChunkNotFoundException
+	 * 
+	 */
+	// public void testReadDisplayCC() throws ChunkNotFoundException {
+	public void testRetrieveAttachments() {
+		Map attachmentsMap = mapiMessage.getAttachmentFiles();
+		int obtained = attachmentsMap.size();
+		int expected = 2;
+
+		TestCase.assertEquals(obtained, expected);
+	}
+
+	/**
+	 * Test to see if attachments are not empty.
+	 * 
+	 * @throws ChunkNotFoundException
+	 * 
+	 */
+	public void testReadAttachments() throws IOException {
+		Map attachmentsMap = mapiMessage.getAttachmentFiles();
+
+		for (Iterator iterator = attachmentsMap.keySet().iterator(); iterator.hasNext();) {
+			String fileName = (String) iterator.next();
+			ByteArrayInputStream fileStream = (ByteArrayInputStream) attachmentsMap.get(fileName);
+			ByteArrayOutputStream fileContent = new ByteArrayOutputStream();
+			
+			while (fileStream.available() > 0) {
+				fileContent.write(fileStream.read());
+			}
+			String obtained = new String(fileContent.toByteArray(), "UTF-8");
+			assertTrue(obtained.trim().length() > 0);
+		}
+	}
+
+}