GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #184 from josusky/smtp-auth

Browse Source 
Add SMTPS with AUTH PLAIN without SASL.
This commit is contained in:
Vincent Richard 2017-12-20 08:46:28 +01:00 committed by GitHub
commit 680057bacd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/vmime/net/smtp/SMTPConnection.cpp
View File

@ -40,6 +40,10 @@
#if VMIME_HAVE_SASL_SUPPORT #if VMIME_HAVE_SASL_SUPPORT
#include "vmime/security/sasl/SASLContext.hpp" #include "vmime/security/sasl/SASLContext.hpp"
#else
#include "vmime/utility/encoder/b64Encoder.hpp"
#include "vmime/utility/inputStreamStringAdapter.hpp"
#include "vmime/utility/outputStreamStringAdapter.hpp"
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
#if VMIME_HAVE_TLS_SUPPORT #if VMIME_HAVE_TLS_SUPPORT
@ -48,7 +52,6 @@
#endif // VMIME_HAVE_TLS_SUPPORT #endif // VMIME_HAVE_TLS_SUPPORT
// Helpers for service properties // Helpers for service properties
#define GET_PROPERTY(type, prop) \ #define GET_PROPERTY(type, prop) \
(m_transport.lock()->getInfos().getPropertyValue <type>(getSession(), \ (m_transport.lock()->getInfos().getPropertyValue <type>(getSession(), \
@ -307,6 +310,39 @@ void SMTPConnection::authenticate()
throw; throw;
} }
} }
#else // no SASL
// allow AUTH PLAIN over TLS - it is a popular and simple mechanism
if (m_secured)
{
std::vector <string> authMechs;
hasExtension("AUTH", &authMechs);
if (authMechs.empty())
throw exceptions::authentication_error("No AUTH mechanism available.");
const string plain("PLAIN");
if (std::find(authMechs.begin(), authMechs.end(), plain) != authMechs.end())
{
const string username = getAuthenticator()->getUsername();
const string password = getAuthenticator()->getPassword();
const string authToken = username + '\0' + username + '\0' + password;
auto encoder = new vmime::utility::encoder::b64Encoder();
utility::inputStreamStringAdapter in(authToken);
string authTokenBase64;
utility::outputStreamStringAdapter out(authTokenBase64);
encoder->encode(in, out);
sendRequest(SMTPCommand::AUTH(plain, authTokenBase64));
shared_ptr <SMTPResponse> response = readResponse();
const int code = response ? response->getCode() : -1;
if (code == 235)
{
m_authenticated = true;
return;
}
}
}
#endif // VMIME_HAVE_SASL_SUPPORT #endif // VMIME_HAVE_SASL_SUPPORT
// No other authentication method is possible // No other authentication method is possible