X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=class%2Fdeliver%2FDeliver_SMTP.class.php;h=1d989206dcbc61c420c87c3c0078021741e730c6;hp=7e04fed07d07f2fa6b5f8965345b58a6851e1019;hb=1d6248ce00d0564f0508e7744490f27c30052af0;hpb=ca71b2db3d4727cd4facddd53ac7658c8c995bd9

diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php
index 7e04fed0..1d989206 100644
--- a/class/deliver/Deliver_SMTP.class.php
+++ b/class/deliver/Deliver_SMTP.class.php
@@ -1,202 +1,254 @@
 <?php
 /**
- * Deliver_SMTP.class.php
- *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * Delivery backend for the Deliver class.
- *
- * $Id$
- */
+* Deliver_SMTP.class.php
+*
+* Copyright (c) 1999-2005 The SquirrelMail Project Team
+* Licensed under the GNU GPL. For full terms see the file COPYING.
+*
+* Delivery backend for the Deliver class.
+*
+* @version $Id$
+* @package squirrelmail
+*/
 
+/** This of course depends upon Deliver */
 require_once(SM_PATH . 'class/deliver/Deliver.class.php');
 
+/**
+* Deliver messages using SMTP
+* @package squirrelmail
+*/
 class Deliver_SMTP extends Deliver {
 
     function preWriteToStream(&$s) {
-       if ($s) {
-          if ($s{0} == '.')   $s = '.' . $s;
-    	  $s = str_replace("\n.","\n..",$s);
-       }
+        if ($s) {
+            if ($s{0} == '.')   $s = '.' . $s;
+            $s = str_replace("\n.","\n..",$s);
+        }
     }
-    
+
     function initStream($message, $domain, $length=0, $host='', $port='', $user='', $pass='', $authpop=false) {
-	global $use_smtp_tls,$smtp_auth_mech,$username,$key,$onetimepad;
-    
-	if ($authpop) {
-	   $this->authPop($host, '', $username, $pass);
-	}
-	
-    $rfc822_header = $message->rfc822_header;      
-	$from = $rfc822_header->from[0];  
-	$to =   $rfc822_header->to;
-	$cc =   $rfc822_header->cc;
-	$bcc =  $rfc822_header->bcc;
-
-    if (($use_smtp_tls == true) and (check_php_version(4,3)) and (extension_loaded('openssl'))) {
-	  $stream = fsockopen('tls://' . $host, $port, $errorNumber, $errorString);
-	} else {
-	  $stream = fsockopen($host, $port, $errorNumber, $errorString);
-	}
-
-	if (!$stream) {
-	    $this->dlv_msg = $errorString;
-	    $this->dlv_ret_nr = $errorNumber;
-	    return(0);
-	}
-	$tmp = fgets($stream, 1024);
-	if ($this->errorCheck($tmp, $stream)) {
-    	    return(0);
-	}
-    
-	/* Lets introduce ourselves */
-	if (( $smtp_auth_mech == 'cram-md5') or ( $smtp_auth_mech == 'digest-md5' )) {
-	  // Doing some form of non-plain auth
-	  fputs($stream, "EHLO $domain\r\n");
-	  $tmp = fgets($stream,1024);
-	  if ($this->errorCheck($tmp,$stream)) {
-	    return(0);
-	  }
-	  if ($smtp_auth_mech == 'cram-md5') {
-	    fputs($stream, "AUTH CRAM-MD5\r\n");
-	  } elseif ($smtp_auth_mech == 'digest-md5') {
-	    fputs($stream, "AUTH DIGEST-MD5\r\n");
-	  }
-	  $tmp = fgets($stream,1024);
-	   
-	  if ($this->errorCheck($tmp,$stream)) {
-	    return(0);
-	  }
-	  
-      // At this point, $tmp should hold "334 <challenge string>"
-	  $chall = substr($tmp,4);
-	  // Depending on mechanism, generate response string 
-	  if ($smtp_auth_mech == 'cram-md5') {
-	    $response = cram_md5_response($username,$pass,$chall);
-	  } elseif ($smtp_auth_mech == 'digest-md5') {
-	    $response = digest_md5_response($username,$pass,$chall,'smtp',$host);
-	  }
-	  fputs($stream, $response);
-	  
-	  // Let's see what the server had to say about that
-	  $tmp = fgets($stream,1024);
-	  if ($this->errorCheck($tmp,$stream)) {
-	    return(0);
-	  }
-       
-	  // CRAM-MD5 is done at this point.  If DIGEST-MD5, there's a bit more to go
-	  if ($smtp_auth_mech == 'digest-md5')
-	  {
-	    // $tmp contains rspauth, but I don't store that yet. (No need yet)
-		fputs($stream,"\r\n");
-		$tmp = fgets($stream,1024);
-		 
-		if ($this->errorCheck($tmp,$stream)) {
-		  return(0);
-		}
-	  }
-    // CRAM-MD5 and DIGEST-MD5 code ends here
-	} elseif ($smtp_auth_mech == 'none') {
-	  // No auth at all, just send helo and then send the mail
-	  fputs($stream, "HELO $domain\r\n");
-      $tmp = fgets($stream, 1024);
-	  if ($this->errorCheck($tmp, $stream)) {
-        return(0);
-	  }
-	} elseif ($smtp_auth_mech == 'login') {
-	  // The LOGIN method
-      fputs($stream, "EHLO $domain\r\n");
-      $tmp = fgets($stream, 1024);
-	  if ($this->errorCheck($tmp, $stream)) {
-    	return(0);
-	  }
-      fputs($stream, "AUTH LOGIN\r\n");
-      $tmp = fgets($stream, 1024);
-
-	  if ($this->errorCheck($tmp, $stream)) {
-    	return(0);
-	  }
-      fputs($stream, base64_encode ($username) . "\r\n");
-      $tmp = fgets($stream, 1024);
-	  if ($this->errorCheck($tmp, $stream)) {
-    	return(0);
-	  }
-
-      fputs($stream, base64_encode($pass) . "\r\n");
-      $tmp = fgets($stream, 1024);
-	  if ($this->errorCheck($tmp, $stream)) {
-    	return(0);
-	  }
-	} else {
-		/* Right here, they've reached an unsupported auth mechanism.
-		   This is the ugliest hack I've ever done, but it'll do till I can fix
-		   things up better tomorrow.  So tired... */
-		if ($this->errorCheck("535 Unable to use this auth type",$stream)) {
-			return(0);
-		}
-    }
-    
-	/* Ok, who is sending the message? */
-        fputs($stream, 'MAIL FROM: <'.$from->mailbox.'@'.$from->host.">\r\n");
+        global $use_smtp_tls,$smtp_auth_mech;
+
+        if ($authpop) {
+            $this->authPop($host, '', $user, $pass);
+        }
+
+        $rfc822_header = $message->rfc822_header;
+
+        $from = $rfc822_header->from[0];
+        $to =   $rfc822_header->to;
+        $cc =   $rfc822_header->cc;
+        $bcc =  $rfc822_header->bcc;
+        $content_type  = $rfc822_header->content_type;
+
+        // MAIL FROM: <from address> MUST be empty in cae of MDN (RFC2298)
+        if ($content_type->type0 == 'multipart' &&
+            $content_type->type1 == 'report' &&
+            isset($content_type->properties['report-type']) &&
+            $content_type->properties['report-type']=='disposition-notification') {
+            $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);
+        } else {
+            $stream = @fsockopen($host, $port, $errorNumber, $errorString);
+        }
+
+        if (!$stream) {
+            $this->dlv_msg = $errorString;
+            $this->dlv_ret_nr = $errorNumber;
+            $this->dlv_server_msg = '';
+            return(0);
+        }
+        $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 (sqgetGlobalVar('HTTP_HOST', $HTTP_HOST, SQ_SERVER)) { // HTTP_HOST is set
+            // optionally trim off port number
+            if($p = strrpos($HTTP_HOST, ':')) {
+                $HTTP_HOST = substr($HTTP_HOST, 0, $p);
+            }
+            $helohost = $HTTP_HOST;
+        } else { // For some reason, HTTP_HOST is not set - revert to old behavior
+            $helohost = $domain;
+        }
+
+        /* Lets introduce ourselves */
+        fputs($stream, "EHLO $helohost\r\n");
+        $tmp = fgets($stream,1024);
+        if ($this->errorCheck($tmp,$stream)) {
+            // fall back to HELO if EHLO is not supported
+            if ($this->dlv_ret_nr == '500') {
+                fputs($stream, "HELO $helohost\r\n");
+                $tmp = fgets($stream,1024);
+                if ($this->errorCheck($tmp,$stream)) {
+                    return(0);
+                }
+            } else {
+                return(0);
+            }
+        }
+
+        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') {
+                fputs($stream, "AUTH CRAM-MD5\r\n");
+            } elseif ($smtp_auth_mech == 'digest-md5') {
+                fputs($stream, "AUTH DIGEST-MD5\r\n");
+            }
+
+            $tmp = fgets($stream,1024);
+
+            if ($this->errorCheck($tmp,$stream)) {
+                return(0);
+            }
+
+            // At this point, $tmp should hold "334 <challenge string>"
+            $chall = substr($tmp,4);
+            // Depending on mechanism, generate response string
+            if ($smtp_auth_mech == 'cram-md5') {
+                $response = cram_md5_response($user,$pass,$chall);
+            } elseif ($smtp_auth_mech == 'digest-md5') {
+                $response = digest_md5_response($user,$pass,$chall,'smtp',$host);
+            }
+            fputs($stream, $response);
+
+            // Let's see what the server had to say about that
+            $tmp = fgets($stream,1024);
+            if ($this->errorCheck($tmp,$stream)) {
+                return(0);
+            }
+
+            // CRAM-MD5 is done at this point.  If DIGEST-MD5, there's a bit more to go
+            if ($smtp_auth_mech == 'digest-md5') {
+                // $tmp contains rspauth, but I don't store that yet. (No need yet)
+                fputs($stream,"\r\n");
+                $tmp = fgets($stream,1024);
+
+                if ($this->errorCheck($tmp,$stream)) {
+                return(0);
+                }
+            }
+        // CRAM-MD5 and DIGEST-MD5 code ends here
+        } elseif ($smtp_auth_mech == 'none') {
+        // No auth at all, just send helo and then send the mail
+        // We already said hi earlier, nothing more is needed.
+        } elseif ($smtp_auth_mech == 'login') {
+            // The LOGIN method
+            fputs($stream, "AUTH LOGIN\r\n");
+            $tmp = fgets($stream, 1024);
+
+            if ($this->errorCheck($tmp, $stream)) {
+                return(0);
+            }
+            fputs($stream, base64_encode ($user) . "\r\n");
+            $tmp = fgets($stream, 1024);
+            if ($this->errorCheck($tmp, $stream)) {
+                return(0);
+            }
+
+            fputs($stream, base64_encode($pass) . "\r\n");
+            $tmp = fgets($stream, 1024);
+            if ($this->errorCheck($tmp, $stream)) {
+                return(0);
+            }
+        } elseif ($smtp_auth_mech == "plain") {
+            /* SASL Plain */
+            $auth = base64_encode("$user\0$user\0$pass");
+
+            $query = "AUTH PLAIN\r\n";
+            fputs($stream, $query);
+            $read=fgets($stream, 1024);
+
+            if (substr($read,0,3) == '334') { // OK so far..
+                fputs($stream, "$auth\r\n");
+                $read = fgets($stream, 1024);
+            }
+
+            $results=explode(" ",$read,3);
+            $response=$results[1];
+            $message=$results[2];
+        } else {
+            /* Right here, they've reached an unsupported auth mechanism.
+            This is the ugliest hack I've ever done, but it'll do till I can fix
+            things up better tomorrow.  So tired... */
+            if ($this->errorCheck("535 Unable to use this auth type",$stream)) {
+                return(0);
+            }
+        }
+
+        /* Ok, who is sending the message? */
+        $fromaddress = ($from->mailbox && $from->host) ?
+            $from->mailbox.'@'.$from->host : '';
+        fputs($stream, 'MAIL FROM:<'.$fromaddress.">\r\n");
+        $tmp = fgets($stream, 1024);
+        if ($this->errorCheck($tmp, $stream)) {
+            return(0);
+        }
+
+        /* 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) {
+                fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
+                $tmp = fgets($stream, 1024);
+                if ($this->errorCheck($tmp, $stream)) {
+                    return(0);
+                }
+            }
+        }
+
+        for ($i = 0, $cnt = count($cc); $i < $cnt; $i++) {
+            if (!$cc[$i]->host) $cc[$i]->host = $domain;
+            if ($cc[$i]->mailbox) {
+                fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
+                $tmp = fgets($stream, 1024);
+                if ($this->errorCheck($tmp, $stream)) {
+                    return(0);
+                }
+            }
+        }
+
+        for ($i = 0, $cnt = count($bcc); $i < $cnt; $i++) {
+            if (!$bcc[$i]->host) $bcc[$i]->host = $domain;
+            if ($bcc[$i]->mailbox) {
+                fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
+                $tmp = fgets($stream, 1024);
+                if ($this->errorCheck($tmp, $stream)) {
+                    return(0);
+                }
+            }
+        }
+        /* Lets start sending the actual message */
+        fputs($stream, "DATA\r\n");
         $tmp = fgets($stream, 1024);
