symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Lines changed: 32 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Lines changed: 32 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
Lines changed: 20 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
Lines changed: 20 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Mailer/CHANGELOG.md
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Mailer/CHANGELOG.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Mailer/EventListener/DkimSignedMessageListener.php
Lines changed: 66 additions & 0 deletions b/‎src/Symfony/Component/Mailer/EventListener/DkimSignedMessageListener.php
Lines changed: 66 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mailer/EventListener/SmimeSignedMessageListener.php
Lines changed: 66 additions & 0 deletions b/‎src/Symfony/Component/Mailer/EventListener/SmimeSignedMessageListener.php
Lines changed: 66 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mailer/Tests/EventListener/DkimSignedMessageListenerTest.php
Lines changed: 64 additions & 0 deletions b/‎src/Symfony/Component/Mailer/Tests/EventListener/DkimSignedMessageListenerTest.php
Lines changed: 64 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Mailer/Tests/EventListener/SmimeSignedMessageListenerTest.php
Lines changed: 64 additions & 0 deletions b/‎src/Symfony/Component/Mailer/Tests/EventListener/SmimeSignedMessageListenerTest.php
Lines changed: 64 additions & 0 deletions
@@ -2190,6 +2190,38 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                             ->end()
                         ->end()
                     ->end()
+                    ->children()
+                        ->arrayNode('signer')
+                            ->info('Signer configuration')
+                            ->children()
+                                ->arrayNode('dkim')
+                                    ->info('DKIM configuration')
+                                    ->children()
+                                        ->scalarNode('key')->defaultNull()->end()
+                                        ->scalarNode('domain')->defaultNull()->end()
+                                        ->scalarNode('select')->defaultNull()->end()
+                                        ->scalarNode('passphrase')->defaultNull()->end()
+                                        ->arrayNode('options')
+                                            ->normalizeKeys(false)
+                                            ->defaultValue([])
+                                            ->prototype('variable')
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                                ->arrayNode('smime')
+                                    ->info('SMIME configuration')
+                                    ->children()
+                                        ->scalarNode('key')->defaultNull()->end()
+                                        ->scalarNode('certificate')->defaultNull()->end()
+
->scalarNode('passphrase')->defaultNull()->end()                                        ->scalarNode('passphrase')->defaultNull()->end()
+                                        ->scalarNode('extra_certificates')->defaultNull()->end()
+                                        ->scalarNode('sign_options')->defaultNull()->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
                 ->end()
             ->end()
         ;
 
@@ -2720,6 +2720,21 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             $container->removeDefinition('mailer.messenger_transport_listener');
         }
 
+        $dkimSignerListener = $container->getDefinition('mailer.signer.dkim');
+        $dkimSignerListener->setArgument(0, $config['signer']['dkim']['key'] ?? null);
+        $dkimSignerListener->setArgument(1, $config['signer']['dkim']['domain'] ?? null);
+        $dkimSignerListener->setArgument(2, $config['signer']['dkim']['select'] ?? null);
+        $dkimSignerListener->setArgument(3, $config['signer']['dkim']['passphrase'] ?? null);
+        $dkimSignerListener->setArgument(4, $config['signer']['dkim']['options'] ?? []);
+
+        $smimeSignerListener = $container->getDefinition('mailer.signer.smime');
+        $smimeSignerListener->setArgument(0, $config['signer']['smime']['key'] ?? null);
+        $smimeSignerListener->setArgument(1, $config['signer']['smime']['certificate'] ?? null);
+        $smimeSignerListener->setArgument(2, $config['signer']['smime']['passphrase'] ?? null);
+        $smimeSignerListener->setArgument(3, $config['signer']['smime']['extra_certificates'] ?? null);
+        $smimeSignerListener->setArgument(4, $config['signer']['smime']['sign_options'] ?? null);
+
+
         if ($webhookEnabled) {
             $loader->load('mailer_webhook.php');
         }
 
