Fix insufficient sendmail command argument escaping (thanks to Mitchel Sahertian...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14650 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php
index 06abdd3173e0c5df2b382a7bd370272c71429363..27b9845e105e8d6140c41d0b25b62273a5057fc8 100644 (file)
--- a/class/deliver/Deliver_SendMail.class.php
+++ b/class/deliver/Deliver_SendMail.class.php
@@ -106,11 +106,10 @@ class Deliver_SendMail extends Deliver {
         $rfc822_header = $message->rfc822_header;
         $from = $rfc822_header->from[0];
         $envelopefrom = trim($from->mailbox.'@'.$from->host);
-        $envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom);
         // save executed command for future reference
-        $this->sendmail_command = "$sendmail_path $this->sendmail_args -f$envelopefrom";
+        $this->sendmail_command = escapeshellcmd("$sendmail_path $this->sendmail_args -f") . escapeshellarg($envelopefrom);
         // open process handle for writing
-        $stream = popen (escapeshellcmd($this->sendmail_command), "w");
+        $stream = popen($this->sendmail_command, "w");
         return $stream;
     }
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index d4cdb30a35ce03c89eff2836eb58e944e819b84e..2d5416704f0883ef865d85b5222a37c19910c8d5 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -404,6 +404,9 @@ Version 1.5.2 - SVN
     the HELO host sent to the SMTP server when sending messages
   - Added PDO support for database connections, so no external
     database module needs to be installed
+  - Fixed insufficient sendmail command argument escaping (thanks
+    to Mitchel Sahertian, Maor Shwartz and Dawid Golunski for
+    bringing this to our attention). [CVE-2017-7692]
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------