Merge pull request #2 from eugenys/master

Fix auth for redis transport

Author: ragboyjr

docker-compose.yml

@@ -9,5 +9,6 @@ services:
       - ./:/var/www/html
   redis:
     image: redis
+    command: redis-server --requirepass password123
     environment: { TERM: xterm }
     restart: unless-stopped

phpunit.xml.dist

@@ -9,7 +9,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <env name="SHELL_VERBOSITY" value="-1" />
-        <env name="REDIS_DSN" value="redis://redis:6379?queue=messenger"/>
+        <env name="REDIS_DSN" value="redis://u:password123@redis:6379?queue=messenger"/>
     </php>
     <testsuites>
         <testsuite name="feature">

src/Transport/RedisTransport.php

@@ -54,14 +54,15 @@ public static function fromDsn(SerializerInterface $serializer, string $dsn, arr
             $options['queue'] ?? $query['queue'],
             [$parsedUrl['host'] ?? '127.0.0.1', intval($parsedUrl['port'] ?? 6379)],
             function(Redis $conn) use ($query, $parsedUrl, $options) {
-                $db = $options['db'] ?? $query['db'] ?? null;
-                if ($db !== null) {
-                    $conn->select($db);
-                }
                 $auth = $options['password'] ?? $parsedUrl['pass'] ?? null;
                 if ($auth) {
                     $conn->auth($auth);
                 }
+                $db = $options['db'] ?? $query['db'] ?? null;
+                if ($db !== null) {
+                    $db = intval($db);
+                    $conn->select($db);
+                }
             }
         );
     }

tests/Feature/Fixtures/redis-config.yaml

@@ -3,9 +3,9 @@ framework:
     enabled: true
   messenger:
     transports:
-      krak_redis: 'redis://redis:6379?queue=messenger'
+      krak_redis: 'redis://u:password123@redis:6379?queue=messenger'
       sf_redis:
-        dsn: 'redis://redis:6379'
+        dsn: 'redis://u:password123@redis:6379'
         options: { use_krak_redis: false }
     routing:
       'Krak\SymfonyMessengerRedis\Tests\Feature\Fixtures\KrakRedisMessage': krak_redis

tests/Feature/TransportTest.php

@@ -25,9 +25,18 @@ protected function setUp() {
         $this->transport = RedisTransport::fromDsn(Serializer::create(), getenv('REDIS_DSN'));
         $this->redis = new \Redis();
         $this->redis->connect('redis');
+        $this->redis->auth('password123');
         $this->redis->flushAll();
     }
 
+    /** @test */
+    public function allows_custom_db() {
+        $this->given_the_redis_transport_contains_db();
+        $this->given_there_is_a_wrapped_message();
+        $this->when_the_message_is_sent_received_and_acked();
+        $this->then_the_queues_are_empty();
+    }
+
     /** @test */
     public function can_send_a_message() {
         $this->given_there_is_a_wrapped_message();
@@ -189,4 +198,9 @@ public function then_the_message_is_available_after(int $delayMs) {
         $res = $this->transport->get();
         $this->assertCount(1, $res);
     }
+
+    public function given_the_redis_transport_contains_db()
+    {
+        $this->transport = RedisTransport::fromDsn(Serializer::create(), getenv('REDIS_DSN'), ['db' => 2]);
+    }
 }