Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 82b220b

Browse filesBrowse files
committed
Improve interoperability in headers
1 parent b1a5394 commit 82b220b
Copy full SHA for 82b220b

File tree

1 file changed

+23
-5
lines changed
Filter options
  • src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport

1 file changed

+23
-5
lines changed

‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
+23-5Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ private function fetchMessage(): bool
203203
$headers = [];
204204
$attributes = $message->getMessageAttributes();
205205
if (isset($attributes[self::MESSAGE_ATTRIBUTE_NAME]) && 'String' === $attributes[self::MESSAGE_ATTRIBUTE_NAME]->getDataType()) {
206-
$headers = \json_decode($attributes[self::MESSAGE_ATTRIBUTE_NAME]->getStringValue(), true);
206+
$headers = json_decode($attributes[self::MESSAGE_ATTRIBUTE_NAME]->getStringValue(), true);
207207
unset($attributes[self::MESSAGE_ATTRIBUTE_NAME]);
208208
}
209209
foreach ($attributes as $name => $attribute) {
@@ -290,10 +290,28 @@ public function send(string $body, array $headers, int $delay = 0, ?string $mess
290290
'MessageAttributes' => [],
291291
];
292292

293-
$parameters['MessageAttributes'][self::MESSAGE_ATTRIBUTE_NAME] = new MessageAttributeValue([
294-
'DataType' => 'String',
295-
'StringValue' => \json_encode($headers),
296-
]);
293+
$specialHeaders = [];
294+
foreach ($headers as $name => $value) {
295+
if ('.' === $name[0] || self::MESSAGE_ATTRIBUTE_NAME === $name || \strlen($name) > 256 || '.' === substr($name, -1) || 'AWS.' === substr($name, 0, \strlen('AWS.')) || 'Amazon.' === substr($name, 0, \strlen('Amazon.')) || preg_match('/([^a-zA-Z0-9_\.-]+|\.\.)/', $name)) {
296+
$specialHeaders[$name] = $value;
297+
298+
continue;
299+
}
300+
301+
$parameters['MessageAttributes'][$name] = new MessageAttributeValue([
302+
'DataType' => 'String',
303+
'StringValue' => $value,
304+
]);
305+
}
306+
307+
if (!empty($specialHeaders)) {
308+
$parameters['MessageAttributes'][self::MESSAGE_ATTRIBUTE_NAME] = new MessageAttributeValue([
309+
'DataType' => 'String',
310+
'StringValue' => json_encode($specialHeaders),
311+
]);
312+
}
313+
314+
dd($parameters);
297315

298316
if (self::isFifoQueue($this->configuration['queue_name'])) {
299317
$parameters['MessageGroupId'] = null !== $messageGroupId ? $messageGroupId : __METHOD__;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.