lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add comments

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-18 19:56:53 +01:00
parent 35b79818b7
commit b9d6122c53
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/core/class/smtps.class.php
View File

@ -427,6 +427,25 @@ class SMTPs
{ {
if (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS)) if (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS))
{ {
/*
The following dialog illustrates how a client and server can start a TLS STARTTLS session
S: <waits for connection on TCP port 25>
C: <opens connection>
S: 220 mail.imc.org SMTP service ready
C: EHLO mail.ietf.org
S: 250-mail.imc.org offers a warm hug of welcome
S: 250 STARTTLS
C: STARTTLS
S: 220 Go ahead
C: <starts TLS negotiation>
C & S: <negotiate a TLS session>
C & S: <check result of negotiation>
// Second pass EHLO
C: EHLO client-domain.com
S: 250-server-domain.com
S: 250 AUTH LOGIN
C: <continues by sending an SMTP command
*/
if (!$_retVal = $this->socket_send_str('STARTTLS', 220)) if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
{ {
$this->_setErr(131, 'STARTTLS connection is not supported.'); $this->_setErr(131, 'STARTTLS connection is not supported.');
@ -437,6 +456,8 @@ class SMTPs
$this->_setErr(132, 'STARTTLS connection failed.'); $this->_setErr(132, 'STARTTLS connection failed.');
return $_retVal; return $_retVal;
} }
// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250')) if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
{ {
$this->_setErr(126, '"' . $host . '" does not support authenticated connections.'); $this->_setErr(126, '"' . $host . '" does not support authenticated connections.');