diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-04 17:43:53 +0100 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-02-08 18:42:31 +0100 |
commit | ca7547c9e2f9120768d8290001ec6e1509b3597f (patch) | |
tree | 932919802e4ee86e3ff24e220d8c51719fc60956 | |
parent | 4ff2665509a0d2172e558fa21ed6718792349e85 (diff) | |
download | php-git-ca7547c9e2f9120768d8290001ec6e1509b3597f.tar.gz |
Fix #80706: mail(): Headers after Bcc headers may be ignored
We need to handle the case where a CRLF after a Bcc header is not the
beginning of a folding marker, because in that case the Bcc header was
not the last "thing".
Closes GH-6666.
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | ext/standard/tests/mail/bug80706.phpt | 76 | ||||
-rw-r--r-- | win32/sendmail.c | 2 |
3 files changed, 80 insertions, 1 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2021, PHP 7.4.16 +- Core: + . Fixed #80706 (mail(): Headers after Bcc headers may be ignored). (cmb) + - MySQLi: . Fixed bug #74779 (x() and y() truncating floats to integers). (cmb) diff --git a/ext/standard/tests/mail/bug80706.phpt b/ext/standard/tests/mail/bug80706.phpt new file mode 100644 index 0000000000..b478c49c4b --- /dev/null +++ b/ext/standard/tests/mail/bug80706.phpt @@ -0,0 +1,76 @@ +--TEST-- +Bug #72964 (White space not unfolded for CC/Bcc headers) +--SKIPIF-- +<?php +if (PHP_OS_FAMILY !== 'Windows') die('skip Windows only test'); +if (getenv("SKIP_SLOW_TESTS")) die('skip slow test'); +require_once __DIR__ . '/mail_skipif.inc'; +?> +--INI-- +SMTP=localhost +smtp_port=25 +--FILE-- +<?php +require_once __DIR__ . '/mail_include.inc'; + +function find_and_delete_message($username, $subject) { + global $default_mailbox, $password; + + $imap_stream = imap_open($default_mailbox, $username, $password); + if ($imap_stream === false) { + die("Cannot connect to IMAP server $server: " . imap_last_error() . "\n"); + } + + $found = false; + $repeat_count = 20; // we will repeat a max of 20 times + while (!$found && $repeat_count > 0) { + // sleep for a while to allow msg to be delivered + sleep(1); + + $num_messages = imap_check($imap_stream)->Nmsgs; + for ($i = $num_messages; $i > 0; $i--) { + $info = imap_headerinfo($imap_stream, $i); + if ($info->subject === $subject) { + $header = imap_fetchheader($imap_stream, $i); + echo "X-Mailer header found: "; + var_dump(strpos($header, 'X-Mailer: bug80706') !== false); + imap_delete($imap_stream, $i); + $found = true; + break; + } + } + $repeat_count--; + } + + imap_close($imap_stream, CL_EXPUNGE); + return $found; +} + +$to = "{$users[1]}@$domain"; +$subject = bin2hex(random_bytes(16)); +$message = 'hello'; +$headers = "From: webmaster@example.com\r\n" + . "Bcc: {$users[2]}@$domain\r\n" + . "X-Mailer: bug80706"; + +$res = mail($to, $subject, $message, $headers); +if ($res !== true) { + die("TEST FAILED : Unable to send test email\n"); +} else { + echo "Message sent OK\n"; +} + +foreach ([$users[1], $users[2]] as $user) { + if (!find_and_delete_message("$user@$domain", $subject)) { + echo "TEST FAILED: email not delivered\n"; + } else { + echo "TEST PASSED: Message sent and deleted OK\n"; + } +} +?> +--EXPECT-- +Message sent OK +X-Mailer header found: bool(true) +TEST PASSED: Message sent and deleted OK +X-Mailer header found: bool(true) +TEST PASSED: Message sent and deleted OK diff --git a/win32/sendmail.c b/win32/sendmail.c index c82dc7b3c6..0e38d7092f 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -526,7 +526,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char header we know it was the last thing. */ pos2 = pos1; } else { - char *pos3 = NULL; + char *pos3 = pos2; while (pos2[2] == ' ' || pos2[2] == '\t') { pos3 = strstr(pos2 + 2, "\r\n"); if (pos3 != NULL) { |