Skip to content

[Mailer][MailJet] Fix forbidden headers case-sensitive comparison #61876

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

Closed
benjamintoussaint wants to merge 7 commits into from
Closed

[Mailer][MailJet] Fix forbidden headers case-sensitive comparison #61876

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7209f65
[Mailer] Fix MailJet bridge forbidden headers case-sensitive comparison
benjamintoussaint Sep 29, 2025
f8da07c
[Mailer] Use all headers key in loop as lowercase header name
benjamintoussaint Sep 29, 2025
439ee28
[Mailer] Use a local variable to compare header names
benjamintoussaint Sep 29, 2025
2917069
[Mailer] Fix header to message keys case discrepancy
benjamintoussaint Sep 29, 2025
4af9d7b
[Mailer] Fix header to message keys case discrepancy for keys
benjamintoussaint Sep 29, 2025
08531ba
Fix code style following PR check
benjamintoussaint Sep 29, 2025
489b819
[Mailer] Simplify case conversion logic to its base
benjamintoussaint Sep 29, 2025
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
41 changes: 21 additions & 20 deletions src/Symfony/Component/Mailer/Bridge/Mailjet/Transport/MailjetApiTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@ class MailjetApiTransport extends AbstractApiTransport
private const HOST = 'api.mailjet.com';
private const API_VERSION = '3.1';
private const FORBIDDEN_HEADERS = [
'Date', 'X-CSA-Complaints', 'Message-Id', 'X-MJ-StatisticsContactsListID',
'DomainKey-Status', 'Received-SPF', 'Authentication-Results', 'Received',
'From', 'Sender', 'Subject', 'To', 'Cc', 'Bcc', 'Reply-To', 'Return-Path', 'Delivered-To', 'DKIM-Signature',
'X-Feedback-Id', 'X-Mailjet-Segmentation', 'List-Id', 'X-MJ-MID', 'X-MJ-ErrorMessage',
'X-Mailjet-Debug', 'User-Agent', 'X-Mailer', 'X-MJ-WorkflowID',
'date', 'x-csa-complaints', 'message-id', 'x-mj-statisticscontactslistid',
'domainkey-status', 'received-spf', 'authentication-results', 'received',
'from', 'sender', 'subject', 'to', 'cc', 'bcc', 'reply-to', 'return-path', 'delivered-to', 'dkim-signature',
'x-feedback-id', 'x-mailjet-segmentation', 'list-id', 'x-mj-mid', 'x-mj-errormessage',
'x-mailjet-debug', 'user-agent', 'x-mailer', 'x-mj-workflowid',
];
private const HEADER_TO_MESSAGE = [
'X-MJ-TemplateLanguage' => ['TemplateLanguage', 'bool'],
'X-MJ-TemplateID' => ['TemplateID', 'int'],
'X-MJ-TemplateErrorReporting' => ['TemplateErrorReporting', 'json'],
'X-MJ-TemplateErrorDeliver' => ['TemplateErrorDeliver', 'bool'],
'X-MJ-Vars' => ['Variables', 'json'],
'X-MJ-CustomID' => ['CustomID', 'string'],
'X-MJ-EventPayload' => ['EventPayload', 'string'],
'X-Mailjet-Campaign' => ['CustomCampaign', 'string'],
'X-Mailjet-DeduplicateCampaign' => ['DeduplicateCampaign', 'bool'],
'X-Mailjet-Prio' => ['Priority', 'int'],
'X-Mailjet-TrackClick' => ['TrackClicks', 'string'],
'X-Mailjet-TrackOpen' => ['TrackOpens', 'string'],
'x-mj-templatelanguage' => ['TemplateLanguage', 'bool'],
'x-mj-templateid' => ['TemplateID', 'int'],
'x-mj-templateerrorreporting' => ['TemplateErrorReporting', 'json'],
'x-mj-templateerrordeliver' => ['TemplateErrorDeliver', 'bool'],
'x-mj-vars' => ['Variables', 'json'],
'x-mj-customid' => ['CustomID', 'string'],
'x-mj-eventpayload' => ['EventPayload', 'string'],
'x-mailjet-campaign' => ['CustomCampaign', 'string'],
'x-mailjet-deduplicatecampaign' => ['DeduplicateCampaign', 'bool'],
'x-mailjet-prio' => ['Priority', 'int'],
'x-mailjet-trackclick' => ['TrackClicks', 'string'],
'x-mailjet-trackopen' => ['TrackOpens', 'string'],
];

public function __construct(
Expand Down Expand Up @@ -139,12 +139,13 @@ private function getPayload(Email $email, Envelope $envelope): array
$message['HTMLPart'] = $html;
}

foreach ($email->getHeaders()->all() as $header) {
if ($convertConf = self::HEADER_TO_MESSAGE[$header->getName()] ?? false) {
foreach ($email->getHeaders()->all() as $headerName => $header) {
if ($convertConf = self::HEADER_TO_MESSAGE[$headerName] ?? false) {
$message[$convertConf[0]] = $this->castCustomHeader($header->getBodyAsString(), $convertConf[1]);
continue;
}
if (\in_array($header->getName(), self::FORBIDDEN_HEADERS, true)) {

if (\in_array($headerName, self::FORBIDDEN_HEADERS, true)) {
continue;
}

Expand Down
Loading