aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/attachmentHelper.cpp201
-rw-r--r--src/bodyPartAttachment.cpp164
-rw-r--r--src/messageParser.cpp181
3 files changed, 378 insertions, 168 deletions
diff --git a/src/attachmentHelper.cpp b/src/attachmentHelper.cpp
new file mode 100644
index 00000000..0388ae7c
--- /dev/null
+++ b/src/attachmentHelper.cpp
@@ -0,0 +1,201 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2005 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "vmime/attachmentHelper.hpp"
+
+#include "vmime/bodyPartAttachment.hpp"
+
+
+namespace vmime
+{
+
+
+// static
+const bool attachmentHelper::isBodyPartAnAttachment(ref <const bodyPart> part)
+{
+ try
+ {
+ const contentDispositionField& cdf = dynamic_cast<contentDispositionField&>
+ (*part->getHeader()->findField(fields::CONTENT_DISPOSITION));
+
+ if (cdf.getValue().getName() != contentDispositionTypes::INLINE)
+ return true;
+ }
+ catch (exceptions::no_such_field)
+ {
+ // No "Content-disposition" field: assume "attachment" if
+ // type is not "text/..." or "multipart/...".
+ mediaType type;
+
+ try
+ {
+ const contentTypeField& ctf = dynamic_cast<contentTypeField&>
+ (*part->getHeader()->findField(fields::CONTENT_TYPE));
+
+ type = ctf.getValue();
+ }
+ catch (exceptions::no_such_field)
+ {
+ // No "Content-type" field: assume "application/octet-stream".
+ type = mediaType(mediaTypes::APPLICATION,
+ mediaTypes::APPLICATION_OCTET_STREAM);
+ }
+
+ if (type.getType() != mediaTypes::TEXT &&
+ type.getType() != mediaTypes::MULTIPART)
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
+// static
+ref <const attachment>
+ attachmentHelper::getBodyPartAttachment(ref <const bodyPart> part)
+{
+ if (!isBodyPartAnAttachment(part))
+ return NULL;
+
+ return vmime::create <bodyPartAttachment>(part);
+}
+
+
+// static
+const std::vector <ref <const attachment> >
+ attachmentHelper::findAttachmentsInMessage(ref <const message> msg)
+{
+ return findAttachmentsInBodyPart(msg);
+}
+
+
+// static
+const std::vector <ref <const attachment> >
+ attachmentHelper::findAttachmentsInBodyPart(ref <const bodyPart> part)
+{
+ std::vector <ref <const attachment> > atts;
+
+ // Test this part
+ if (isBodyPartAnAttachment(part))
+ {
+ atts.push_back(getBodyPartAttachment(part));
+ }
+ // Find in sub-parts
+ else
+ {
+ ref <const body> bdy = part->getBody();
+
+ for (int i = 0 ; i < bdy->getPartCount() ; ++i)
+ {
+ std::vector <ref <const attachment> > partAtts =
+ findAttachmentsInBodyPart(bdy->getPartAt(i));
+
+ for (unsigned int j = 0 ; j < partAtts.size() ; ++i)
+ atts.push_back(partAtts[j]);
+ }
+ }
+
+ return atts;
+}
+
+
+// static
+void attachmentHelper::addAttachment(ref <message> msg, ref <attachment> att)
+{
+ // We simply search for a "multipart/mixed" part. If no one exists,
+ // create it in the root part. This (very simple) algorithm should
+ // work in the most cases.
+
+ vmime::mediaType mpMixed(vmime::mediaTypes::MULTIPART,
+ vmime::mediaTypes::MULTIPART_MIXED);
+
+ ref <bodyPart> part = findBodyPart(msg, mpMixed);
+
+ if (part == NULL) // create it
+ {
+ // Create a new container part for the parts that were in
+ // the root part of the message
+ ref <bodyPart> container = vmime::create <bodyPart>();
+
+ try
+ {
+ container->getHeader()->ContentType()->
+ setValue(msg->getHeader()->ContentType()->getValue());
+ }
+ catch (exceptions::no_such_field&)
+ {
+ // Ignore
+ }
+
+ msg->getHeader()->removeAllFields(vmime::fields::CONTENT_DISPOSITION);
+ msg->getHeader()->removeAllFields(vmime::fields::CONTENT_TRANSFER_ENCODING);
+
+ // Move parts from the root part to this new part
+ const std::vector <ref <bodyPart> > partList =
+ msg->getBody()->getPartList();
+
+ msg->getBody()->removeAllParts();
+
+ for (unsigned int i = 0 ; i < partList.size() ; ++i)
+ container->getBody()->appendPart(partList[i]);
+
+ // Set the root part to 'multipart/mixed'
+ msg->getHeader()->ContentType()->setValue(mpMixed);
+
+ msg->getBody()->appendPart(container);
+
+ part = msg;
+ }
+
+ // Generate the attachment part
+ att->generateIn(*part);
+}
+
+
+// static
+ref <bodyPart> attachmentHelper::findBodyPart
+ (ref <bodyPart> part, const mediaType& type)
+{
+ if (part->getBody()->getContentType() == type)
+ return part;
+
+ // Try in sub-parts
+ ref <body> bdy = part->getBody();
+
+ for (int i = 0 ; i < bdy->getPartCount() ; ++i)
+ {
+ ref <bodyPart> found =
+ findBodyPart(bdy->getPartAt(i), type);
+
+ if (found != NULL)
+ return found;
+ }
+
+ return NULL;
+}
+
+
+} // vmime
+
diff --git a/src/bodyPartAttachment.cpp b/src/bodyPartAttachment.cpp
new file mode 100644
index 00000000..adf605d3
--- /dev/null
+++ b/src/bodyPartAttachment.cpp
@@ -0,0 +1,164 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2005 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "vmime/bodyPartAttachment.hpp"
+
+
+namespace vmime
+{
+
+
+bodyPartAttachment::bodyPartAttachment(ref <const bodyPart> part)
+ : m_part(part)
+{
+}
+
+
+const mediaType bodyPartAttachment::getType() const
+{
+ mediaType type;
+
+ try
+ {
+ type = getContentType()->getValue();
+ }
+ catch (exceptions::no_such_field&)
+ {
+ // No "Content-type" field: assume "application/octet-stream".
+ type = mediaType(mediaTypes::APPLICATION,
+ mediaTypes::APPLICATION_OCTET_STREAM);
+ }
+
+ return type;
+}
+
+
+const word bodyPartAttachment::getName() const
+{
+ word name;
+
+ // Try the 'filename' parameter of 'Content-Disposition' field
+ try
+ {
+ name = getContentDisposition()->getFilename();
+ }
+ catch (exceptions::no_such_field&)
+ {
+ // No 'Content-Disposition' field
+ }
+ catch (exceptions::no_such_parameter&)
+ {
+ // No 'filename' parameter
+ }
+
+ // Try the 'name' parameter of 'Content-Type' field
+ if (name.getBuffer().empty())
+ {
+ try
+ {
+ ref <defaultParameter> prm = getContentType()->
+ findParameter("name").dynamicCast <defaultParameter>();
+
+ if (prm != NULL)
+ name = prm->getValue();
+ }
+ catch (exceptions::no_such_field&)
+ {
+ // No 'Content-Type' field
+ }
+ catch (exceptions::no_such_parameter&)
+ {
+ // No attachment name available
+ }
+ }
+
+ return name;
+}
+
+
+const text bodyPartAttachment::getDescription() const
+{
+ text description;
+
+ try
+ {
+ const textField& cd = dynamic_cast <textField&>
+ (*getHeader()->findField(fields::CONTENT_DESCRIPTION));
+
+ description = cd.getValue();
+ }
+ catch (exceptions::no_such_field&)
+ {
+ // No description available.
+ }
+
+ return description;
+}
+
+
+const encoding bodyPartAttachment::getEncoding() const
+{
+ return m_part->getBody()->getEncoding();
+}
+
+
+const ref <const contentHandler> bodyPartAttachment::getData() const
+{
+ return m_part->getBody()->getContents();
+}
+
+
+ref <const object> bodyPartAttachment::getPart() const
+{
+ return m_part;
+}
+
+
+ref <const header> bodyPartAttachment::getHeader() const
+{
+ return m_part->getHeader();
+}
+
+
+ref <const contentDispositionField> bodyPartAttachment::getContentDisposition() const
+{
+ return getHeader()->findField(fields::CONTENT_DISPOSITION).
+ dynamicCast <const contentDispositionField>();
+}
+
+
+ref <const contentTypeField> bodyPartAttachment::getContentType() const
+{
+ return getHeader()->findField(fields::CONTENT_TYPE).
+ dynamicCast <const contentTypeField>();
+}
+
+
+void bodyPartAttachment::generateIn(bodyPart& /* parent */) const
+{
+ // Not used
+}
+
+
+} // vmime
+
diff --git a/src/messageParser.cpp b/src/messageParser.cpp
index b6e11fb7..4a96cf10 100644
--- a/src/messageParser.cpp
+++ b/src/messageParser.cpp
@@ -23,6 +23,8 @@
#include "vmime/messageParser.hpp"
+#include "vmime/attachmentHelper.hpp"
+
#include "vmime/defaultAttachment.hpp"
#include "vmime/textPartFactory.hpp"
@@ -33,14 +35,14 @@ namespace vmime
messageParser::messageParser(const string& buffer)
{
- vmime::message msg;
- msg.parse(buffer);
+ ref <message> msg = vmime::create <message>();
+ msg->parse(buffer);
parse(msg);
}
-messageParser::messageParser(const message& msg)
+messageParser::messageParser(ref <const message> msg)
{
parse(msg);
}
@@ -51,13 +53,13 @@ messageParser::~messageParser()
}
-void messageParser::parse(const message& msg)
+void messageParser::parse(ref <const message> msg)
{
// Header fields (if field is present, copy its value, else do nothing)
#ifndef VMIME_BUILDING_DOC
#define TRY_FIELD(var, type, name) \
- try { var = dynamic_cast<type&>(*msg.getHeader()->findField(name)).getValue(); } \
+ try { var = dynamic_cast<type&>(*msg->getHeader()->findField(name)).getValue(); } \
catch (exceptions::no_such_field) { }
TRY_FIELD(m_from, mailboxField, fields::FROM);
@@ -76,7 +78,7 @@ void messageParser::parse(const message& msg)
try
{
vmime::relayField& recv = dynamic_cast <vmime::relayField&>
- (*msg.getHeader()->findField(fields::RECEIVED));
+ (*msg->getHeader()->findField(fields::RECEIVED));
m_date = recv.getValue().getDate();
}
@@ -85,7 +87,7 @@ void messageParser::parse(const message& msg)
try
{
vmime::dateField& date = dynamic_cast <vmime::dateField&>
- (*msg.getHeader()->findField(fields::DATE));
+ (*msg->getHeader()->findField(fields::DATE));
m_date = date.getValue();
}
@@ -99,151 +101,13 @@ void messageParser::parse(const message& msg)
findAttachments(msg);
// Text parts
- findTextParts(msg, msg);
+ findTextParts(*msg, *msg);
}
-void messageParser::findAttachments(const bodyPart& part)
+void messageParser::findAttachments(ref <const message> msg)
{
- // We simply search for parts that are not "Content-disposition: inline".
- for (int i = 0 ; i < part.getBody()->getPartCount() ; ++i)
- {
- const bodyPart& p = *part.getBody()->getPartAt(i);
- const header& hdr = *p.getHeader();
- const body& bdy = *p.getBody();
-
- // Is this part an attachment?
- bool isAttachment = false;
- const contentDispositionField* contentDispField = NULL;
-
- try
- {
- const contentDispositionField& cdf = dynamic_cast<contentDispositionField&>
- (*hdr.findField(fields::CONTENT_DISPOSITION));
-
- if (cdf.getValue().getName() != contentDispositionTypes::INLINE)
- {
- contentDispField = &cdf;
- isAttachment = true;
- }
- }
- catch (exceptions::no_such_field)
- {
- // No "Content-disposition" field: assume "attachment" if
- // type is not "text/..." or "multipart/...".
- mediaType type;
-
- try
- {
- const contentTypeField& ctf = dynamic_cast<contentTypeField&>
- (*hdr.findField(fields::CONTENT_TYPE));
-
- type = ctf.getValue();
- }
- catch (exceptions::no_such_field)
- {
- // No "Content-type" field: assume "application/octet-stream".
- type = mediaType(mediaTypes::APPLICATION,
- mediaTypes::APPLICATION_OCTET_STREAM);
- }
-
- if (type.getType() != mediaTypes::TEXT &&
- type.getType() != mediaTypes::MULTIPART)
- {
- isAttachment = true;
- }
- }
-
- if (isAttachment)
- {
- // Determine the media type of this attachment
- const contentTypeField* contTypeField = NULL;
- mediaType type;
-
- try
- {
- const contentTypeField& ctf = dynamic_cast<contentTypeField&>
- (*hdr.findField(fields::CONTENT_TYPE));
-
- type = ctf.getValue();
-
- contTypeField = &ctf;
- }
- catch (exceptions::no_such_field)
- {
- // No "Content-type" field: assume "application/octet-stream".
- type = mediaType(mediaTypes::APPLICATION,
- mediaTypes::APPLICATION_OCTET_STREAM);
- }
-
- // Get the description (if available)
- text description;
-
- try
- {
- const textField& cd = dynamic_cast<textField&>
- (*hdr.findField(fields::CONTENT_DESCRIPTION));
-
- description = cd.getValue();
- }
- catch (exceptions::no_such_field)
- {
- // No description available.
- }
-
- // Get the name/filename (if available)
- word name;
-
- // -- try the 'filename' parameter of 'Content-Disposition' field
- if (contentDispField != NULL)
- {
- try
- {
- name = contentDispField->getFilename();
- }
- catch (exceptions::no_such_parameter)
- {
- // No 'filename' parameter
- }
- }
-
- // -- try the 'name' parameter of 'Content-Type' field
- if (name.getBuffer().empty() && contTypeField != NULL)
- {
- try
- {
- ref <defaultParameter> prm = contTypeField->
- findParameter("name").dynamicCast <defaultParameter>();
-
- if (prm != NULL)
- name = prm->getValue();
- }
- catch (exceptions::no_such_parameter)
- {
- // No attachment name available.
- }
- }
-
- // Construct the attachment object
- ref <attachment> attach = vmime::create <defaultAttachment>
- (bdy.getContents()->clone().dynamicCast <contentHandler>(),
- bdy.getEncoding(), type, description, name);
-
- if (contentDispField != NULL)
- {
- m_attachInfo.insert(std::map <attachment*, ref <contentDispositionField> >::
- value_type(attach.get(), contentDispField->clone().
- dynamicCast <contentDispositionField>()));
- }
-
- // Add the attachment to the list
- m_attach.push_back(attach);
- }
-
- // Try to find attachments in sub-parts
- if (bdy.getPartCount())
- findAttachments(p);
- }
+ m_attach = attachmentHelper::findAttachmentsInMessage(msg);
}
@@ -357,15 +221,6 @@ bool messageParser::findSubTextParts(const bodyPart& msg, const bodyPart& part)
}
-const ref <const contentDispositionField> messageParser::getAttachmentInfo(const ref <const attachment> a) const
-{
- std::map <attachment*, ref <contentDispositionField> >::const_iterator
- it = m_attachInfo.find(ref <attachment>(a.constCast <attachment>()).get());
-
- return (it != m_attachInfo.end() ? (*it).second : NULL);
-}
-
-
const mailbox& messageParser::getExpeditor() const
{
return (m_from);
@@ -404,17 +259,7 @@ const datetime& messageParser::getDate() const
const std::vector <ref <const attachment> > messageParser::getAttachmentList() const
{
- std::vector <ref <const attachment> > res;
-
- res.reserve(m_attach.size());
-
- for (std::vector <ref <attachment> >::const_iterator it = m_attach.begin() ;
- it != m_attach.end() ; ++it)
- {
- res.push_back(*it);
- }
-
- return (res);
+ return m_attach;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 09:13:18 +0000