bug #37624 [Cache] Connect to RedisCluster with password auth (mforbak)

nicolas-grekas · nicolas-grekas · commit ebc7f4b97ea2 · 2020-07-23T11:54:49.000+02:00
This PR was submitted for the master branch but it was merged into the 4.4 branch instead. Discussion ---------- [Cache] Connect to RedisCluster with password auth | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Currently it is not possible to connect to RedisCluster with password. AUTH param is described in documentation (last example) https://symfony.com/doc/current/components/cache/adapters/redis_adapter.html#configure-the-connection but totally ignored in the code and connection fails ``` RedisAdapter::createConnection( 'redis:?host[localhost]&host[localhost:6379]&host[/var/run/redis.sock:]&auth=my-password&redis_cluster=1' ); ``` See RedisCluster usage here https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#declaring-a-cluster-with-an-array-of-seeds Commits ------- e873ddd Connect to RedisCluster with password auth
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -228,7 +228,7 @@ public static function createConnection($dsn, array $options = [])
                 }
 
                 try {
-                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent']);
+                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '');
                 } catch (\RedisClusterException $e) {
                     throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public static function createConnection($dsn, array $options = [])`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`try {`
`231`		`- $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent']);`
	`231`	`+ $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '');`
`232`	`232`	`} catch (\RedisClusterException $e) {`
`233`	`233`	`throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());`
`234`	`234`	`}`