Support rediss:// URI scheme for secure TLS transport

Author: clue

README.md

@@ -107,7 +107,7 @@ $factory = new Factory($loop, $connector);
 #### createClient()
 
 The `createClient($redisUri = null)` method can be used to create a new [`Client`](#client).
-It helps with establishing a plain TCP/IP connection to Redis
+It helps with establishing a plain TCP/IP or secure TLS connection to Redis
 and optionally authenticating (AUTH) and selecting the right database (SELECT).
 
 ```php
@@ -121,7 +121,9 @@ $factory->createClient('redis://localhost:6379')->then(
 );
 ```
 
-The `$redisUri` can be given in the form `[redis://][:auth@]host[:port][/db]`.
+The `$redisUri` can be given in the
+[standard](https://www.iana.org/assignments/uri-schemes/prov/redis) form
+`[redis[s]://][:auth@]host[:port][/db]`.
 You can omit the URI scheme and port if you're connecting to the default port 6379:
 
 ```php
@@ -150,6 +152,13 @@ You can optionally include a path that will be used to select (SELECT command) t
 $factory->createClient('redis://localhost/2');
 ```
 
+You can use the [standard](https://www.iana.org/assignments/uri-schemes/prov/rediss)
+`rediss://` URI scheme if you're using a secure TLS proxy in front of Redis:
+
+```php
+$factory->createClient('rediss://redis.example.com:6340');
+```
+
 [Deprecated] You can omit the complete URI if you want to connect to the default
 address `redis://localhost:6379`. This legacy API will be removed in a future
 `v2.0.0` version, so it's highly recommended to upgrade to the above API.

src/Factory.php

@@ -109,7 +109,7 @@ private function parseUrl($target)
         }
 
         $parts = parse_url($target);
-        if ($parts === false || !isset($parts['scheme'], $parts['host']) || !in_array($parts['scheme'], array('tcp', 'redis'))) {
+        if ($parts === false || !isset($parts['scheme'], $parts['host']) || !in_array($parts['scheme'], array('tcp', 'redis', 'rediss'))) {
             throw new InvalidArgumentException('Given URL can not be parsed');
         }
 
@@ -137,6 +137,10 @@ private function parseUrl($target)
             $parts['db'] = substr($parts['path'], 1);
         }
 
+        if ($parts['scheme'] === 'rediss') {
+            $parts['host'] = 'tls://' . $parts['host'];
+        }
+
         unset($parts['scheme'], $parts['user'], $parts['pass'], $parts['path']);
 
         return $parts;

tests/FactoryTest.php

@@ -73,8 +73,17 @@ public function testWillWriteAuthCommandIfRedisUriContainsUserInfo()
         $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
         $stream->expects($this->once())->method('write')->with("*2\r\n$4\r\nauth\r\n$5\r\nworld\r\n");
 
-        $this->connector->expects($this->once())->method('connect')->willReturn(Promise\resolve($stream));
-        $this->factory->createClient('redis://hello:[email protected]');
+        $this->connector->expects($this->once())->method('connect')->with('example.com:6379')->willReturn(Promise\resolve($stream));
+        $this->factory->createClient('redis://hello:[email protected]');
+    }
+
+    public function testWillWriteAuthCommandIfRedissUriContainsUserInfo()
+    {
+        $stream = $this->getMockBuilder('React\Socket\ConnectionInterface')->getMock();
+        $stream->expects($this->once())->method('write')->with("*2\r\n$4\r\nauth\r\n$5\r\nworld\r\n");
+
+        $this->connector->expects($this->once())->method('connect')->with('tls://example.com:6379')->willReturn(Promise\resolve($stream));
+        $this->factory->createClient('rediss://hello:[email protected]');
     }
 
     public function testWillWriteAuthCommandIfTcpUriContainsUserInfo()