From 526b8a78f6ef56fb864bd7ec94c81f8dee467a74 Mon Sep 17 00:00:00 2001
From: Dirk-Jan <dirk@bynder.com>
Date: Tue, 9 Nov 2021 13:33:13 +0000
Subject: [PATCH 1/2] in-transit encryption support added

---
 src/storage/RedisAdapter.js        | 10 +++++++---
 src/utils/settings/storage/node.js |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/storage/RedisAdapter.js b/src/storage/RedisAdapter.js
index 8d0e97518..1d5975b16 100644
--- a/src/storage/RedisAdapter.js
+++ b/src/storage/RedisAdapter.js
@@ -148,11 +148,15 @@ export default class RedisAdapter extends ioredis {
         host: options.host,
         port: options.port,
         db: options.db,
-        password: options.pass
+        password: options.pass,
       });
     } else { // If it IS the string URL, that'll be the first param for ioredis.
       result.unshift(options.url);
     }
+    if (options.tls) {
+      merge(opts, {tls: options.tls});
+    }
+
 
     return result;
   }
@@ -160,9 +164,9 @@ export default class RedisAdapter extends ioredis {
   /**
    * Parses the options into what we care about.
    */
-  static _defineOptions({ connectionTimeout, operationTimeout, url, host, port, db, pass }) {
+  static _defineOptions({ connectionTimeout, operationTimeout, url, host, port, db, pass, tls }) {
     const parsedOptions = {
-      connectionTimeout, operationTimeout, url, host, port, db, pass
+      connectionTimeout, operationTimeout, url, host, port, db, pass, tls
     };
 
     return merge({}, DEFAULT_OPTIONS, parsedOptions);
diff --git a/src/utils/settings/storage/node.js b/src/utils/settings/storage/node.js
index 7be87a309..035c2c777 100644
--- a/src/utils/settings/storage/node.js
+++ b/src/utils/settings/storage/node.js
@@ -46,6 +46,7 @@ const ParseStorageSettings = (settings) => {
         db,
         pass,
         url,
+        tls,
         connectionTimeout,
         operationTimeout
       } = options;
@@ -60,6 +61,8 @@ const ParseStorageSettings = (settings) => {
         pass = process.env.REDIS_PASS;
       if (process.env.REDIS_URL)
         url = process.env.REDIS_URL;
+      if (process.env.TLS)
+        tls = process.env.TLS;
 
       const newOpts = {
         connectionTimeout, operationTimeout
@@ -73,7 +76,9 @@ const ParseStorageSettings = (settings) => {
         newOpts.db = db;
         newOpts.pass = pass;
       }
-
+      if (tls) {
+        newOpts.tls = tls;
+      }
       return {
         type,
         prefix,

From 6bd8e7d644a94b00fe2dc75b697ce064d9a188b2 Mon Sep 17 00:00:00 2001
From: Dirk-Jan <dirk@bynder.com>
Date: Thu, 3 Mar 2022 14:11:51 +0100
Subject: [PATCH 2/2] no env var needed for this

---
 src/utils/settings/storage/node.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/utils/settings/storage/node.js b/src/utils/settings/storage/node.js
index 035c2c777..f95e7de63 100644
--- a/src/utils/settings/storage/node.js
+++ b/src/utils/settings/storage/node.js
@@ -61,8 +61,6 @@ const ParseStorageSettings = (settings) => {
         pass = process.env.REDIS_PASS;
       if (process.env.REDIS_URL)
         url = process.env.REDIS_URL;
-      if (process.env.TLS)
-        tls = process.env.TLS;
 
       const newOpts = {
         connectionTimeout, operationTimeout