Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SMTP: Remove STARTTLS support.

Browse Source 
* It's vulnerable to man-in-the-middle attacks (which can't really be fixed)
 * It's rather nasty to implement (and prevents us from using BSecureSocket)
 * Nearly all servers I know of which support STARTTLS also support plain
   TLS also.
This commit is contained in:
Augustin Cavalier 2017-06-30 21:42:38 -04:00
parent 9980b6b47c
commit c86d497164
5 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/mail_daemon/outbound_protocols/smtp/ConfigView.cpp
View File

@ -49,12 +49,10 @@ SMTPConfigView::SMTPConfigView(const BMailAccountSettings& settings)
{
B_TRANSLATE_MARK_VOID("Unencrypted");
B_TRANSLATE_MARK_VOID("SSL");
B_TRANSLATE_MARK_VOID("STARTTLS");
#ifdef USE_SSL
AddFlavor(B_TRANSLATE_NOCOLLECT("Unencrypted"));
AddFlavor(B_TRANSLATE("SSL"));
AddFlavor(B_TRANSLATE("STARTTLS"));
#endif
AddAuthMethod(B_TRANSLATE("None"), false);

43
src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.cpp
View File

@ -374,7 +374,6 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
#ifdef USE_SSL
use_ssl = (fSettingsMessage.FindInt32("flavor") == 1);
use_STARTTLS = (fSettingsMessage.FindInt32("flavor") == 2);
ssl = NULL;
ctx = NULL;
#endif
@ -462,48 +461,6 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
return B_ERROR;
}
#ifdef USE_SSL
// Check for STARTTLS
if (use_STARTTLS) {
const char *res = fLog.String();
char *p;
SSL_library_init();
RAND_seed(this,sizeof(SMTPProtocol));
::sprintf(cmd, "STARTTLS" CRLF);
if ((p = ::strstr(res, "STARTTLS")) != NULL) {
// Server advertises STARTTLS support
if (SendCommand(cmd) != B_OK) {
delete[] cmd;
return B_ERROR;
}
// We should start TLS negotiation
use_ssl = true;
ctx = SSL_CTX_new(TLSv1_method());
ssl = SSL_new(ctx);
sbio = BIO_new_socket(fSocket,BIO_NOCLOSE);
BIO_set_nbio(sbio, 0);
SSL_set_bio(ssl, sbio, sbio);
SSL_set_connect_state(ssl);
if(SSL_do_handshake(ssl) != 1)
return B_ERROR;
// Should send EHLO command again
if(!esmtp)
::sprintf(cmd, "HELO %s" CRLF, localhost);
else
::sprintf(cmd, "EHLO %s" CRLF, localhost);
if (SendCommand(cmd) != B_OK) {
delete[] cmd;
return B_ERROR;
}
}
}
#endif // USE_SSL
delete[] cmd;
// Check auth type

1
src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.h
View File

@ -58,7 +58,6 @@ private:
BIO* sbio;
bool use_ssl;
bool use_STARTTLS;
#endif
status_t fStatus;

1
src/preferences/mail/ProviderInfo/ReadMe
View File

@ -35,7 +35,6 @@ you can pass the following options to the last six items:
"SMTP SSL":
0 Unencrypted
1 SSL
2 STARTTLS
"Username Pattern":
0 username is the email address (default)

2
src/preferences/mail/ProviderInfo/shaw.ca.rdef
View File

@ -5,5 +5,5 @@ resource(4, "POP Authentication") 0;
resource(5, "SMTP Authentication") 1;
resource(6, "POP SSL") 0;
resource(7, "IMAP SSL") 0;
resource(8, "SMTP SSL") 2;
resource(8, "SMTP SSL") 0;
resource(9, "Username Pattern") 1;