X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=class%2Fdeliver%2FDeliver_SMTP.class.php;h=3c69b8c9a22ff7349fcb15005c7f0245dfa9c616;hp=0017c3b5c2b38bf8835d334eea6339d6d10eab80;hb=a15b73a49b070358cf1e8ec699911df67e58ef9e;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4 diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php index 0017c3b5..3c69b8c9 100644 --- a/class/deliver/Deliver_SMTP.class.php +++ b/class/deliver/Deliver_SMTP.class.php @@ -1,24 +1,59 @@ authPop($host, '', $user, $pass); + $this->authPop($pop_host, '', $user, $pass); } $rfc822_header = $message->rfc822_header; @@ -47,30 +82,49 @@ class Deliver_SMTP extends Deliver { $content_type->type1 == 'report' && isset($content_type->properties['report-type']) && $content_type->properties['report-type']=='disposition-notification') { + // reinitialize the from object because otherwise the from header somehow + // is affected. This $from var is used for smtp command MAIL FROM which + // is not the same as what we put in the rfc822 header. + $from = new AddressStructure(); $from->host = ''; $from->mailbox = ''; } - if (($use_smtp_tls == true) and (check_php_version(4,3)) and (extension_loaded('openssl'))) { - $stream = fsockopen('tls://' . $host, $port, $errorNumber, $errorString); + if ($use_smtp_tls == 1) { + if ((check_php_version(4,3)) && (extension_loaded('openssl'))) { + $stream = @fsockopen('tls://' . $host, $port, $errorNumber, $errorString); + $this->tls_enabled = true; + } else { + /** + * don't connect to server when user asks for smtps and + * PHP does not support it. + */ + $errorNumber = ''; + $errorString = _("Secure SMTP (TLS) is enabled in SquirrelMail configuration, but used PHP version does not support it."); + } } else { - $stream = fsockopen($host, $port, $errorNumber, $errorString); + $stream = @fsockopen($host, $port, $errorNumber, $errorString); } if (!$stream) { + // reset tls state var to default value, if connection fails + $this->tls_enabled = false; + // set error messages $this->dlv_msg = $errorString; $this->dlv_ret_nr = $errorNumber; + $this->dlv_server_msg = _("Can't open SMTP stream."); return(0); } + // get server greeting $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { return(0); } /* - * If $_SERVER['HTTP_HOST'] is set, use that in our HELO to the SMTP - * server. This should fix the DNS issues some people have had - */ + * If $_SERVER['HTTP_HOST'] is set, use that in our HELO to the SMTP + * server. This should fix the DNS issues some people have had + */ if (sqgetGlobalVar('HTTP_HOST', $HTTP_HOST, SQ_SERVER)) { // HTTP_HOST is set // optionally trim off port number if($p = strrpos($HTTP_HOST, ':')) { @@ -81,12 +135,18 @@ class Deliver_SMTP extends Deliver { $helohost = $domain; } + // if the host is an IPv4 address, enclose it in brackets + // + if (preg_match('/^\d+\.\d+\.\d+\.\d+$/', $helohost)) + $helohost = '[' . $helohost . ']'; + /* Lets introduce ourselves */ fputs($stream, "EHLO $helohost\r\n"); - $tmp = fgets($stream,1024); + // Read ehlo response + $tmp = $this->parse_ehlo_response($stream); if ($this->errorCheck($tmp,$stream)) { - // fall back to HELO if EHLO is not supported - if ($this->dlv_ret_nr == '500') { + // fall back to HELO if EHLO is not supported (error 5xx) + if ($this->dlv_ret_nr{0} == '5') { fputs($stream, "HELO $helohost\r\n"); $tmp = fgets($stream,1024); if ($this->errorCheck($tmp,$stream)) { @@ -97,6 +157,59 @@ class Deliver_SMTP extends Deliver { } } + /** + * Implementing SMTP STARTTLS (rfc2487) in php 5.1.0+ + * http://www.php.net/stream-socket-enable-crypto + */ + if ($use_smtp_tls === 2) { + if (function_exists('stream_socket_enable_crypto')) { + // don't try starting tls, when client thinks that it is already active + if ($this->tls_enabled) { + $this->dlv_msg = _("TLS session is already activated."); + return 0; + } elseif (!array_key_exists('STARTTLS',$this->ehlo)) { + // check for starttls in ehlo response + $this->dlv_msg = _("SMTP STARTTLS is enabled in SquirrelMail configuration, but used SMTP server does not support it"); + return 0; + } + + // issue starttls command + fputs($stream, "STARTTLS\r\n"); + // get response + $tmp = fgets($stream,1024); + if ($this->errorCheck($tmp,$stream)) { + return 0; + } + + // start crypto on connection. suppress function errors. + if (@stream_socket_enable_crypto($stream,true,STREAM_CRYPTO_METHOD_TLS_CLIENT)) { + // starttls was successful (rfc2487 5.2 Result of the STARTTLS Command) + // get new EHLO response + fputs($stream, "EHLO $helohost\r\n"); + // Read ehlo response + $tmp = $this->parse_ehlo_response($stream); + if ($this->errorCheck($tmp,$stream)) { + // don't revert to helo here. server must support ESMTP + return 0; + } + // set information about started tls + $this->tls_enabled = true; + } else { + /** + * stream_socket_enable_crypto() call failed. + */ + $this->dlv_msg = _("Unable to start TLS."); + return 0; + // Bug: can't get error message. See comments in sqimap_create_stream(). + } + } else { + // php install does not support stream_socket_enable_crypto() function + $this->dlv_msg = _("SMTP STARTTLS is enabled in SquirrelMail configuration, but used PHP version does not support functions that allow to enable encryption on open socket."); + return 0; + } + } + + // FIXME: check ehlo response before using authentication if (( $smtp_auth_mech == 'cram-md5') or ( $smtp_auth_mech == 'digest-md5' )) { // Doing some form of non-plain auth if ($smtp_auth_mech == 'cram-md5') { @@ -186,7 +299,7 @@ class Deliver_SMTP extends Deliver { } /* Ok, who is sending the message? */ - $fromaddress = ($from->mailbox && $from->host) ? + $fromaddress = (strlen($from->mailbox) && $from->host) ? $from->mailbox.'@'.$from->host : ''; fputs($stream, 'MAIL FROM:<'.$fromaddress.">\r\n"); $tmp = fgets($stream, 1024); @@ -197,7 +310,7 @@ class Deliver_SMTP extends Deliver { /* send who the recipients are */ for ($i = 0, $cnt = count($to); $i < $cnt; $i++) { if (!$to[$i]->host) $to[$i]->host = $domain; - if ($to[$i]->mailbox) { + if (strlen($to[$i]->mailbox)) { fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { @@ -208,7 +321,7 @@ class Deliver_SMTP extends Deliver { for ($i = 0, $cnt = count($cc); $i < $cnt; $i++) { if (!$cc[$i]->host) $cc[$i]->host = $domain; - if ($cc[$i]->mailbox) { + if (strlen($cc[$i]->mailbox)) { fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { @@ -219,7 +332,7 @@ class Deliver_SMTP extends Deliver { for ($i = 0, $cnt = count($bcc); $i < $cnt; $i++) { if (!$bcc[$i]->host) $bcc[$i]->host = $domain; - if ($bcc[$i]->mailbox) { + if (strlen($bcc[$i]->mailbox)) { fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n"); $tmp = fgets($stream, 1024); if ($this->errorCheck($tmp, $stream)) { @@ -310,7 +423,7 @@ class Deliver_SMTP extends Deliver { } $this->dlv_msg = $message; - $this->dlv_server_msg = nl2br(htmlspecialchars($server_msg)); + $this->dlv_server_msg = $server_msg; return true; } @@ -322,29 +435,89 @@ class Deliver_SMTP extends Deliver { if (!$pop_server) { $pop_server = 'localhost'; } - $popConnection = fsockopen($pop_server, $pop_port, $err_no, $err_str); + $popConnection = @fsockopen($pop_server, $pop_port, $err_no, $err_str); if (!$popConnection) { error_log("Error connecting to POP Server ($pop_server:$pop_port)" . " $err_no : $err_str"); + return false; } else { $tmp = fgets($popConnection, 1024); /* banner */ if (substr($tmp, 0, 3) != '+OK') { - return(0); + return false; } fputs($popConnection, "USER $user\r\n"); $tmp = fgets($popConnection, 1024); if (substr($tmp, 0, 3) != '+OK') { - return(0); + return false; } fputs($popConnection, 'PASS ' . $pass . "\r\n"); $tmp = fgets($popConnection, 1024); if (substr($tmp, 0, 3) != '+OK') { - return(0); + return false; } fputs($popConnection, "QUIT\r\n"); /* log off */ fclose($popConnection); } + return true; } -} -?> \ No newline at end of file + /** + * Parses ESMTP EHLO response (rfc1869) + * + * Reads SMTP response to EHLO command and fills class variables + * (ehlo array and domain string). Returns last line. + * @param stream $stream smtp connection stream. + * @return string last ehlo line + * @since 1.5.1 + */ + function parse_ehlo_response($stream) { + // don't cache ehlo information + $this->ehlo=array(); + $ret = ''; + $firstline = true; + /** + * ehlo mailclient.example.org + * 250-mail.example.org + * 250-PIPELINING + * 250-SIZE 52428800 + * 250-DATAZ + * 250-STARTTLS + * 250-AUTH LOGIN PLAIN + * 250 8BITMIME + */ + while ($line=fgets($stream, 1024)){ + // match[1] = first symbol after 250 + // match[2] = domain or ehlo-keyword + // match[3] = greeting or ehlo-param + // match space after keyword in ehlo-keyword CR LF + if (preg_match("/^250(-|\s)(\S*)\s+(\S.*)\r\n/",$line,$match)|| + preg_match("/^250(-|\s)(\S*)\s*\r\n/",$line,$match)) { + if ($firstline) { + // first ehlo line (250[-\ ]domain SP greeting) + $this->domain = $match[2]; + $firstline=false; + } elseif (!isset($match[3])) { + // simple one word extension + $this->ehlo[strtoupper($match[2])]=''; + } elseif (!preg_match("/\s/",trim($match[3]))) { + // extension with one option + // yes, I know about ctype extension. no, i don't want to depend on it + $this->ehlo[strtoupper($match[2])]=trim($match[3]); + } else { + // ehlo-param with spaces + $this->ehlo[strtoupper($match[2])]=explode(' ',trim($match[3])); + } + if ($match[1]==' ') { + // stop while cycle, if we reach last 250 line + $ret = $line; + break; + } + } else { + // this is not 250 response + $ret = $line; + break; + } + } + return $ret; + } +}