From e452707fdfbd61be1e5633b516b653b7337e7865 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 29 May 2017 16:17:04 +0200 Subject: Reduced the messagetreeparser to aproximately what we actually require While in a much more managable state it's still not pretty. However, further refactoring can now gradually happen as we need to do further work on it. Things that should happen eventually: * Simplify the logic that creates the messageparts (we don't need the whole formatter plugin complexity) * Get rid of the nodehelper (let the parts hold the necessary data) * Get rid of partmetadata (let the part handleit) --- .../mimetreeparser/applicationpgpencrypted.cpp | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 framework/src/domain/mime/mimetreeparser/applicationpgpencrypted.cpp (limited to 'framework/src/domain/mime/mimetreeparser/applicationpgpencrypted.cpp') diff --git a/framework/src/domain/mime/mimetreeparser/applicationpgpencrypted.cpp b/framework/src/domain/mime/mimetreeparser/applicationpgpencrypted.cpp new file mode 100644 index 00000000..6d0089c2 --- /dev/null +++ b/framework/src/domain/mime/mimetreeparser/applicationpgpencrypted.cpp @@ -0,0 +1,68 @@ +/* + Copyright (c) 2016 Sandro Knauß + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library 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 Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "applicationpgpencrypted.h" + +#include "utils.h" + +#include "objecttreeparser.h" +#include "messagepart.h" + +#include + +#include + +#include "mimetreeparser_debug.h" + +using namespace MimeTreeParser; + +const ApplicationPGPEncryptedBodyPartFormatter *ApplicationPGPEncryptedBodyPartFormatter::self; + +const Interface::BodyPartFormatter *ApplicationPGPEncryptedBodyPartFormatter::create() +{ + if (!self) { + self = new ApplicationPGPEncryptedBodyPartFormatter(); + } + return self; +} + +MessagePart::Ptr ApplicationPGPEncryptedBodyPartFormatter::process(Interface::BodyPart &part) const +{ + KMime::Content *node(part.content()); + + if (node->decodedContent().trimmed() != "Version: 1") { + qCWarning(MIMETREEPARSER_LOG) << "Unknown PGP Version String:" << node->decodedContent().trimmed(); + } + + if (!part.content()->parent()) { + return MessagePart::Ptr(); + } + + KMime::Content *data = findTypeInDirectChilds(part.content()->parent(), "application/octet-stream"); + + if (!data) { + return MessagePart::Ptr(); //new MimeMessagePart(part.objectTreeParser(), node, false)); + } + + EncryptedMessagePart::Ptr mp(new EncryptedMessagePart(part.objectTreeParser(), + data->decodedText(), QGpgME::openpgp(), + part.nodeHelper()->fromAsString(data), node, data)); + mp->setIsEncrypted(true); + return mp; +} -- cgit v1.2.3