From: ThibG <thib@sitedethib.com>
Date: Wed, 24 Jun 2020 20:25:23 +0000 (+0200)
Subject: Change streaming server to treat blank redis password as password-less auth (#14135)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ddcdddd6fcb955ac74d7ed525587ff4c4f2af118;p=mastodon.git

Change streaming server to treat blank redis password as password-less auth (#14135)

Fixes #14131

Our `mastodon:setup` task defaults to a blank password rather than the
absence of password, but some versions of Redis reject blank password
authentication when authentication is possible without a password.

The Ruby code only uses the Redis password when it's not blank, so
do the same for the node.js part.
---

diff --git a/streaming/index.js b/streaming/index.js
index d7b1df81f..39e70c1ba 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -118,7 +118,7 @@ const startWorker = (workerId) => {
     host:     process.env.REDIS_HOST     || '127.0.0.1',
     port:     process.env.REDIS_PORT     || 6379,
     db:       process.env.REDIS_DB       || 0,
-    password: process.env.REDIS_PASSWORD,
+    password: process.env.REDIS_PASSWORD || undefined,
   };
 
   if (redisNamespace) {