-	if ($this->errorCheck($tmp, $stream)) {
-    	    return(0);
-	}
-
-	/* 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) {
-    		fputs($stream, 'RCPT TO: <'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
-    		$tmp = fgets($stream, 1024);
-		if ($this->errorCheck($tmp, $stream)) {
-    		    return(0);
-		}
-	    }
-	}
-	
-	for ($i = 0, $cnt = count($cc); $i < $cnt; $i++) {	
-	    if (!$cc[$i]->host) $cc[$i]->host = $domain;
-	    if ($cc[$i]->mailbox) {
-    		fputs($stream, 'RCPT TO: <'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
-    		$tmp = fgets($stream, 1024);
-		if ($this->errorCheck($tmp, $stream)) {
-    		    return(0);
-		}
-	    }
-	}
-	for ($i = 0, $cnt = count($bcc); $i < $cnt; $i++) {
-	    if (!$bcc[$i]->host) $bcc[$i]->host = $domain;
-	    if ($bcc[$i]->mailbox) {
-    		fputs($stream, 'RCPT TO: <'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
-    		$tmp = fgets($stream, 1024);
-		if ($this->errorCheck($tmp, $stream)) {
-    		    return(0);
-		}
-	    }
+        if ($this->errorCheck($tmp, $stream)) {
+                return(0);
         }
-	/* Lets start sending the actual message */
-	fputs($stream, "DATA\r\n");
-	$tmp = fgets($stream, 1024);
-	if ($this->errorCheck($tmp, $stream)) {
-    	    return(0);
-	}
-	return $stream;
+        return $stream;
     }
