From d33b10225943b8c292f4b9f2734e578cb8e96f30 Mon Sep 17 00:00:00 2001
From: Guenter Obiltschnig <guenter.obiltschnig@appinf.com>
Date: Sat, 27 Feb 2016 22:04:54 +0100
Subject: [PATCH] fixed GH #696: bug in parsing name of attachment

---
 Net/src/MailMessage.cpp | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp
index 9856f647f..10b3fbcf0 100644
--- a/Net/src/MailMessage.cpp
+++ b/Net/src/MailMessage.cpp
@@ -94,18 +94,25 @@ namespace
 						cte = MailMessage::ENCODING_BASE64;
 				}
 
+				std::string contentType = header.get(MailMessage::HEADER_CONTENT_TYPE, "");
+				std::string contentDisp = header.get(MailMessage::HEADER_CONTENT_DISPOSITION, "");
+				std::string filename;
+				if (!contentDisp.empty())
+					filename = getFileNameFromContentDisposition(contentDisp);
+				if (filename.empty()) 
+					filename = getNameFromContentType(contentType);
+				PartSource* pPS = _pMsg->createPartStore(tmp, contentType, filename);
+				poco_check_ptr (pPS);
 				NameValueCollection::ConstIterator it = header.begin();
 				NameValueCollection::ConstIterator end = header.end();
-				PartSource* pPS = _pMsg->createPartStore(tmp, 
-					header[MailMessage::HEADER_CONTENT_TYPE], 
-					getFileNameFromDisp(it->second));
-				poco_check_ptr (pPS);
 				for (; it != end; ++it)
 				{
 					if (MailMessage::HEADER_CONTENT_DISPOSITION == it->first)
 					{
-						if (it->second == "inline") _pMsg->addContent(pPS, cte);
-						else _pMsg->addAttachment("", pPS, cte);
+						if (it->second == "inline") 
+							_pMsg->addContent(pPS, cte);
+						else 
+							_pMsg->addAttachment("", pPS, cte);
 					}
 					
 					pPS->headers().set(it->first, it->second);
@@ -114,7 +121,7 @@ namespace
 		}
 		
 	private:
-		std::string getFileNameFromDisp(const std::string& str)
+		std::string getFileNameFromContentDisposition(const std::string& str)
 		{
 			StringTokenizer st(str, ";=", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 			StringTokenizer::Iterator it = st.begin();
@@ -129,6 +136,21 @@ namespace
 			return "";
 		}
 
+		std::string getNameFromContentType(const std::string& str)
+		{
+			StringTokenizer st(str, ";=", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+			StringTokenizer::Iterator it = st.begin();
+			StringTokenizer::Iterator end = st.end();
+			for (; it != end; ++it) { if (*it == "name") break; }
+			if (it != end)
+			{
+				++it;
+				if (it == end) return "";
+				return *it;
+			}
+			return "";
+		}
+
 		MailMessage* _pMsg;
 	};