Merge pull request #366 from develart-projects/sendmailEmailHeaderFix

sendmail header sanitization quick-fix, as described in #326
Shardj · Aug 15, 2023 · ec42481 · ec42481
2 parents 1f5789a + 9bfa4a3
commit ec42481
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/library/Zend/Mail/Transport/Sendmail.php b/library/Zend/Mail/Transport/Sendmail.php
@@ -136,18 +136,21 @@ public function _sendMail()
                 $fromEmailHeader = str_replace("\r\n", "\n", $fromEmailHeader);
             }
             // Sanitize the From header
-            if (!Zend_Validate::is($fromEmailHeader, 'EmailAddress')) {
+            // https://github.com/Shardj/zf1-future/issues/326
+            // this is just quick-fix, we need to agree on how to sanitize all potential params used as 5th param to mail()
+            if ( empty($fromEmailHeader) === FALSE && Zend_Validate::is($fromEmailHeader, 'EmailAddress') === FALSE) {
                 throw new Zend_Mail_Transport_Exception('Potential code injection in From header');
-            } else {
-                set_error_handler([$this, '_handleMailErrors']);
-                $result = mail(
-                    $recipients,
-                    $subject,
-                    $body,
-                    $header,
-                    $fromEmailHeader);
-                restore_error_handler();
             }
+
+            set_error_handler([$this, '_handleMailErrors']);
+            $result = mail(
+                $recipients,
+                $subject,
+                $body,
+                $header,
+                $fromEmailHeader);
+            restore_error_handler();
+
         }
 
         if ($this->_errstr !== null || !$result) {