Changeset 19942 for branches/version-2_5-dev/data/module/Mail/sendmail.php

Timestamp:

2011/01/17 14:46:37 (13 years ago)

Author:

Seasoft

Message:

#403(インクルードしているライブラリ群をバージョンアップする)

• PEAR::Mail 1.2.0
• PEAR::Net_SMTP 1.4.4

File:

• branches/version-2_5-dev/data/module/Mail/sendmail.php (modified) (6 diffs)

branches/version-2_5-dev/data/module/Mail/sendmail.php

@@ -25 +25 @@
 class Mail_sendmail extends Mail {
 
-    /**
+    /**
      * The location of the sendmail or sendmail wrapper binary on the
      * filesystem.
@@ -32 +32 @@
     var $sendmail_path = '/usr/sbin/sendmail';
 
-    /**
+    /**
      * Any extra command-line parameters to pass to the sendmail or
      * sendmail wrapper binary.
@@ -39 +39 @@
     var $sendmail_args = '-i';
 
-    /**
+    /**
      * Constructor.
      *
@@ -78 +78 @@
     }
 
-    /**
+    /**
      * Implements Mail::send() function using the sendmail
      * command-line binary.
@@ -105 +105 @@
     function send($recipients, $headers, $body)
     {
+        if (!is_array($headers)) {
+            return PEAR::raiseError('$headers must be an array');
+        }
+
+        $result = $this->_sanitizeHeaders($headers);
+        if (is_a($result, 'PEAR_Error')) {
+            return $result;
+        }
+
         $recipients = $this->parseRecipients($recipients);
-        if (PEAR::isError($recipients)) {
+        if (is_a($recipients, 'PEAR_Error')) {
             return $recipients;
         }
-        $recipients = escapeShellCmd(implode(' ', $recipients));
+        $recipients = implode(' ', array_map('escapeshellarg', $recipients));
 
-        $this->_sanitizeHeaders($headers);
         $headerElements = $this->prepareHeaders($headers);
-        if (PEAR::isError($headerElements)) {
+        if (is_a($headerElements, 'PEAR_Error')) {
             return $headerElements;
         }
         list($from, $text_headers) = $headerElements;
+
+        /* Since few MTAs are going to allow this header to be forged
+         * unless it's in the MAIL FROM: exchange, we'll use
+         * Return-Path instead of From: if it's set. */
+        if (!empty($headers['Return-Path'])) {
+            $from = $headers['Return-Path'];
+        }
 
         if (!isset($from)) {
@@ -127 +142 @@
         }
 
-        $from = escapeShellCmd($from);
+        $from = escapeshellarg($from); // Security bug #16200
+
         $mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
         if (!$mail) {