bug #30658 [Messenger] Ensure an exception is thrown when the AMQP co…

…nnect() does not work (sroze) This PR was merged into the 4.3-dev branch. Discussion ---------- [Messenger] Ensure an exception is thrown when the AMQP connect() does not work | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30557 | License | MIT | Doc PR | ø This `connectionCredentials` instance escaped the renaming in #30557. Commits ------- 46b9476 Ensure an exception is thrown when the AMQP connect() does not work
symfony · Mar 23, 2019 · 521d82a · 521d82a
2 parents 6ff1185 + 46b9476
commit 521d82a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/ConnectionTest.php
@@ -335,6 +335,27 @@ public function testItDelaysTheMessageWithADifferentRoutingKeyAndTTLs()
         $delayExchange->expects($this->once())->method('publish')->with('{}', 'delay_120000', AMQP_NOPARAM, ['headers' => []]);
         $connection->publish('{}', [], 120000);
     }
+
+    /**
+     * @expectedException \AMQPException
+     * @expectedExceptionMessage Could not connect to the AMQP server. Please verify the provided DSN. ({"delay":{"routing_key_pattern":"delay_%delay%","exchange_name":"delay","queue_name_pattern":"delay_queue_%delay%"},"host":"localhost","port":5672,"vhost":"\/","login":"user","password":"********"})
+     */
+    public function testObfuscatePasswordInDsn()
+    {
+        $factory = new TestAmqpFactory(
+            $amqpConnection = $this->createMock(\AMQPConnection::class),
+            $amqpChannel = $this->createMock(\AMQPChannel::class),
+            $amqpQueue = $this->createMock(\AMQPQueue::class),
+            $amqpExchange = $this->createMock(\AMQPExchange::class)
+        );
+
+        $amqpConnection->method('connect')->willThrowException(
+            new \AMQPConnectionException('Oups.')
+        );
+
+        $connection = Connection::fromDsn('amqp://user:secretpassword@localhost/%2f/messages', [], $factory);
+        $connection->channel();
+    }
 }
 
 class TestAmqpFactory extends AmqpFactory

diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -317,7 +317,7 @@ public function channel(): \AMQPChannel
             try {
                 $connection->{$connectMethod}();
             } catch (\AMQPConnectionException $e) {
-                $credentials = $this->connectionCredentials;
+                $credentials = $this->connectionConfiguration;
                 $credentials['password'] = '********';
 
                 throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s)', json_encode($credentials)), 0, $e);