@@ -12,10 +12,12 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Mailer\Command\MailerTestCommand;
+use Symfony\Component\Mailer\EventListener\DkimSignedMessageListener;
 use Symfony\Component\Mailer\EventListener\EnvelopeListener;
 use Symfony\Component\Mailer\EventListener\MessageListener;
 use Symfony\Component\Mailer\EventListener\MessageLoggerListener;
 use Symfony\Component\Mailer\EventListener\MessengerTransportListener;
+use Symfony\Component\Mailer\EventListener\SmimeSignedMessageListener;
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Mailer\Messenger\MessageHandler;
@@ -77,7 +79,24 @@
 
         ->set('mailer.messenger_transport_listener', MessengerTransportListener::class)
             ->tag('kernel.event_subscriber')
-
+        ->set('mailer.signer.dkim', DkimSignedMessageListener::class)
+            ->args([
+                abstract_arg('key'),
+                abstract_arg('domain'),
+                abstract_arg('select'),
+                abstract_arg('passphrase'),
+                abstract_arg('options'),
+            ])
+            ->tag('kernel.event_subscriber')
+        ->set('mailer.signer.smime', SmimeSignedMessageListener::class)
+            ->args([
+                abstract_arg('key'),
+                abstract_arg('certificate'),
+                abstract_arg('passphrase'),
+                abstract_arg('extraCertificates'),
+                abstract_arg('signOptions'),
+            ])
+            ->tag('kernel.event_subscriber')
         ->set('console.command.mailer_test', MailerTestCommand::class)
             ->args([
                 service('mailer.transports'),
 
@@ -4,6 +4,7 @@ CHANGELOG
 7.2
 ---
 
+ * Allow adding DKIM or SMIME signer configuration to the mailer
  * Deprecate `TransportFactoryTestCase`, extend `AbstractTransportFactoryTestCase` instead
 
    The `testIncompleteDsnException()` test is no longer provided by default. If you make use of it by implementing the `incompleteDsnProvider()` data providers,
 
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\Exception\InvalidArgumentException;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Crypto\DkimSigner;
+use Symfony\Component\Mime\Crypto\SMimeSigner;
+use Symfony\Component\Mime\Message;
+
+/**
+ * Signs the message.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Elías Fernández
+ */
+class DkimSignedMessageListener implements EventSubscriberInterface
+{
+
+    public function __construct(
+        private ?string $key = null,
+        private ?string $domain = null,
+        private ?string $select = null,
+        private ?string $passphrase = null,
+        private array $options = []
+    ) {
+    }
+
+
+    public function onMessage(MessageEvent $event): void
+    {
+        $message = $event->getMessage();
+        if (
+            !$message instanceof Message ||
+            empty($this->key)
+        ) {
+            return;
+        }
+
+        if (empty($this->domain)) {
+            throw new InvalidArgumentException('No domain provided for DKIM message');
+        }
+
+        $signer = new DkimSigner($this->key, $this->domain, $this->select, $this->options, $this->passphrase ?? '');
+
+        $event->setMessage($signer->sign($message));
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            MessageEvent::class => ['onMessage', -128],
+        ];
+    }
+}
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\Exception\InvalidArgumentException;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Crypto\DkimSigner;
+use Symfony\Component\Mime\Crypto\SMimeSigner;
+use Symfony\Component\Mime\Message;
+
+/**
+ * Signs the message.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Elías Fernández
+ */
+class SmimeSignedMessageListener implements EventSubscriberInterface
+{
+
+    public function __construct(
+        private ?string $key = null,
+        private ?string $certificate = null,
+        private ?string $passphrase = null,
+        private ?string $extraCertificates = null,
+        private ?string $signOptions = null
+    ) {
+    }
+
+
+    public function onMessage(MessageEvent $event): void
+    {
+        $message = $event->getMessage();
+        if (
+            !$message instanceof Message ||
+            empty($this->key)
+        ) {
+            return;
+        }
+
+        if (empty($this->certificate)) {
+            throw new InvalidArgumentException('No certificate provided for SMIME message');
+        }
+
+        $signer = new SMimeSigner($this->certificate, $this->key, $this->passphrase, $this->extraCertificates, $this->signOptions);
+
+        $event->setMessage($signer->sign($message));
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            MessageEvent::class => ['onMessage', -128],
+        ];
+    }
+}
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\EventListener\MessageListener;
+use Symfony\Component\Mailer\EventListener\DkimSignedMessageListener;
+use Symfony\Component\Mailer\Exception as MailerException;
+use Symfony\Component\Mime\Exception as MimeException;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Header\Headers;
+use Symfony\Component\Mime\Header\MailboxListHeader;
+use Symfony\Component\Mime\Header\UnstructuredHeader;
+use Symfony\Component\Mime\Message;
+
+class DkimSignedMessageListenerTest extends TestCase
+{
+    public function testMessageEqualsWhenNoSigner()
+    {
+        $listener = new DkimSignedMessageListener();
+        $message = new Message();
+        $envelope = new Envelope(new Address('sender@example.com'), [new Address('r1@example.com')]);
+        $event = new MessageEvent($message, $envelope, 'default');
+
+        $listener->onMessage($event);
+
+        $this->assertEquals($message, $event->getMessage());
+    }
+
+    public function testDkimMessageErrorWithoutDomain()
+    {
+        $listener = new DkimSignedMessageListener('dkim', 'file:///path/to/private-key.key');
+        $message = new Message();
+        $envelope = new Envelope(new Address('sender@example.com'), [new Address('r1@example.com')]);
+        $event = new MessageEvent($message, $envelope, 'default');
+
+        $this->expectException(MailerException\InvalidArgumentException::class);
+        
+        $listener->onMessage($event);
+    }
+
+    public function testSignedDkimMessage()
+    {
+        $listener = new DkimSignedMessageListener('dkim', 'file:///path/to/private-key.key', 'www.symfony.com', 'sfe');
+        $message = new Message();
+        $envelope = new Envelope(new Address('sender@example.com'), [new Address('r1@example.com')]);
+        $event = new MessageEvent($message, $envelope, 'default');
+
+        $this->expectException(MimeException\InvalidArgumentException::class); // An `Unable to load private key exception` is expected here
+
+        $listener->onMessage($event);
+    }
+}
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mailer\Tests\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\EventListener\MessageListener;
+use Symfony\Component\Mailer\EventListener\SmimeSignedMessageListener;
+use Symfony\Component\Mailer\Exception as MailerException;
+use Symfony\Component\Mime\Exception as MimeException;
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Header\Headers;
+use Symfony\Component\Mime\Header\MailboxListHeader;
+use Symfony\Component\Mime\Header\UnstructuredHeader;
+use Symfony\Component\Mime\Message;
+
+class SmimeSignedMessageListenerTest extends TestCase
+{
+    public function testMessageEqualsWhenNoSigner()
+    {
+        $listener = new SmimeSignedMessageListener();
+        $message = new Message();
+        $envelope = new Envelope(new Address('sender@example.com'), [new Address('r1@example.com')]);
+        $event = new MessageEvent($message, $envelope, 'default');
+
+        $listener->onMessage($event);
+
+        $this->assertEquals($message, $event->getMessage());
+    }
+
+    public function testSmimeMessageErrorWithoutCerficate()
+    {
+        $listener = new SmimeSignedMessageListener('dkim', 'file:///path/to/private-key.key');
+        $message = new Message();
+        $envelope = new Envelope(new Address('sender@example.com'), [new Address('r1@example.com')]);
+        $event = new MessageEvent($message, $envelope, 'default');
+
+        $this->expectException(MailerException\InvalidArgumentException::class);
+
+        $listener->onMessage($event);
+    }
+
+    public function testSignedSmimeMessage()
+    {
+        $listener = new SmimeSignedMessageListener('smime', 'file:///path/to/private-key.key', 'file:///path/to/certificate.crt');
+        $message = new Message();
+        $envelope = new Envelope(new Address('sender@example.com'), [new Address('r1@example.com')]);
+        $event = new MessageEvent($message, $envelope, 'default');
+
+        $this->expectException(MimeException\RuntimeException::class); // A "file does not exist" error is expected here
+
+        $listener->onMessage($event);
+    }
+}