From 2bf4e125ee5663ce1f5a542f0bac3a97614c8ba2 Mon Sep 17 00:00:00 2001
From: Marten Richter <marten.richter@tu-berlin.de>
Date: Sun, 10 Oct 2021 17:58:12 +0200
Subject: [PATCH] Add redis authentification

---
 package-lock.json | 58 ++++++++---------------------------------------
 package.json      |  4 ++--
 src/server.js     |  3 ++-
 3 files changed, 13 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea66a65..3e77003 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/noteshandler",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -152,11 +152,11 @@
       }
     },
     "@fails-components/config": {
-      "version": "0.0.3",
-      "resolved": "https://npm.pkg.github.com/download/@fails-components/config/0.0.3/c35e4e32b64b63b6507978f218ac0ca3c4b5358aa32cae8e2af6c181ba7de98c",
-      "integrity": "sha512-G+f+KWfgD5f4PHVQA6HaOHT+C8VUqzI3YwXB9EqevTVdJJn7njs4DXXp62SKWUH3io0ZSg+RP90CWDb3qZXbwQ==",
+      "version": "0.0.5",
+      "resolved": "https://npm.pkg.github.com/download/@fails-components/config/0.0.5/f2f5f20f130fe174a8eb82a40e6778cee35df2f2642d6c24c93488699e22fb9f",
+      "integrity": "sha512-jG6OsZKg+K1EKj9uIZ4JB+LkoqLDlNKjg4F8H/G2EvOQkBPyuNZpxYUJRBfqcaGRXtHadHTp9Exyok1Leb6Hqw==",
       "requires": {
-        "express-jwt": "^6.0.0",
+        "express-jwt": "^6.1.0",
         "jsonwebtoken": "^8.5.1",
         "redlock": "^4.2.0",
         "url-signer": "^0.1.4"
@@ -308,52 +308,12 @@
       "dev": true
     },
     "ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
+      "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==",
       "dev": true,
       "requires": {
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+        "string-width": "^4.1.0"
       }
     },
     "ansi-colors": {
diff --git a/package.json b/package.json
index add7086..9970ff7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fails-components/noteshandler",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Supplies server side notes handling",
   "author": "Marten Richter",
   "license": "AGPL-3.0-or-later",
@@ -44,7 +44,7 @@
     "dist"
   ],
   "dependencies": {
-    "@fails-components/config": "0.0.3",
+    "@fails-components/config": ">=0.0.5",
     "@fails-components/data": ">=0.0.2",
     "@fails-components/security": "0.0.2",
     "@socket.io/redis-adapter": "^7.0.0",
diff --git a/src/server.js b/src/server.js
index 2d198be..b9295cc 100644
--- a/src/server.js
+++ b/src/server.js
@@ -35,7 +35,8 @@ const initServer = async () => {
 
   // this should be read only replica
   const redisclient = redis.createClient(cfg.redisPort(), cfg.redisHost(), {
-    detect_buffers: true /* required by notes connection */
+    detect_buffers: true /* required by notescreen connection */,
+    password: cfg.redisPass()
   })
 
   // and yes pub sub is also read only so we need a mechanism for chat....