diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mailer][Mime] Fix case-sensitive handling of header names

Browse Source
This commit is contained in:
Piotr Kugla 2021-01-23 17:03:13 +01:00 committed by Fabien Potencier
parent 6f8b4cbfe6
commit d563c846f6
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Mailer/EventListener/MessageListener.php
View File

@ -58,7 +58,7 @@ class MessageListener implements EventSubscriberInterface
throw new InvalidArgumentException(sprintf('The "%d" rule is not supported.', $rule));
}
$this->headerRules[$headerName] = $rule;
$this->headerRules[strtolower($headerName)] = $rule;
}
public function onMessage(MessageEvent $event): void

12
src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php
View File

@ -101,5 +101,17 @@ class MessageListenerTest extends TestCase
->add(new MailboxListHeader('bcc', [new Address('bcc-initial@example.com'), new Address('bcc-default@example.com'), new Address('bcc-default-1@example.com')]))
;
yield 'bcc, add another bcc (unique header)' => [$initialHeaders, $defaultHeaders, $expectedHeaders];
$initialHeaders = (new Headers())
->add(new UnstructuredHeader('foo', 'initial'))
;
$defaultHeaders = (new Headers())
->add(new UnstructuredHeader('foo', 'bar'))
->add(new UnstructuredHeader('bar', 'foo'))
;
$rules = [
'Foo' => MessageListener::HEADER_REPLACE,
];
yield 'Capitalized header rule (case-insensitive), replace if set' => [$initialHeaders, $defaultHeaders, $defaultHeaders, $rules];
}
}

4
src/Symfony/Component/Mime/Header/Headers.php
View File

@ -143,7 +143,7 @@ final class Headers
*/
public function addHeader(string $name, $argument, array $more = []): self
{
$parts = explode('\\', self::HEADER_CLASS_MAP[$name] ?? UnstructuredHeader::class);
$parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class);
$method = 'add'.ucfirst(array_pop($parts));
if ('addUnstructuredHeader' === $method) {
$method = 'addTextHeader';
@ -217,7 +217,7 @@ final class Headers
public static function isUniqueHeader(string $name): bool
{
return \in_array($name, self::UNIQUE_HEADERS, true);
return \in_array(strtolower($name), self::UNIQUE_HEADERS, true);
}
/**

14
src/Symfony/Component/Mime/Tests/Header/HeadersTest.php
View File

@ -239,6 +239,20 @@ class HeadersTest extends TestCase
$this->assertFalse($headers->has('Message-ID'));
}
public function testAddHeaderIsNotCaseSensitive()
{
$headers = new Headers();
$headers->addHeader('From', ['from@example.com']);
$this->assertInstanceOf(MailboxListHeader::class, $headers->get('from'));
$this->assertEquals([new Address('from@example.com')], $headers->get('from')->getBody());
}
public function testIsUniqueHeaderIsNotCaseSensitive()
{
$this->assertTrue(Headers::isUniqueHeader('From'));
}
public function testToStringJoinsHeadersTogether()
{
$headers = new Headers();