8000 [Mailer] Fix mailer signer configuration issues by eliasfernandez · Pull Request #59855 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Mailer] Fix mailer signer configuration issues #59855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2025
Merged

[Mailer] Fix mailer signer configuration issues #59855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2879,8 +2879,8 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
throw new LogicException('SMIME signed messages support cannot be enabled as this version of the Mailer component does not support it.');
}
$smimeSigner = $container->getDefinition('mailer.smime_signer');
$smimeSigner->setArgument(0, $config['smime_signer']['key']);
$smimeSigner->setArgument(1, $config['smime_signer']['certificate']);
$smimeSigner->setArgument(0, $config['smime_signer']['certificate']);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the abstract args in mailer.smime_signer are describing key as the first argument. Are those descriptions wrong as well ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the abstract args in mailer.smime_signer are describing key as the first argument. Are those descriptions wrong as well ?

Yes, I think so. Looks like the abstract_arg is not affecting in the scenario case described in the PR but probably is worth changing it in the Configuration and schema files.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the description in abstract_arg is used if you forget to configure the argument to replace the abstract arg. As this line overrides the argument, you won't get an error message saying you forget to configure the key. But it is weird if descriptions don't match.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configuration and schema don't need to change. Those don't describe service definitions with ordered parameters. The order is not relevant there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification. I'll rollback Configuration and schema changes.

$smimeSigner->setArgument(1, $config['smime_signer']['key']);
$smimeSigner->setArgument(2, $config['smime_signer']['passphrase']);
$smimeSigner->setArgument(3, $config['smime_signer']['extra_certificates']);
$smimeSigner->setArgument(4, $config['smime_signer']['sign_options']);
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@

->set('mailer.smime_signer', SMimeSigner::class)
->args([
abstract_arg('key'),
abstract_arg('certificate'),
abstract_arg('key'),
abstract_arg('passphrase'),
abstract_arg('extraCertificates'),
ab 6642 stract_arg('signOptions'),
Expand All @@ -110,7 +110,7 @@

->set('mailer.dkim_signer.listener', DkimSignedMessageListener::class)
->args([
service(DkimSigner::class),
service('mailer.dkim_signer'),
])
->tag('kernel.event_subscriber')

Expand Down
Loading
0