aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/smtp/SMTPConnection.cpp6
-rw-r--r--src/net/smtp/SMTPExceptions.cpp151
-rw-r--r--src/net/smtp/SMTPResponse.cpp7
-rw-r--r--src/net/smtp/SMTPTransport.cpp54
4 files changed, 203 insertions, 15 deletions
diff --git a/src/net/smtp/SMTPConnection.cpp b/src/net/smtp/SMTPConnection.cpp
index c5ec7b51..88170243 100644
--- a/src/net/smtp/SMTPConnection.cpp
+++ b/src/net/smtp/SMTPConnection.cpp
@@ -29,6 +29,7 @@
#include "vmime/net/smtp/SMTPConnection.hpp"
#include "vmime/net/smtp/SMTPTransport.hpp"
+#include "vmime/net/smtp/SMTPExceptions.hpp"
#include "vmime/exception.hpp"
#include "vmime/platform.hpp"
@@ -473,7 +474,10 @@ void SMTPConnection::startTLS()
ref <SMTPResponse> resp = readResponse();
if (resp->getCode() != 220)
- throw exceptions::command_error("STARTTLS", resp->getText());
+ {
+ throw SMTPCommandError("STARTTLS", resp->getText(),
+ resp->getCode(), resp->getEnhancedCode());
+ }
ref <tls::TLSSession> tlsSession =
tls::TLSSession::create(getTransport()->getCertificateVerifier());
diff --git a/src/net/smtp/SMTPExceptions.cpp b/src/net/smtp/SMTPExceptions.cpp
new file mode 100644
index 00000000..0c3112c0
--- /dev/null
+++ b/src/net/smtp/SMTPExceptions.cpp
@@ -0,0 +1,151 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 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 3 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/config.hpp"
+
+
+#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP
+
+
+#include "vmime/net/smtp/SMTPExceptions.hpp"
+
+
+namespace vmime {
+namespace net {
+namespace smtp {
+
+
+//
+// SMTPCommandError
+//
+
+SMTPCommandError::SMTPCommandError
+ (const string& command, const string& response,
+ const string& desc, const int statusCode,
+ const SMTPResponse::enhancedStatusCode& extendedStatusCode,
+ const exception& other)
+ : command_error(command, response, desc, other),
+ m_status(statusCode), m_exStatus(extendedStatusCode)
+{
+}
+
+
+SMTPCommandError::SMTPCommandError
+ (const string& command, const string& response,
+ const int statusCode, const SMTPResponse::enhancedStatusCode& extendedStatusCode,
+ const exception& other)
+ : command_error(command, response, "", other),
+ m_status(statusCode), m_exStatus(extendedStatusCode)
+{
+}
+
+
+SMTPCommandError::~SMTPCommandError() throw()
+{
+}
+
+
+int SMTPCommandError::statusCode() const
+{
+ return m_status;
+}
+
+
+const SMTPResponse::enhancedStatusCode SMTPCommandError::extendedStatusCode() const
+{
+ return m_exStatus;
+}
+
+
+exception* SMTPCommandError::clone() const
+{
+ return new SMTPCommandError(*this);
+}
+
+
+const char* SMTPCommandError::name() const throw()
+{
+ return "SMTPCommandError";
+}
+
+
+//
+// SMTPMessageSizeExceedsMaxLimitsException
+//
+
+SMTPMessageSizeExceedsMaxLimitsException::SMTPMessageSizeExceedsMaxLimitsException(const exception& other)
+ : net_exception("Message size exceeds maximum server limits (permanent error).", other)
+{
+}
+
+
+SMTPMessageSizeExceedsMaxLimitsException::~SMTPMessageSizeExceedsMaxLimitsException() throw()
+{
+}
+
+
+exception* SMTPMessageSizeExceedsMaxLimitsException::clone() const
+{
+ return new SMTPMessageSizeExceedsMaxLimitsException(*this);
+}
+
+
+const char* SMTPMessageSizeExceedsMaxLimitsException::name() const throw()
+{
+ return "SMTPMessageSizeExceedsMaxLimitsException";
+}
+
+
+//
+// SMTPMessageSizeExceedsCurLimitsException
+//
+
+SMTPMessageSizeExceedsCurLimitsException::SMTPMessageSizeExceedsCurLimitsException(const exception& other)
+ : net_exception("Message size exceeds current server limits (temporary storage error).", other)
+{
+}
+
+
+SMTPMessageSizeExceedsCurLimitsException::~SMTPMessageSizeExceedsCurLimitsException() throw()
+{
+}
+
+
+exception* SMTPMessageSizeExceedsCurLimitsException::clone() const
+{
+ return new SMTPMessageSizeExceedsCurLimitsException(*this);
+}
+
+
+const char* SMTPMessageSizeExceedsCurLimitsException::name() const throw()
+{
+ return "SMTPMessageSizeExceedsCurLimitsException";
+}
+
+
+} // smtp
+} // net
+} // vmime
+
+
+#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP
diff --git a/src/net/smtp/SMTPResponse.cpp b/src/net/smtp/SMTPResponse.cpp
index 86a7a7bd..9367dcd4 100644
--- a/src/net/smtp/SMTPResponse.cpp
+++ b/src/net/smtp/SMTPResponse.cpp
@@ -318,6 +318,13 @@ SMTPResponse::enhancedStatusCode::enhancedStatusCode(const enhancedStatusCode& e
}
+std::ostream& operator<<(std::ostream& os, const SMTPResponse::enhancedStatusCode& code)
+{
+ os << code.klass << '.' << code.subject << '.' << code.detail;
+ return os;
+}
+
+
} // smtp
} // net
} // vmime
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index c3431a43..91487ed4 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -32,6 +32,7 @@
#include "vmime/net/smtp/SMTPCommand.hpp"
#include "vmime/net/smtp/SMTPCommandSet.hpp"
#include "vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp"
+#include "vmime/net/smtp/SMTPExceptions.hpp"
#include "vmime/exception.hpp"
#include "vmime/mailboxList.hpp"
@@ -152,7 +153,10 @@ void SMTPTransport::noop()
ref <SMTPResponse> resp = m_connection->readResponse();
if (resp->getCode() != 250)
- throw exceptions::command_error("NOOP", resp->getText());
+ {
+ throw SMTPCommandError
+ ("NOOP", resp->getText(), resp->getCode(), resp->getEnhancedCode());
+ }
}
@@ -211,7 +215,10 @@ void SMTPTransport::sendEnvelope
if ((resp = m_connection->readResponse())->getCode() != 250)
{
disconnect();
- throw exceptions::command_error(commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPCommandError
+ (commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode());
}
}
@@ -224,21 +231,28 @@ void SMTPTransport::sendEnvelope
if (resp->getCode() == 452)
{
disconnect();
- throw exceptions::message_size_exceeds_cur_limits
- (commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPMessageSizeExceedsCurLimitsException
+ (SMTPCommandError(commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode()));
}
// SIZE extension: message size exceeds fixed maximum message size
else if (resp->getCode() == 552)
{
disconnect();
- throw exceptions::message_size_exceeds_max_limits
- (commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPMessageSizeExceedsMaxLimitsException
+ (SMTPCommandError(commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode()));
}
// Other error
else
{
disconnect();
- throw exceptions::command_error(commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPCommandError
+ (commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode());
}
}
@@ -256,21 +270,28 @@ void SMTPTransport::sendEnvelope
if (resp->getCode() == 452)
{
disconnect();
- throw exceptions::message_size_exceeds_cur_limits
- (commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPMessageSizeExceedsCurLimitsException
+ (SMTPCommandError(commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode()));
}
// SIZE extension: message size exceeds fixed maximum message size
else if (resp->getCode() == 552)
{
disconnect();
- throw exceptions::message_size_exceeds_max_limits
- (commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPMessageSizeExceedsMaxLimitsException
+ (SMTPCommandError(commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode()));
}
// Other error
else
{
disconnect();
- throw exceptions::command_error(commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPCommandError
+ (commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode());
}
}
}
@@ -283,7 +304,10 @@ void SMTPTransport::sendEnvelope
if ((resp = m_connection->readResponse())->getCode() != 354)
{
disconnect();
- throw exceptions::command_error(commands->getLastCommandSent()->getText(), resp->getText());
+
+ throw SMTPCommandError
+ (commands->getLastCommandSent()->getText(), resp->getText(),
+ resp->getCode(), resp->getEnhancedCode());
}
}
}
@@ -317,7 +341,9 @@ void SMTPTransport::send
if ((resp = m_connection->readResponse())->getCode() != 250)
{
disconnect();
- throw exceptions::command_error("DATA", resp->getText());
+
+ throw SMTPCommandError
+ ("DATA", resp->getText(), resp->getCode(), resp->getEnhancedCode());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 08:03:45 +0000