mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 04:30:29 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bantu/ticket/10076' into develop

Browse Source 
* bantu/ticket/10076:
  [ticket/10076] STARTTLS support for SMTP via smtp_class.
  [ticket/10076] Move EHLO/HELO code into its own method.
This commit is contained in:
Oleg Pudeyev 2012-02-10 20:52:36 -05:00
commit d6bc77375a
1 changed files with 93 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
phpBB/includes/functions_messenger.php
View File

@ -1136,6 +1136,7 @@ class smtp_class
{
var $server_response = '';
var $socket = 0;
protected $socket_tls = false;
var $responses = array();
var $commands = array();
var $numeric_response_code = 0;
@ -1286,30 +1287,29 @@ class smtp_class
}
}
// Try EHLO first
$this->server_send("EHLO {$local_host}");
if ($err_msg = $this->server_parse('250', __LINE__))
$hello_result = $this->hello($local_host);
if (!is_null($hello_result))
{
// a 503 response code means that we're already authenticated
if ($this->numeric_response_code == 503)
{
return false;
}
// If EHLO fails, we try HELO
$this->server_send("HELO {$local_host}");
if ($err_msg = $this->server_parse('250', __LINE__))
{
return ($this->numeric_response_code == 503) ? false : $err_msg;
}
return $hello_result;
}
foreach ($this->responses as $response)
// SMTP STARTTLS (RFC 3207)
if (!$this->socket_tls)
{
$response = explode(' ', $response);
$response_code = $response[0];
unset($response[0]);
$this->commands[$response_code] = implode(' ', $response);
$this->socket_tls = $this->starttls();
if ($this->socket_tls)
{
// Switched to TLS
// RFC 3207: "The client MUST discard any knowledge obtained from the server, [...]"
// So say hello again
$hello_result = $this->hello($local_host);
if (!is_null($hello_result))
{
return $hello_result;
}
}
}
// If we are not authenticated yet, something might be wrong if no username and passwd passed
@ -1355,6 +1355,79 @@ class smtp_class
return $this->$method($username, $password);
}
/**
* SMTP EHLO/HELO
*
* @return mixed Null if the authentication process is supposed to continue
* False if already authenticated
* Error message (string) otherwise
*/
protected function hello($hostname)
{
// Try EHLO first
$this->server_send("EHLO $hostname");
if ($err_msg = $this->server_parse('250', __LINE__))
{
// a 503 response code means that we're already authenticated
if ($this->numeric_response_code == 503)
{
return false;
}
// If EHLO fails, we try HELO
$this->server_send("HELO $hostname");
if ($err_msg = $this->server_parse('250', __LINE__))
{
return ($this->numeric_response_code == 503) ? false : $err_msg;
}
}
foreach ($this->responses as $response)
{
$response = explode(' ', $response);
$response_code = $response[0];
unset($response[0]);
$this->commands[$response_code] = implode(' ', $response);
}
}
/**
* SMTP STARTTLS (RFC 3207)
*
* @return bool Returns true if TLS was started
* Otherwise false
*/
protected function starttls()
{
if (!function_exists('stream_socket_enable_crypto'))
{
return false;
}
if (!isset($this->commands['STARTTLS']))
{
return false;
}
$this->server_send('STARTTLS');
if ($err_msg = $this->server_parse('220', __LINE__))
{
return false;
}
$result = false;
$stream_meta = stream_get_meta_data($this->socket);
if (socket_set_blocking($this->socket, 1));
{
$result = stream_socket_enable_crypto($this->socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
socket_set_blocking($this->socket, (int) $stream_meta['blocked']);
}
return $result;
}
/**
* Pop before smtp authentication
*/