Merge pull request #9 from hapinessjs/rediss-tls-polyfil

Rediss tls polyfil
hapinessjs · Jun 5, 2018 · ddb4ce1 · ddb4ce1
2 parents 94d3c58 + 0b08c2e
commit ddb4ce1
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ or
 
 $ yarn add @hapiness/core @hapiness/redis rxjs
 ```
-    
+
 ```javascript
 "dependencies": {
     "@hapiness/core": "^1.3.0",
@@ -135,7 +135,7 @@ export interface ClientOpts {
     tls?: any;
     prefix?: string;
     retry_strategy?: RetryStrategy;
-    
+
 }
 
 ```
@@ -154,7 +154,7 @@ class FooProvider {
     bar(): Observable<string> {
     	return this._redis.connection.get('my_key');
     }
-   
+
 }
 
 ```

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hapiness/redis",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "description": "Hapiness module for redis",
     "main": "commonjs/index.js",
     "types": "index.d.ts",

diff --git a/src/module/managers/redis-client.manager.ts b/src/module/managers/redis-client.manager.ts
@@ -5,6 +5,7 @@ import * as redis_commands from 'redis-commands';
 import * as EventEmitter from 'events';
 
 import { Observable } from 'rxjs';
+import { URL } from 'url';
 
 import { RedisConfig } from '../interfaces';
 import { DefaultValues } from '../common';
@@ -62,6 +63,10 @@ export class RedisClientManager {
         // Removed unused properties by RedisConfig
         delete config.reconnect_interval;
 
+        if (config.url && config.url.match(/^rediss/) && !config.tls) {
+            config.tls = { servername: new URL(config.url).hostname };
+        }
+
         // Create the redis client
         this._config = config;
     }

diff --git a/test/unit/redis-client.manager.test.ts b/test/unit/redis-client.manager.test.ts
@@ -87,4 +87,85 @@ export class RedisClientManagerTest {
                 }
             );
     }
+
+    @test('- Test url with rediss:// as protocol creates tls object')
+    testUrlRediss(done) {
+        const fakeInst = new FakeRedisClient();
+
+        Observable
+            .of(fakeInst)
+            .delay(new Date(Date.now() + 1500))
+            .map(_ => fakeInst.emit('ready'))
+            .subscribe();
+
+        const redisStub = mockRedisCreateConnection();
+        redisStub.returns(<any>fakeInst);
+
+        const manager = new RedisClientManager(
+            {
+                url: 'rediss://:pass_redis@toto',
+                db: 1
+            }
+        );
+
+        manager
+            .createClient()
+            .subscribe(
+                _ => {
+                    redisStub.restore();
+                    unit.object(redisStub.firstCall);
+                    unit.array(redisStub.firstCall.args);
+                    unit.object(redisStub.firstCall.args[0].tls).is({
+                        servername: 'toto'
+                    });
+                    done();
+                },
+                err => {
+                    redisStub.restore();
+                    done(new Error('Should not be there'));
+                }
+            );
+    }
+
+    @test('- Test url with rediss:// as protocol do not create tls object if already provided')
+    testUrlRedissTls(done) {
+        const fakeInst = new FakeRedisClient();
+
+        Observable
+            .of(fakeInst)
+            .delay(new Date(Date.now() + 1500))
+            .map(_ => fakeInst.emit('ready'))
+            .subscribe();
+
+        const redisStub = mockRedisCreateConnection();
+        redisStub.returns(<any>fakeInst);
+
+        const manager = new RedisClientManager(
+            {
+                url: 'rediss://:pass_redis@toto',
+                db: 1,
+                tls: {
+                    servername: 'toto2'
+                }
+            }
+        );
+
+        manager
+            .createClient()
+            .subscribe(
+                _ => {
+                    redisStub.restore();
+                    unit.object(redisStub.firstCall);
+                    unit.array(redisStub.firstCall.args);
+                    unit.object(redisStub.firstCall.args[0].tls).is({
+                        servername: 'toto2'
+                    });
+                    done();
+                },
+                err => {
+                    redisStub.restore();
+                    done(new Error('Should not be there'));
+                }
+            );
+    }
 }