-    
+
     function finalizeStream($stream) {
-	fputs($stream, ".\r\n"); /* end the DATA part */
-	$tmp = fgets($stream, 1024);
-	$this->errorCheck($tmp, $stream);
-	if ($this->dlv_ret_nr != 250) {
-    	    return(0);
-	}
-	fputs($stream, "QUIT\r\n"); /* log off */
-	fclose($stream);
-	return true;
+        fputs($stream, "\r\n.\r\n"); /* end the DATA part */
+        $tmp = fgets($stream, 1024);
+        $this->errorCheck($tmp, $stream);
+        if ($this->dlv_ret_nr != 250) {
+                return(0);
+        }
+        fputs($stream, "QUIT\r\n"); /* log off */
+        fclose($stream);
+        return true;
     }
-    
+
     /* check if an SMTP reply is an error and set an error message) */
     function errorCheck($line, $smtpConnection) {
 
@@ -209,9 +261,8 @@ class Deliver_SMTP extends Deliver {
             $server_msg .= substr($line, 4);
         }
 
-        if ( ((int) $err_num{0}) < 4)
-        {
-        	return false;
+        if ( ((int) $err_num{0}) < 4) {
+            return false;
         }
 
         switch ($err_num) {
@@ -236,7 +287,7 @@ class Deliver_SMTP extends Deliver {
         case '503': $message = _("Bad sequence of commands");
             break;
         case '504': $message = _("Command parameter not implemented");
-            break;    
+            break;
         case '530': $message = _("Authentication required");
             break;
         case '534': $message = _("Authentication mechanism is too weak");
@@ -264,7 +315,7 @@ class Deliver_SMTP extends Deliver {
 
         return true;
     }
-    
+
     function authPop($pop_server='', $pop_port='', $user, $pass) {
         if (!$pop_port) {
             $pop_port = 110;
@@ -275,20 +326,20 @@ class Deliver_SMTP extends Deliver {
         $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");
+                . " $err_no : $err_str");
         } else {
             $tmp = fgets($popConnection, 1024); /* banner */
-            if (!eregi("^\+OK", $tmp, $regs)) {
+            if (substr($tmp, 0, 3) != '+OK') {
                 return(0);
             }
             fputs($popConnection, "USER $user\r\n");
             $tmp = fgets($popConnection, 1024);
-            if (!eregi("^\+OK", $tmp, $regs)) {
+            if (substr($tmp, 0, 3) != '+OK') {
                 return(0);
             }
             fputs($popConnection, 'PASS ' . $pass . "\r\n");
             $tmp = fgets($popConnection, 1024);
-            if (!eregi("^\+OK", $tmp, $regs)) {
+            if (substr($tmp, 0, 3) != '+OK') {
                 return(0);
             }
             fputs($popConnection, "QUIT\r\n"); /* log off */
@@ -297,4 +348,4 @@ class Deliver_SMTP extends Deliver {
     }
 }
 
-?>
+?>
\ No newline at end of file