bug #47533 [Messenger] decode URL-encoded characters in DSN's usernames/passwords (xabbuh)

xabbuh · xabbuh · commit 7a3991da5855 · 2022-09-11T12:05:47.000+03:00
This PR was merged into the 4.4 branch. Discussion ---------- [Messenger] decode URL-encoded characters in DSN's usernames/passwords | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #45549 | License | MIT | Doc PR | Commits ------- 7ae7d7b decode URL-encoded characters in DSN's usernames/passwords
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -126,11 +126,11 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am
         ], $options, $parsedQuery);
 
         if (isset($parsedUrl['user'])) {
-            $amqpOptions['login'] = $parsedUrl['user'];
+            $amqpOptions['login'] = urldecode($parsedUrl['user']);
         }
 
         if (isset($parsedUrl['pass'])) {
-            $amqpOptions['password'] = $parsedUrl['pass'];
+            $amqpOptions['password'] = urldecode($parsedUrl['pass']);
         }
 
         if (!isset($amqpOptions['queues'])) {
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -93,8 +93,8 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
         $stream = $pathParts[1] ?? $redisOptions['stream'] ?? null;
         $group = $pathParts[2] ?? $redisOptions['group'] ?? null;
         $consumer = $pathParts[3] ?? $redisOptions['consumer'] ?? null;
-        $pass = '' !== ($parsedUrl['pass'] ?? '') ? $parsedUrl['pass'] : null;
-        $user = '' !== ($parsedUrl['user'] ?? '') ? $parsedUrl['user'] : null;
+        $pass = '' !== ($parsedUrl['pass'] ?? '') ? urldecode($parsedUrl['pass']) : null;
+        $user = '' !== ($parsedUrl['user'] ?? '') ? urldecode($parsedUrl['user']) : null;
 
         $connectionCredentials = [
             'host' => $parsedUrl['host'] ?? '127.0.0.1',

Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,11 @@ public static function fromDsn(string $dsn, array $options = [], AmqpFactory $am`
`126`	`126`	`], $options, $parsedQuery);`
`127`	`127`
`128`	`128`	`if (isset($parsedUrl['user'])) {`
`129`		`- $amqpOptions['login'] = $parsedUrl['user'];`
	`129`	`+ $amqpOptions['login'] = urldecode($parsedUrl['user']);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`if (isset($parsedUrl['pass'])) {`
`133`		`- $amqpOptions['password'] = $parsedUrl['pass'];`
	`133`	`+ $amqpOptions['password'] = urldecode($parsedUrl['pass']);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`if (!isset($amqpOptions['queues'])) {`