diff options
23 files changed, 506 insertions, 139 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a03d0f95..19035b30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,6 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY build/lib) SET(CMAKE_VERBOSE_MAKEFILE ON) -# Project -PROJECT(vmime) - # Package version number SET(VMIME_VERSION_MAJOR 0) SET(VMIME_VERSION_MINOR 9) @@ -65,8 +62,16 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSION_CURRENT}.${VMIME_API_VERSION_REVISION} ############################################################################## # VMime Library +# Project +PROJECT( + vmime + LANGUAGES CXX C + VERSION ${VMIME_VERSION} +) + # Set base name SET(VMIME_LIBRARY_NAME vmime) +SET(VMIME_LIBRARY_VENDOR Kisli) # Enable C++11 SET(CMAKE_CXX_STANDARD 11) @@ -336,26 +341,31 @@ OPTION( # Package information SET(VMIME_PACKAGE_NAME ${VMIME_LIBRARY_NAME}) +SET(VMIME_PACKAGE_VENDOR ${VMIME_LIBRARY_VENDOR}) SET(VMIME_PACKAGE_VERSION ${VMIME_VERSION}) SET(VMIME_PACKAGE_CONTACT "Vincent Richard <[email protected]>") SET(VMIME_PACKAGE_DESCRIPTION "VMime C++ Mail Library (http://www.vmime.org)") +SET(VMIME_PACKAGE_HOMEPAGE_URL "https://www.vmime.org") SET(CPACK_PACKAGE_NAME "${VMIME_PACKAGE_NAME}") +SET(CPACK_PACKAGE_VENDOR "${VMIME_PACKAGE_VENDOR}") SET(CPACK_PACKAGE_CONTACT "${VMIME_PACKAGE_CONTACT}") SET(CPACK_PACKAGE_DESCRIPTION "${VMIME_PACKAGE_DESCRIPTION}") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CPACK_PACKAGE_DESCRIPTION}") +SET(CPACK_PACKAGE_HOMEPAGE_URL "${VMIME_PACKAGE_HOMEPAGE_URL}") SET(CPACK_PACKAGE_VERSION "${VMIME_PACKAGE_VERSION}") # Package settings -SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) - IF(APPLE) # CPack/PackageManager won't allow file without recognized extension # to be used as license file. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/COPYING" "${CMAKE_BINARY_DIR}/COPYING.txt" COPYONLY) SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/COPYING.txt") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/README" "${CMAKE_BINARY_DIR}/README.txt" COPYONLY) + SET(CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README.txt") ELSE() SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") + SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README") ENDIF(APPLE) SET(CPACK_SOURCE_GENERATOR TGZ) diff --git a/COPYING.OpenSSL b/COPYING.OpenSSL new file mode 100644 index 00000000..bf205f5f --- /dev/null +++ b/COPYING.OpenSSL @@ -0,0 +1,26 @@ +OpenSSL License Exception +------------------------- + +Copyright (C) 2002-2020, 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 3 (GPL) as published by +the Free Software Foundation. +The full text of the GPL can be found in the COPYING file. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program against the OpenSSL library +according to the terms described here: + +You have permission to copy, modify, propagate, and distribute a work +formed by combining OpenSSL with VMime, or a work derivative of such a +combination, even if such copying, modification, propagation, or +distribution would otherwise violate the terms of the GPL. You must +comply with the GPL in all respects for all of the code used other than +OpenSSL. + +You may include this OpenSSL exception and its grant of permissions when +you distribute VMime. Inclusion of this notice with such a distribution +constitutes a grant of such permission. If you do not wish to grant these +permissions, delete this file. + diff --git a/src/vmime/net/folderAttributes.hpp b/src/vmime/net/folderAttributes.hpp index b91347b5..715b72a8 100644 --- a/src/vmime/net/folderAttributes.hpp +++ b/src/vmime/net/folderAttributes.hpp @@ -67,6 +67,7 @@ public: enum SpecialUses { SPECIALUSE_NONE, /**< User folder, no special use (or unknown). */ SPECIALUSE_ALL, /**< Virtual folder containing all messages. */ + SPECIALUSE_INBOX, /**< Inbox. */ SPECIALUSE_ARCHIVE, /**< Folder is used to archives messages (server-dependent). */ SPECIALUSE_DRAFTS, /**< Folder is used to hold draft messages - typically, messages that are being composed but have not yet been sent. */ diff --git a/src/vmime/net/imap/IMAPConnection.cpp b/src/vmime/net/imap/IMAPConnection.cpp index 2ea48e34..df3da1c3 100644 --- a/src/vmime/net/imap/IMAPConnection.cpp +++ b/src/vmime/net/imap/IMAPConnection.cpp @@ -92,7 +92,6 @@ IMAPConnection::IMAPConnection( } m_parser = make_shared <IMAPParser>(); - m_parser->setTag(m_tag); m_parser->setTracer(m_tracer); } @@ -287,7 +286,7 @@ void IMAPConnection::authenticate() { shared_ptr <IMAPConnection> conn = dynamicCast <IMAPConnection>(shared_from_this()); IMAPCommand::LOGIN(username, password)->send(conn); - scoped_ptr <IMAPParser::response> resp(m_parser->readResponse()); + scoped_ptr <IMAPParser::response> resp(m_parser->readResponse(*m_tag)); if (resp->isBad()) { @@ -409,7 +408,7 @@ void IMAPConnection::authenticateSASL() { for (bool cont = true ; cont ; ) { - scoped_ptr <IMAPParser::response> resp(m_parser->readResponse()); + scoped_ptr <IMAPParser::response> resp(m_parser->readResponse(*m_tag)); if (resp->response_done && resp->response_done->response_tagged && @@ -522,7 +521,7 @@ void IMAPConnection::startTLS() { IMAPCommand::STARTTLS()->send(dynamicCast <IMAPConnection>(shared_from_this())); - scoped_ptr <IMAPParser::response> resp(m_parser->readResponse()); + scoped_ptr <IMAPParser::response> resp(m_parser->readResponse(*m_tag)); if (resp->isBad() || resp->response_done->response_tagged-> resp_cond_state->status != IMAPParser::resp_cond_state::OK) { @@ -624,7 +623,7 @@ void IMAPConnection::fetchCapabilities() { IMAPCommand::CAPABILITY()->send(dynamicCast <IMAPConnection>(shared_from_this())); - scoped_ptr <IMAPParser::response> resp(m_parser->readResponse()); + scoped_ptr <IMAPParser::response> resp(m_parser->readResponse(*m_tag)); if (resp->response_done->response_tagged-> resp_cond_state->status == IMAPParser::resp_cond_state::OK) { @@ -733,7 +732,7 @@ void IMAPConnection::initHierarchySeparator() { IMAPCommand::LIST("", "")->send(dynamicCast <IMAPConnection>(shared_from_this())); - scoped_ptr <IMAPParser::response> resp(m_parser->readResponse()); + scoped_ptr <IMAPParser::response> resp(m_parser->readResponse(*m_tag)); if (resp->isBad() || resp->response_done->response_tagged-> resp_cond_state->status != IMAPParser::resp_cond_state::OK) { @@ -801,7 +800,7 @@ void IMAPConnection::sendRaw(const byte_t* buffer, const size_t count) { IMAPParser::response* IMAPConnection::readResponse(IMAPParser::literalHandler* lh) { - return m_parser->readResponse(lh); + return m_parser->readResponse(*m_tag, lh); } diff --git a/src/vmime/net/imap/IMAPFolder.cpp b/src/vmime/net/imap/IMAPFolder.cpp index e3bc958f..98bc05d8 100644 --- a/src/vmime/net/imap/IMAPFolder.cpp +++ b/src/vmime/net/imap/IMAPFolder.cpp @@ -244,6 +244,7 @@ void IMAPFolder::open(const int mode, bool failIfModeIsNotAvailable) { IMAPUtils::mailboxFlagsToFolderAttributes( connection, + m_path, *responseData->mailbox_data->mailbox_flag_list, *m_attribs ); @@ -527,6 +528,7 @@ int IMAPFolder::testExistAndGetType() { // Get the folder type/flags at the same time IMAPUtils::mailboxFlagsToFolderAttributes( m_connection, + m_path, *mailboxData->mailbox_list->mailbox_flag_list, attribs ); @@ -755,6 +757,7 @@ std::vector <shared_ptr <folder> > IMAPFolder::getFolders(const bool recursive) IMAPUtils::mailboxFlagsToFolderAttributes( m_connection, + path, *mailboxData->mailbox_list->mailbox_flag_list, *attribs ); @@ -1058,7 +1061,7 @@ void IMAPFolder::setMessageFlags( const std::vector <string> flagList = IMAPUtils::messageFlagList(flags); - if (!flagList.empty()) { + if ((mode == message::FLAG_MODE_SET) || !flagList.empty()) { // Send the request IMAPCommand::STORE(msgs, mode, flagList)->send(m_connection); @@ -1523,6 +1526,7 @@ void IMAPFolder::processStatusUpdate(const IMAPParser::response* resp) { folderAttributes attribs; IMAPUtils::mailboxFlagsToFolderAttributes( m_connection, + m_path, *(*it)->response_data->mailbox_data->mailbox_list->mailbox_flag_list, attribs ); diff --git a/src/vmime/net/imap/IMAPMessagePart.cpp b/src/vmime/net/imap/IMAPMessagePart.cpp index 37ccfd97..746fe9a4 100644 --- a/src/vmime/net/imap/IMAPMessagePart.cpp +++ b/src/vmime/net/imap/IMAPMessagePart.cpp @@ -95,6 +95,13 @@ IMAPMessagePart::IMAPMessagePart( } } } + + if (part->body_ext_1part && part->body_ext_1part->body_fld_dsp) { + auto *cdisp = part->body_ext_1part->body_fld_dsp->str(); + if (cdisp) { + m_dispType = contentDisposition(cdisp->value); + } + } } m_structure = null; @@ -133,6 +140,12 @@ const mediaType& IMAPMessagePart::getType() const { } +const contentDisposition &IMAPMessagePart::getDisposition() const { + + return m_dispType; +} + + size_t IMAPMessagePart::getSize() const { return m_size; diff --git a/src/vmime/net/imap/IMAPMessagePart.hpp b/src/vmime/net/imap/IMAPMessagePart.hpp index 4a636dd8..34ea1725 100644 --- a/src/vmime/net/imap/IMAPMessagePart.hpp +++ b/src/vmime/net/imap/IMAPMessagePart.hpp @@ -66,6 +66,7 @@ public: shared_ptr <const IMAPMessagePart> getParent() const; const mediaType& getType() const; + const contentDisposition &getDisposition() const; size_t getSize() const; size_t getNumber() const; string getName() const; @@ -92,6 +93,7 @@ private: size_t m_size; string m_name; mediaType m_mediaType; + contentDisposition m_dispType; }; diff --git a/src/vmime/net/imap/IMAPParser.hpp b/src/vmime/net/imap/IMAPParser.hpp index 76019d2e..281fcb67 100644 --- a/src/vmime/net/imap/IMAPParser.hpp +++ b/src/vmime/net/imap/IMAPParser.hpp @@ -271,24 +271,13 @@ public: } + ~IMAPParser() { - /** Set the tag currently used by this parser. - * - * @param tag IMAP command tag - */ - void setTag(const shared_ptr <IMAPTag>& tag) { - - m_tag = tag; + for (auto it = m_pendingResponses.begin() ; it != m_pendingResponses.end() ; ++it) { + delete it->second; + } } - /** Return the tag currently used by this parser. - * - * @return IMAP command tag - */ - shared_ptr <const IMAPTag> getTag() const { - - return m_tag.lock(); - } /** Set the socket currently used by this parser to receive data * from server. @@ -613,13 +602,12 @@ public: DECLARE_COMPONENT(xtag) - bool parseImpl(IMAPParser& parser, string& line, size_t* currentPos) { + bool parseImpl(IMAPParser& /* parser */, string& line, size_t* currentPos) { size_t pos = *currentPos; bool end = false; - string tagString; tagString.reserve(10); while (!end && pos < line.length()) { @@ -654,14 +642,11 @@ public: } } - if (tagString == string(*parser.getTag())) { - *currentPos = pos; - return true; - } else { - // Invalid tag - return false; - } + *currentPos = pos; + return true; } + + string tagString; }; @@ -1141,7 +1126,7 @@ public: value = text->value; } - DEBUG_FOUND("string[quoted]", "<length=" << m_value.length() << ", value='" << m_value << "'>"); + DEBUG_FOUND("string[quoted]", "<length=" << value.length() << ", value='" << value << "'>"); // literal ::= "{" number "}" CRLF *CHAR8 } else { @@ -1660,8 +1645,12 @@ public: } else { - type = KEYWORD_OR_EXTENSION; - VIMAP_PARSER_GET(atom, flag_keyword); + if (!parser.isStrict() && VIMAP_PARSER_TRY_CHECK(one_char <'*'> )) { + type = STAR; // map "*" to "\*" + } else { + type = KEYWORD_OR_EXTENSION; + VIMAP_PARSER_GET(atom, flag_keyword); + } } *currentPos = pos; @@ -4389,7 +4378,7 @@ public: size_t pos = *currentPos; - VIMAP_PARSER_CHECK(IMAPParser::xtag); + VIMAP_PARSER_GET(IMAPParser::xtag, tag); VIMAP_PARSER_CHECK(SPACE); VIMAP_PARSER_GET(IMAPParser::resp_cond_state, resp_cond_state); @@ -4409,6 +4398,7 @@ public: } + std::unique_ptr <IMAPParser::xtag> tag; std::unique_ptr <IMAPParser::resp_cond_state> resp_cond_state; }; @@ -4569,22 +4559,53 @@ public: // The main functions used to parse a response // - response* readResponse(literalHandler* lh = NULL) { + response* readResponse(const IMAPTag& tag, literalHandler* lh = NULL) { - size_t pos = 0; - string line = readLine(); + while (true) { - m_literalHandler = lh; - response* resp = get <response>(line, &pos); - m_literalHandler = NULL; + auto it = m_pendingResponses.find(std::string(tag)); - if (!resp) { - throw exceptions::invalid_response("", m_errorResponseLine); - } + if (it != m_pendingResponses.end()) { + auto* resp = it->second; + m_pendingResponses.erase(it); + return resp; + } - resp->setErrorLog(lastLine()); + size_t pos = 0; + string line = readLine(); - return (resp); + m_literalHandler = lh; + response* resp = get <response>(line, &pos); + m_literalHandler = NULL; + + if (!resp) { + throw exceptions::invalid_response("", m_errorResponseLine); + } + + resp->setErrorLog(lastLine()); + + // If there is a continue_req, return the response immediately + for (auto &respData : resp->continue_req_or_response_data) { + if (respData->continue_req) { + return resp; + } + } + + // Else, return response if the tag is the one we expect + if (resp->response_done && resp->response_done->response_tagged && + resp->response_done->response_tagged->tag) { + + if (tag == resp->response_done->response_tagged->tag->tagString) { + return resp; + } else { + // Not our response tag, cache it for later + m_pendingResponses[resp->response_done->response_tagged->tag->tagString] = resp; + } + } else { + // Untagged response + return resp; + } + } } @@ -4740,7 +4761,6 @@ public: private: - weak_ptr <IMAPTag> m_tag; weak_ptr <socket> m_socket; shared_ptr <tracer> m_tracer; @@ -4758,6 +4778,8 @@ private: string m_lastLine; string m_errorResponseLine; + std::map <std::string, response*> m_pendingResponses; + public: /** Read a line from the input buffer. The function blocks until a diff --git a/src/vmime/net/imap/IMAPTag.cpp b/src/vmime/net/imap/IMAPTag.cpp index 69f48477..52cd2123 100644 --- a/src/vmime/net/imap/IMAPTag.cpp +++ b/src/vmime/net/imap/IMAPTag.cpp @@ -85,6 +85,30 @@ const IMAPTag IMAPTag::operator++(int) { } +bool IMAPTag::operator<(const IMAPTag &other) const { + + return m_number < other.m_number; +} + + +bool IMAPTag::operator==(const IMAPTag &other) const { + + return m_number == other.m_number; +} + + +bool IMAPTag::operator!=(const IMAPTag &other) const { + + return m_number != other.m_number; +} + + +bool IMAPTag::operator==(const std::string &tag) const { + + return m_tag == tag; +} + + int IMAPTag::maximumNumber() const { return sm_maxNumber - 1; diff --git a/src/vmime/net/imap/IMAPTag.hpp b/src/vmime/net/imap/IMAPTag.hpp index d4292fde..cbab9429 100644 --- a/src/vmime/net/imap/IMAPTag.hpp +++ b/src/vmime/net/imap/IMAPTag.hpp @@ -44,11 +44,11 @@ class VMIME_EXPORT IMAPTag : public object { private: IMAPTag(const int number); - IMAPTag(const IMAPTag& tag); public: IMAPTag(); + IMAPTag(const IMAPTag& tag); IMAPTag& operator++(); // ++IMAPTag const IMAPTag operator++(int); // IMAPTag++ @@ -58,6 +58,12 @@ public: operator string() const; + bool operator<(const IMAPTag &other) const; + bool operator==(const IMAPTag &other) const; + bool operator!=(const IMAPTag &other) const; + + bool operator==(const std::string &tag) const; + private: void generate(); diff --git a/src/vmime/net/imap/IMAPUtils.cpp b/src/vmime/net/imap/IMAPUtils.cpp index 273531fd..59b1e181 100644 --- a/src/vmime/net/imap/IMAPUtils.cpp +++ b/src/vmime/net/imap/IMAPUtils.cpp @@ -390,6 +390,7 @@ const folder::path::component IMAPUtils::fromModifiedUTF7(const string& text) { // static void IMAPUtils::mailboxFlagsToFolderAttributes( const shared_ptr <const IMAPConnection>& cnt, + const folder::path &path, const IMAPParser::mailbox_flag_list& list, folderAttributes& attribs ) { @@ -471,6 +472,10 @@ void IMAPUtils::mailboxFlagsToFolderAttributes( } } + if (path.getSize() == 1 && path.getLastComponent().getBuffer() == "INBOX") { + specialUse = folderAttributes::SPECIALUSE_INBOX; + } + attribs.setSpecialUse(specialUse); attribs.setType(type); attribs.setFlags(flags); diff --git a/src/vmime/net/imap/IMAPUtils.hpp b/src/vmime/net/imap/IMAPUtils.hpp index 123bc8c7..d4bd1356 100644 --- a/src/vmime/net/imap/IMAPUtils.hpp +++ b/src/vmime/net/imap/IMAPUtils.hpp @@ -70,11 +70,13 @@ public: /** Parse mailbox flags and fill in folder attributes. * * @param cnt reference to current IMAP connection (for testing capabilities) + * @param path folder full path * @param list list of mailbox flags * @param attribs reference to an object holding folder attributes */ static void mailboxFlagsToFolderAttributes( const shared_ptr <const IMAPConnection>& cnt, + const folder::path &path, const IMAPParser::mailbox_flag_list& list, folderAttributes& attribs ); diff --git a/src/vmime/net/maildir/maildirMessagePart.cpp b/src/vmime/net/maildir/maildirMessagePart.cpp index 9d30e24d..7448d7ee 100644 --- a/src/vmime/net/maildir/maildirMessagePart.cpp +++ b/src/vmime/net/maildir/maildirMessagePart.cpp @@ -54,6 +54,11 @@ maildirMessagePart::maildirMessagePart( m_size = part.getBody()->getContents()->getLength(); m_mediaType = part.getBody()->getContentType(); + + auto cdispField = part.getHeader()->ContentDisposition(); + if (cdispField) { + m_dispType = dynamic_cast <const contentDisposition&>(*cdispField->getValue()); + } } @@ -103,6 +108,12 @@ const mediaType& maildirMessagePart::getType() const { } +const contentDisposition &maildirMessagePart::getDisposition() const { + + return m_dispType; +} + + size_t maildirMessagePart::getSize() const { return m_size; diff --git a/src/vmime/net/maildir/maildirMessagePart.hpp b/src/vmime/net/maildir/maildirMessagePart.hpp index dd863a2b..5ecc739e 100644 --- a/src/vmime/net/maildir/maildirMessagePart.hpp +++ b/src/vmime/net/maildir/maildirMessagePart.hpp @@ -61,6 +61,7 @@ public: weak_ptr <const maildirMessagePart> getParent() const { return (m_parent); } const mediaType& getType() const; + const contentDisposition &getDisposition() const; size_t getSize() const; size_t getNumber() const; @@ -85,6 +86,7 @@ private: size_t m_number; size_t m_size; mediaType m_mediaType; + contentDisposition m_dispType; size_t m_headerParsedOffset; size_t m_headerParsedLength; diff --git a/src/vmime/net/message.hpp b/src/vmime/net/message.hpp index c0a2839b..86798795 100644 --- a/src/vmime/net/message.hpp +++ b/src/vmime/net/message.hpp @@ -33,6 +33,7 @@ #include "vmime/header.hpp" #include "vmime/mediaType.hpp" +#include "vmime/contentDisposition.hpp" #include "vmime/utility/progressListener.hpp" #include "vmime/utility/stream.hpp" @@ -85,6 +86,12 @@ public: */ virtual const mediaType& getType() const = 0; + /** Return the disposition type of the content in this part. + * + * @return content disposition type + */ + virtual const contentDisposition &getDisposition() const = 0; + /** Return the size of this part. * * @return size of the part (in bytes) diff --git a/src/vmime/net/pop3/POP3Folder.cpp b/src/vmime/net/pop3/POP3Folder.cpp index 4ca494fe..b69a483d 100644 --- a/src/vmime/net/pop3/POP3Folder.cpp +++ b/src/vmime/net/pop3/POP3Folder.cpp @@ -103,6 +103,7 @@ const folderAttributes POP3Folder::getAttributes() { attribs.setType(folderAttributes::TYPE_CONTAINS_FOLDERS); } else if (m_path.getSize() == 1 && m_path[0].getBuffer() == "INBOX") { attribs.setType(folderAttributes::TYPE_CONTAINS_MESSAGES); + attribs.setSpecialUse(folderAttributes::SPECIALUSE_INBOX); } else { throw exceptions::folder_not_found(); } diff --git a/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp index eea2a15b..53e4eaee 100644 --- a/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp +++ b/src/vmime/net/tls/gnutls/TLSSocket_GnuTLS.cpp @@ -94,8 +94,6 @@ void TLSSocket_GnuTLS::connect(const string& address, const port_t port) { try { - gnutls_server_name_set(*m_session->m_gnutlsSession, GNUTLS_NAME_DNS, address.c_str(), address.size()); - m_wrapped->connect(address, port); handshake(); @@ -319,6 +317,9 @@ void TLSSocket_GnuTLS::handshake() { // Start handshaking process try { + string peerName = getPeerName(); + + gnutls_server_name_set(*m_session->m_gnutlsSession, GNUTLS_NAME_DNS, peerName.c_str(), peerName.size()); while (true) { diff --git a/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp index 8ab75439..978f0ca6 100644 --- a/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp +++ b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.cpp @@ -122,8 +122,9 @@ TLSSocket_OpenSSL::~TLSSocket_OpenSSL() { void TLSSocket_OpenSSL::createSSLHandle() { if (m_wrapped->isConnected()) { - - if (m_address.empty()) { + string peerName = getPeerName(); + + if (peerName.empty()) { throw exceptions::tls_exception("Unknown host name, will not be able to set SNI"); } @@ -167,7 +168,7 @@ void TLSSocket_OpenSSL::createSSLHandle() { } SSL_set_bio(m_ssl, sockBio, sockBio); - SSL_set_tlsext_host_name(m_ssl, m_address.c_str()); + SSL_set_tlsext_host_name(m_ssl, peerName.c_str()); SSL_set_connect_state(m_ssl); SSL_set_mode(m_ssl, SSL_MODE_AUTO_RETRY | SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); @@ -183,8 +184,7 @@ void TLSSocket_OpenSSL::connect(const string& address, const port_t port) { try { m_wrapped->connect(address, port); - m_address = address; - + createSSLHandle(); handshake(); diff --git a/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp index 233bd25a..e30df680 100644 --- a/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp +++ b/src/vmime/net/tls/openssl/TLSSocket_OpenSSL.hpp @@ -116,8 +116,6 @@ private: shared_ptr <socket> m_wrapped; - std::string m_address; - bool m_connected; byte_t m_buffer[65536]; diff --git a/src/vmime/word.cpp b/src/vmime/word.cpp index b8061eee..2607e90d 100644 --- a/src/vmime/word.cpp +++ b/src/vmime/word.cpp @@ -596,7 +596,7 @@ void word::generate( } else { if (!state->isFirstWord && - state->prevWordIsEncoded && + (state->prevWordIsEncoded || ctx.getInternationalizedEmailSupport()) && !state->lastCharIsSpace && !parserHelpers::isSpace(*curLineStart)) { diff --git a/tests/net/imap/IMAPParserTest.cpp b/tests/net/imap/IMAPParserTest.cpp index ace4e2d9..60ce16d7 100644 --- a/tests/net/imap/IMAPParserTest.cpp +++ b/tests/net/imap/IMAPParserTest.cpp @@ -36,42 +36,47 @@ VMIME_TEST_SUITE_BEGIN(IMAPParserTest) VMIME_TEST(testFETCHResponse_optional_body_fld_lang) VMIME_TEST(testFETCHBodyStructure_NIL_body_fld_param_value) VMIME_TEST(testFETCHBodyStructure_empty_body_fld_param_instead_of_NIL) + VMIME_TEST(testPipelining) + VMIME_TEST(testStarFlagWithoutBackslash) VMIME_TEST_LIST_END // For Apple iCloud IMAP server void testExtraSpaceInCapaResponse() { - vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>(); - vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>(); + const char* resp = + "* CAPABILITY IMAP4rev1 AUTH=ATOKEN AUTH=PLAIN \r\n" // extra space at end + "a001 OK Capability completed.\r\n"; - vmime::shared_ptr <vmime::net::imap::IMAPTag> tag = - vmime::make_shared <vmime::net::imap::IMAPTag>(); + // Strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); - socket->localSend( - "* CAPABILITY IMAP4rev1 AUTH=ATOKEN AUTH=PLAIN \r\n" // extra space at end - "a001 OK Capability completed.\r\n" - ); + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); - vmime::shared_ptr <vmime::net::imap::IMAPParser> parser = - vmime::make_shared <vmime::net::imap::IMAPParser>(); + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(true); - parser->setTag(tag); - parser->setSocket(socket); - parser->setTimeoutHandler(toh); + VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response); + } - parser->setStrict(false); - VASSERT_NO_THROW("non-strict mode", parser->readResponse(/* literalHandler */ NULL)); + // Non-strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); - ++(*tag); + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); - socket->localSend( - "* CAPABILITY IMAP4rev1 AUTH=ATOKEN AUTH=PLAIN \r\n" // extra space at end - "a002 OK Capability completed.\r\n" - ); + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(false); - parser->setStrict(true); - VASSERT_THROW("strict mode", parser->readResponse(/* literalHandler */ NULL), vmime::exceptions::invalid_response); + VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag)); + } } // For Apple iCloud/Exchange IMAP server @@ -98,19 +103,18 @@ VMIME_TEST_SUITE_BEGIN(IMAPParserTest) vmime::shared_ptr <vmime::net::imap::IMAPParser> parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); - parser->setTag(tag); parser->setSocket(socket); parser->setTimeoutHandler(toh); parser->setStrict(false); - VASSERT_NO_THROW("non-strict mode", parser->readResponse()); + VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag)); ++(*tag); socket->localSend("+\r\n"); parser->setStrict(true); - VASSERT_THROW("strict mode", parser->readResponse(), vmime::exceptions::invalid_response); + VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response); } // When an IMAP4 client sends a FETCH (bodystructure) request to a server @@ -119,32 +123,37 @@ VMIME_TEST_SUITE_BEGIN(IMAPParserTest) // --> http://support.microsoft.com/kb/975918/en-us void testNILValueInBodyFldEnc() { - vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>(); - vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>(); - - vmime::shared_ptr <vmime::net::imap::IMAPTag> tag = - vmime::make_shared <vmime::net::imap::IMAPTag>(); - const char* resp = "* 7970 FETCH (UID 8036 FLAGS () BODYSTRUCTURE (\"text\" \"html\" (\"charset\" \"utf-8\") NIL NIL NIL 175501 1651 NIL NIL NIL NIL) RFC822.HEADER {3}\r\nx\r\n)\r\na001 OK FETCH complete\r\n"; - socket->localSend(resp); + // Strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); - vmime::shared_ptr <vmime::net::imap::IMAPParser> parser = - vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); - parser->setTag(tag); - parser->setSocket(socket); - parser->setTimeoutHandler(toh); + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(true); - parser->setStrict(false); - VASSERT_NO_THROW("non-strict mode", parser->readResponse()); + VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response); + } - ++(*tag); + // Non-strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); - socket->localSend(resp); + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); - parser->setStrict(true); - VASSERT_THROW("strict mode", parser->readResponse(), vmime::exceptions::invalid_response); + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(false); + + VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag)); + } } // "body_fld_lang" is optional after "body_fld_dsp" in "body_ext_mpart" (Yahoo) @@ -163,74 +172,203 @@ VMIME_TEST_SUITE_BEGIN(IMAPParserTest) vmime::shared_ptr <vmime::net::imap::IMAPParser> parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); - parser->setTag(tag); parser->setSocket(socket); parser->setTimeoutHandler(toh); - VASSERT_NO_THROW("parse", parser->readResponse()); + VASSERT_NO_THROW("parse", parser->readResponse(*tag)); } // Support for NIL boundary, for mail.ru IMAP server: // https://www.ietf.org/mail-archive/web/imapext/current/msg05442.html void testFETCHBodyStructure_NIL_body_fld_param_value() { - vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>(); - vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>(); - - vmime::shared_ptr <vmime::net::imap::IMAPTag> tag = - vmime::make_shared <vmime::net::imap::IMAPTag>(); - // ...("boundary" NIL)))... is an invalid syntax for a "body_fld_param_item" const char* resp = "* 1 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"charset\" \"utf-8\") NIL NIL \"8bit\" 536 0 NIL NIL NIL NIL)(\"text\" \"html\" (\"charset\" \"utf-8\") NIL NIL \"8bit\" 7130 0 NIL NIL NIL NIL) \"alternative\" (\"boundary\" NIL)))\r\na001 OK FETCH complete\r\n"; - socket->localSend(resp); + // Strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); - vmime::shared_ptr <vmime::net::imap::IMAPParser> parser = - vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); - parser->setTag(tag); - parser->setSocket(socket); - parser->setTimeoutHandler(toh); + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(true); - parser->setStrict(false); - VASSERT_NO_THROW("non-strict mode", parser->readResponse()); + VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response); + } - ++(*tag); + // Non-strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); - socket->localSend(resp); + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); - parser->setStrict(true); - VASSERT_THROW("strict mode", parser->readResponse(), vmime::exceptions::invalid_response); + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(false); + + VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag)); + } } void testFETCHBodyStructure_empty_body_fld_param_instead_of_NIL() { + const char* resp = "* 1 FETCH (BODYSTRUCTURE ((\"text\" \"html\" (\"charset\" \"cp1251\") NIL NIL \"base64\" 84056 0 NIL (\"inline\" NIL) NIL NIL)(\"image\" \"gif\" () \"25b2b55b5d97f04e9ea939fe32a46a65.gif\" NIL \"base64\" 20776 NIL (\"inline\" NIL) NIL NIL) \"related\" (\"boundary\" NIL)))\r\na001 OK FETCH complete\r\n"; + + // Strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); + + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); + + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(true); + + VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response); + } + + // Non-strict mode + { + auto socket = vmime::make_shared <testSocket>(); + socket->localSend(resp); + + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); + + parser->setSocket(socket); + parser->setTimeoutHandler(vmime::make_shared <testTimeoutHandler>()); + parser->setStrict(false); + + VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag)); + } + } + + // Test pipelined and out-of-order replies + void testPipelining() { + + /* + [C] a001 SELECT "INBOX" + [C] a002 UID FETCH 42 (INTERNALDATE) + [C] a003 UID FETCH 43 (INTERNALDATE) + [S] * NO Error for a001 + [S] a001 NO Access denied + [S] * NO Error for a003 + [S] a003 BAD No mailbox selected + [S] * NO Error for a002 + [S] a002 BAD No mailbox selected + */ + vmime::shared_ptr <testSocket> socket = vmime::make_shared <testSocket>(); vmime::shared_ptr <vmime::net::timeoutHandler> toh = vmime::make_shared <testTimeoutHandler>(); - vmime::shared_ptr <vmime::net::imap::IMAPTag> tag = - vmime::make_shared <vmime::net::imap::IMAPTag>(); - - const char* resp = "* 1 FETCH (BODYSTRUCTURE ((\"text\" \"html\" (\"charset\" \"cp1251\") NIL NIL \"base64\" 84056 0 NIL (\"inline\" NIL) NIL NIL)(\"image\" \"gif\" () \"25b2b55b5d97f04e9ea939fe32a46a65.gif\" NIL \"base64\" 20776 NIL (\"inline\" NIL) NIL NIL) \"related\" (\"boundary\" NIL)))\r\na001 OK FETCH complete\r\n"; + vmime::net::imap::IMAPTag tag1; // a001 + vmime::net::imap::IMAPTag tag2(tag1); // a002 + ++tag2; + vmime::net::imap::IMAPTag tag3(tag2); // a003 + ++tag3; - socket->localSend(resp); + socket->localSend( + "* NO Error for a001\r\n" + "a001 NO Access denied\r\n" + "* NO Error for a003\r\n" + "a003 BAD No mailbox selected a003\r\n" + "* NO Error for a002\r\n" + "a002 BAD No mailbox selected a002\r\n" + ); vmime::shared_ptr <vmime::net::imap::IMAPParser> parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); - parser->setTag(tag); parser->setSocket(socket); parser->setTimeoutHandler(toh); - parser->setStrict(false); - VASSERT_NO_THROW("non-strict mode", parser->readResponse()); + // Test response a001 + vmime::scoped_ptr <vmime::net::imap::IMAPParser::response> resp1(parser->readResponse(tag1, /* literalHandler */ NULL)); + VASSERT("a001 response", resp1); + VASSERT("a001 response_done", resp1->response_done); + VASSERT_EQ("a001 response tag", "a001", resp1->response_done->response_tagged->tag->tagString); + VASSERT_EQ("a001 response text", "Access denied", resp1->response_done->response_tagged->resp_cond_state->resp_text->text); + VASSERT_EQ("a001 resp_data.size()", 1, resp1->continue_req_or_response_data.size()); + VASSERT("a001 resp_data[0]", resp1->continue_req_or_response_data[0]->response_data); + VASSERT("a001 resp_cond_state", resp1->continue_req_or_response_data[0]->response_data->resp_cond_state); + VASSERT_EQ("a001 resp_cond_state.text", "Error for a001", resp1->continue_req_or_response_data[0]->response_data->resp_cond_state->resp_text->text); + VASSERT_EQ("a001 resp_cond_state.status", vmime::net::imap::IMAPParser::resp_cond_state::NO, resp1->continue_req_or_response_data[0]->response_data->resp_cond_state->status); + + // Test response a002 + vmime::scoped_ptr <vmime::net::imap::IMAPParser::response> resp2(parser->readResponse(tag2, /* literalHandler */ NULL)); + VASSERT("a002 response", resp2); + VASSERT("a002 response_done", resp2->response_done); + VASSERT_EQ("a002 response tag", "a002", resp2->response_done->response_tagged->tag->tagString); + VASSERT_EQ("a002 response text", "No mailbox selected a002", resp2->response_done->response_tagged->resp_cond_state->resp_text->text); + VASSERT_EQ("a002 resp_data.size()", 1, resp2->continue_req_or_response_data.size()); + VASSERT("a002 resp_data[0]", resp2->continue_req_or_response_data[0]->response_data); + VASSERT("a002 resp_cond_state", resp2->continue_req_or_response_data[0]->response_data->resp_cond_state); + VASSERT_EQ("a002 resp_cond_state.text", "Error for a002", resp2->continue_req_or_response_data[0]->response_data->resp_cond_state->resp_text->text); + VASSERT_EQ("a002 resp_cond_state.status", vmime::net::imap::IMAPParser::resp_cond_state::NO, resp2->continue_req_or_response_data[0]->response_data->resp_cond_state->status); + + // Test response a003 + vmime::scoped_ptr <vmime::net::imap::IMAPParser::response> resp3(parser->readResponse(tag3, /* literalHandler */ NULL)); + VASSERT("a003 response", resp3); + VASSERT("a003 response_done", resp3->response_done); + VASSERT_EQ("a003 response tag", "a003", resp3->response_done->response_tagged->tag->tagString); + VASSERT_EQ("a003 response text", "No mailbox selected a003", resp3->response_done->response_tagged->resp_cond_state->resp_text->text); + VASSERT_EQ("a003 resp_data.size()", 1, resp3->continue_req_or_response_data.size()); + VASSERT("a003 resp_data[0]", resp3->continue_req_or_response_data[0]->response_data); + VASSERT("a003 resp_cond_state", resp3->continue_req_or_response_data[0]->response_data->resp_cond_state); + VASSERT_EQ("a003 resp_cond_state.text", "Error for a003", resp3->continue_req_or_response_data[0]->response_data->resp_cond_state->resp_text->text); + VASSERT_EQ("a003 resp_cond_state.status", vmime::net::imap::IMAPParser::resp_cond_state::NO, resp3->continue_req_or_response_data[0]->response_data->resp_cond_state->status); + } - ++(*tag); + // Some IMAP servers return "*" instead of "\*" in PERMANENTFLAGS + void testStarFlagWithoutBackslash() { - socket->localSend(resp); + const char* resp = + "* OK [PERMANENTFLAGS (Answered Flagged Deleted Seen Draft *)] Flags permitted.\r\n" + "a001 OK Completed.\r\n"; - parser->setStrict(true); - VASSERT_THROW("strict mode", parser->readResponse(), vmime::exceptions::invalid_response); + // Strict mode + { + auto socket = vmime::make_shared <testSocket>(); + auto toh = vmime::make_shared <testTimeoutHandler>(); + + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); + + socket->localSend(resp); + + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + + parser->setSocket(socket); + parser->setTimeoutHandler(toh); + parser->setStrict(true); + + VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response); + } + + // Non-strict mode + { + auto socket = vmime::make_shared <testSocket>(); + auto toh = vmime::make_shared <testTimeoutHandler>(); + + auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>(); + + socket->localSend(resp); + + auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>(); + + parser->setSocket(socket); + parser->setTimeoutHandler(toh); + parser->setStrict(false); + + VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag)); + } } VMIME_TEST_SUITE_END diff --git a/tests/parser/mailboxGroupTest.cpp b/tests/parser/mailboxGroupTest.cpp index 11a7f08f..18ff425b 100644 --- a/tests/parser/mailboxGroupTest.cpp +++ b/tests/parser/mailboxGroupTest.cpp @@ -31,6 +31,7 @@ VMIME_TEST_SUITE_BEGIN(mailboxGroupTest) VMIME_TEST(testParseNoEndDelimiter) VMIME_TEST(testParseExtraChars) VMIME_TEST(testEmptyGroup) + VMIME_TEST(testEncodedEmptyGroup) VMIME_TEST_LIST_END @@ -94,4 +95,13 @@ VMIME_TEST_SUITE_BEGIN(mailboxGroupTest) VASSERT_EQ("count", 0, mgrp.getMailboxCount()); } + void testEncodedEmptyGroup() { + + vmime::mailboxGroup mgrp; + mgrp.parse("=?us-ascii?Q?Undisclosed_recipients?=:;"); + + VASSERT_EQ("name", "Undisclosed recipients", mgrp.getName().getWholeBuffer()); + VASSERT_EQ("count", 0, mgrp.getMailboxCount()); + } + VMIME_TEST_SUITE_END diff --git a/tests/parser/textTest.cpp b/tests/parser/textTest.cpp index 16abf11b..e9ddc262 100644 --- a/tests/parser/textTest.cpp +++ b/tests/parser/textTest.cpp @@ -59,6 +59,7 @@ VMIME_TEST_SUITE_BEGIN(textTest) VMIME_TEST(testInternationalizedEmail_UTF8) VMIME_TEST(testInternationalizedEmail_nonUTF8) VMIME_TEST(testInternationalizedEmail_folding) + VMIME_TEST(testInternationalizedEmail_whitespace) VMIME_TEST(testWronglyPaddedB64Words) VMIME_TEST(testFixBrokenWords) @@ -694,6 +695,90 @@ VMIME_TEST_SUITE_BEGIN(textTest) ); } + void testInternationalizedEmail_whitespace() { + + // Sanity checks for running this test + { + vmime::text t; + t.parse("=?utf-8?Q?Adquisi=C3=B3n?= de Laptop y celular"); + + VASSERT_EQ("parse", "Adquisión de Laptop y celular", t.getWholeBuffer()); + } + + { + vmime::text t("Adquisi\xc3\xb3n de Laptop y celular", vmime::charset("UTF-8")); + + VASSERT_EQ("generate", "=?UTF-8?Q?Adquisi=C3=B3n?= de Laptop y celular", t.generate()); + } + + // Ensure a whitespace is added between encoded words in intl email support enabled + { + vmime::text t; + t.parse("=?utf-8?Q?Adquisi=C3=B3n?= de Laptop y celular"); + + std::ostringstream oss; + vmime::utility::outputStreamAdapter ossAdapter(oss); + vmime::generationContext gctx(vmime::generationContext::getDefaultContext()); + gctx.setInternationalizedEmailSupport(true); + t.generate(gctx, ossAdapter); + + VASSERT_EQ("generate", "Adquisi\xc3\xb3n de Laptop y celular", oss.str()); + } + + { + vmime::text t; + t.parse("=?utf-8?Q?Adquisi=C3=B3n?= de Laptop =?utf-8?Q?y?= celular"); + + std::ostringstream oss; + vmime::utility::outputStreamAdapter ossAdapter(oss); + vmime::generationContext gctx(vmime::generationContext::getDefaultContext()); + gctx.setInternationalizedEmailSupport(true); + t.generate(gctx, ossAdapter); + + VASSERT_EQ("generate", "Adquisi\xc3\xb3n de Laptop y celular", oss.str()); + } + + { + vmime::text t; + t.parse("=?utf-8?Q?Adquisi=C3=B3n?= de Laptop =?utf-8?Q?y_celular?="); + + std::ostringstream oss; + vmime::utility::outputStreamAdapter ossAdapter(oss); + vmime::generationContext gctx(vmime::generationContext::getDefaultContext()); + gctx.setInternationalizedEmailSupport(true); + t.generate(gctx, ossAdapter); + + VASSERT_EQ("generate", "Adquisi\xc3\xb3n de Laptop y celular", oss.str()); + } + + // Ensure no whitespace is added with non-encoded words + { + vmime::text t; + t.parse("Laptop y celular"); + + std::ostringstream oss; + vmime::utility::outputStreamAdapter ossAdapter(oss); + vmime::generationContext gctx(vmime::generationContext::getDefaultContext()); + gctx.setInternationalizedEmailSupport(true); + t.generate(gctx, ossAdapter); + + VASSERT_EQ("generate", "Laptop y celular", oss.str()); + } + + { + vmime::text t; + t.parse("=?utf-8?Q?Laptop_y_celular?="); + + std::ostringstream oss; + vmime::utility::outputStreamAdapter ossAdapter(oss); + vmime::generationContext gctx(vmime::generationContext::getDefaultContext()); + gctx.setInternationalizedEmailSupport(true); + t.generate(gctx, ossAdapter); + + VASSERT_EQ("generate", "Laptop y celular", oss.str()); + } + } + void testWronglyPaddedB64Words() { vmime::text outText; |