Merge pull request #24 from flownative/fix-sentinel-passwords

Fix support for Sentinels with passwords
flownative · Nov 23, 2022 · 523604a · 523604a
2 parents 53450ed + 0ed5907
commit 523604a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/Classes/Command/RedisSentinelCommandController.php b/Classes/Command/RedisSentinelCommandController.php
@@ -25,6 +25,7 @@
 use Neos\Flow\Cli\CommandController;
 use Predis\Client;
 use Predis\Command\Redis\INFO;
+use Predis\Connection\Parameters;
 use Predis\Connection\Replication\SentinelReplication;
 
 /**
@@ -297,7 +298,16 @@ private function getRedisClient(array $sentinels, string $password, string $serv
         }
 
         if ($sentinels !== []) {
-            $connectionParameters = $sentinels;
+            $connectionParameters = [];
+            foreach ($sentinels as $sentinel) {
+                $parsed = Parameters::parse($sentinel);
+                $connectionParameters[] = [
+                    'host' => $parsed['host'],
+                    'port' => $parsed['port'],
+                    'password' => $password
+                ];
+            }
+
             $options['replication'] = 'sentinel';
             $options['service'] = $service;
         } else {

diff --git a/Classes/RedisBackend.php b/Classes/RedisBackend.php
@@ -29,6 +29,7 @@
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Predis;
 use Predis\Collection\Iterator;
+use Predis\Connection\Parameters;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Throwable;
@@ -593,7 +594,15 @@ private function getRedisClient(): \Predis\Client
             }
 
             if ($this->sentinels !== []) {
-                $connectionParameters = $this->sentinels;
+                $connectionParameters = [];
+                foreach ($this->sentinels as $sentinel) {
+                    $parsed = Parameters::parse($sentinel);
+                    $connectionParameters[] = [
+                        'host' => $parsed['host'],
+                        'port' => $parsed['port'],
+                        'password' => $this->password
+                    ];
+                }
                 $options['replication'] = 'sentinel';
                 $options['service'] = $this->service;
             } else {

diff --git a/README.md b/README.md
@@ -84,30 +84,10 @@ Flow_Mvc_Routing_Resolve:
 Note that "service" is the name of your Redis cluster (which is "mymaster" in
 most default configurations).
 
-If your Sentinels are protected with a password, you must specify the 
-password via the Sentinel URLs (due to how Predis works internally). Note 
-that no username is specified, but you must not forget the colon ":" before 
-the password:
+This package will use the same password for all connections, there is 
+currently no support for specifying different passwords for Sentinel and 
+client servers.
 
-```yaml
-Flow_Mvc_Routing_Route:
-    backend: 'Flownative\RedisSentinel\RedisBackend'
-    backendOptions: &backendOptions
-        sentinels:
-            - 'redis://:[email protected]:26379'
-            - 'redis://:[email protected]:26379'
-            - 'redis://:[email protected]:26379'
-        service: 'mymaster'
-        password: 'a-very-long-password'
-        database: 0
-        timeout: 0.5
-        readWriteTimeout: 0.1
-
-Flow_Mvc_Routing_Resolve:
-    backend: 'Flownative\RedisSentinel\RedisBackend'
-    backendOptions: *backendOptions
-    …
-```
 ## Logging
 
 This cache backend will log errors, such as connection timeouts or other