aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/emailAddress.cpp11
-rw-r--r--src/net/smtp/SMTPCommand.cpp29
-rw-r--r--src/net/smtp/SMTPTransport.cpp9
-rw-r--r--tests/net/smtp/SMTPCommandTest.cpp44
-rw-r--r--vmime/emailAddress.hpp7
-rw-r--r--vmime/net/smtp/SMTPCommand.hpp4
6 files changed, 91 insertions, 13 deletions
diff --git a/src/emailAddress.cpp b/src/emailAddress.cpp
index 7136a5b4..c4119aba 100644
--- a/src/emailAddress.cpp
+++ b/src/emailAddress.cpp
@@ -525,4 +525,15 @@ const string emailAddress::toString() const
}
+const text emailAddress::toText() const
+{
+ text txt;
+ txt.appendWord(vmime::create <vmime::word>(m_localName));
+ txt.appendWord(vmime::create <vmime::word>("@", vmime::charsets::US_ASCII));
+ txt.appendWord(vmime::create <vmime::word>(m_domainName));
+
+ return txt;
+}
+
+
} // vmime
diff --git a/src/net/smtp/SMTPCommand.cpp b/src/net/smtp/SMTPCommand.cpp
index 35ea56fb..d9f5c286 100644
--- a/src/net/smtp/SMTPCommand.cpp
+++ b/src/net/smtp/SMTPCommand.cpp
@@ -87,30 +87,47 @@ ref <SMTPCommand> SMTPCommand::STARTTLS()
// static
-ref <SMTPCommand> SMTPCommand::MAIL(const mailbox& mbox)
+ref <SMTPCommand> SMTPCommand::MAIL(const mailbox& mbox, const bool utf8)
{
std::ostringstream cmd;
cmd.imbue(std::locale::classic());
cmd << "MAIL FROM:<";
- vmime::utility::outputStreamAdapter cmd2(cmd);
- mbox.getEmail().generate(cmd2);
+ if (utf8)
+ {
+ cmd << mbox.getEmail().toText().getConvertedText(vmime::charsets::UTF_8);
+ }
+ else
+ {
+ vmime::utility::outputStreamAdapter cmd2(cmd);
+ mbox.getEmail().generate(cmd2);
+ }
cmd << ">";
+ if (utf8)
+ cmd << " SMTPUTF8";
+
return createCommand(cmd.str());
}
// static
-ref <SMTPCommand> SMTPCommand::RCPT(const mailbox& mbox)
+ref <SMTPCommand> SMTPCommand::RCPT(const mailbox& mbox, const bool utf8)
{
std::ostringstream cmd;
cmd.imbue(std::locale::classic());
cmd << "RCPT TO:<";
- vmime::utility::outputStreamAdapter cmd2(cmd);
- mbox.getEmail().generate(cmd2);
+ if (utf8)
+ {
+ cmd << mbox.getEmail().toText().getConvertedText(vmime::charsets::UTF_8);
+ }
+ else
+ {
+ vmime::utility::outputStreamAdapter cmd2(cmd);
+ mbox.getEmail().generate(cmd2);
+ }
cmd << ">";
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 30da3eff..cc3fc6ef 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -587,10 +587,13 @@ void SMTPTransport::send
commands->addCommand(SMTPCommand::RSET());
// Emit the "MAIL" command
+ const bool hasSMTPUTF8 =
+ m_extensions.find("SMTPUTF8") != m_extensions.end();
+
if (!sender.isEmpty())
- commands->addCommand(SMTPCommand::MAIL(sender));
+ commands->addCommand(SMTPCommand::MAIL(sender, hasSMTPUTF8));
else
- commands->addCommand(SMTPCommand::MAIL(expeditor));
+ commands->addCommand(SMTPCommand::MAIL(expeditor, hasSMTPUTF8));
// Now, we will need to reset next time
m_needReset = true;
@@ -599,7 +602,7 @@ void SMTPTransport::send
for (size_t i = 0 ; i < recipients.getMailboxCount() ; ++i)
{
const mailbox& mbox = *recipients.getMailboxAt(i);
- commands->addCommand(SMTPCommand::RCPT(mbox));
+ commands->addCommand(SMTPCommand::RCPT(mbox, hasSMTPUTF8));
}
// Prepare sending of message data
diff --git a/tests/net/smtp/SMTPCommandTest.cpp b/tests/net/smtp/SMTPCommandTest.cpp
index 10052f3f..d93bc729 100644
--- a/tests/net/smtp/SMTPCommandTest.cpp
+++ b/tests/net/smtp/SMTPCommandTest.cpp
@@ -39,7 +39,11 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandTest)
VMIME_TEST(testAUTH)
VMIME_TEST(testSTARTTLS)
VMIME_TEST(testMAIL)
+ VMIME_TEST(testMAIL_Encoded)
+ VMIME_TEST(testMAIL_UTF8)
VMIME_TEST(testRCPT)
+ VMIME_TEST(testRCPT_Encoded)
+ VMIME_TEST(testRCPT_UTF8)
VMIME_TEST(testRSET)
VMIME_TEST(testDATA)
VMIME_TEST(testNOOP)
@@ -98,20 +102,56 @@ VMIME_TEST_SUITE_BEGIN(SMTPCommandTest)
void testMAIL()
{
- vmime::ref <SMTPCommand> cmd = SMTPCommand::MAIL(vmime::mailbox("[email protected]"));
+ vmime::ref <SMTPCommand> cmd = SMTPCommand::MAIL(vmime::mailbox("[email protected]"), false);
VASSERT_NOT_NULL("Not null", cmd);
VASSERT_EQ("Text", "MAIL FROM:<[email protected]>", cmd->getText());
}
+ void testMAIL_Encoded()
+ {
+ vmime::ref <SMTPCommand> cmd = SMTPCommand::MAIL
+ (vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), false);
+
+ VASSERT_NOT_NULL("Not null", cmd);
+ VASSERT_EQ("Text", "MAIL FROM:<[email protected]>", cmd->getText());
+ }
+
+ void testMAIL_UTF8()
+ {
+ vmime::ref <SMTPCommand> cmd = SMTPCommand::MAIL
+ (vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true);
+
+ VASSERT_NOT_NULL("Not null", cmd);
+ VASSERT_EQ("Text", "MAIL FROM:<mailtest@例え.テスト> SMTPUTF8", cmd->getText());
+ }
+
void testRCPT()
{
- vmime::ref <SMTPCommand> cmd = SMTPCommand::RCPT(vmime::mailbox("[email protected]"));
+ vmime::ref <SMTPCommand> cmd = SMTPCommand::RCPT(vmime::mailbox("[email protected]"), false);
VASSERT_NOT_NULL("Not null", cmd);
VASSERT_EQ("Text", "RCPT TO:<[email protected]>", cmd->getText());
}
+ void testRCPT_Encoded()
+ {
+ vmime::ref <SMTPCommand> cmd = SMTPCommand::RCPT
+ (vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), false);
+
+ VASSERT_NOT_NULL("Not null", cmd);
+ VASSERT_EQ("Text", "RCPT TO:<[email protected]>", cmd->getText());
+ }
+
+ void testRCPT_UTF8()
+ {
+ vmime::ref <SMTPCommand> cmd = SMTPCommand::RCPT
+ (vmime::mailbox(vmime::emailAddress("mailtest", "例え.テスト")), true);
+
+ VASSERT_NOT_NULL("Not null", cmd);
+ VASSERT_EQ("Text", "RCPT TO:<mailtest@例え.テスト>", cmd->getText());
+ }
+
void testRSET()
{
vmime::ref <SMTPCommand> cmd = SMTPCommand::RSET();
diff --git a/vmime/emailAddress.hpp b/vmime/emailAddress.hpp
index 458e6753..67ea6948 100644
--- a/vmime/emailAddress.hpp
+++ b/vmime/emailAddress.hpp
@@ -85,6 +85,13 @@ public:
*/
const string toString() const;
+ /** Returns the email address as multibyte text, by joining components.
+ * (ie. the local name, followed by a @ then the domain name.)
+ *
+ * @return email address as multibyte text
+ */
+ const text toText() const;
+
// Comparison
bool operator==(const class emailAddress& eml) const;
bool operator!=(const class emailAddress& eml) const;
diff --git a/vmime/net/smtp/SMTPCommand.hpp b/vmime/net/smtp/SMTPCommand.hpp
index 79db16a2..48a5ce00 100644
--- a/vmime/net/smtp/SMTPCommand.hpp
+++ b/vmime/net/smtp/SMTPCommand.hpp
@@ -63,8 +63,8 @@ public:
static ref <SMTPCommand> EHLO(const string& hostname);
static ref <SMTPCommand> AUTH(const string& mechName);
static ref <SMTPCommand> STARTTLS();
- static ref <SMTPCommand> MAIL(const mailbox& mbox);
- static ref <SMTPCommand> RCPT(const mailbox& mbox);
+ static ref <SMTPCommand> MAIL(const mailbox& mbox, const bool utf8);
+ static ref <SMTPCommand> RCPT(const mailbox& mbox, const bool utf8);
static ref <SMTPCommand> RSET();
static ref <SMTPCommand> DATA();
static ref <SMTPCommand> NOOP();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 23:47:02 +0000