From 56555e87a5db40f39ba4e96c850eac9b3cae1328 Mon Sep 17 00:00:00 2001
From: Eric Pfeiffer <eric@creativesizzle.com>
Date: Tue, 12 Oct 2021 10:44:44 -0500
Subject: [PATCH] Adjust redis args regex to allow optional quotes.

---
 .devilbox/www/config.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
index e792f90c..b0d87848 100644
--- a/.devilbox/www/config.php
+++ b/.devilbox/www/config.php
@@ -127,18 +127,26 @@ function loadClass($class) {
 				break;
 
 			case 'Redis':
-
 				// Check if redis is using a password
 				$REDIS_ROOT_PASSWORD = '';
 
 				$_REDIS_ARGS = loadClass('Helper')->getEnv('REDIS_ARGS');
 
+				/*
+				 * This pattern will match optional quoted string, 'my password' or "my password"
+				 * or if there aren't any quotes, it will match up until the next space.
+				 */
 				$_REDIS_PASS = [];
-				preg_match_all('/--requirepass\s+([^\s]*)/',  $_REDIS_ARGS, $_REDIS_PASS);
+				preg_match_all('/--requirepass\s+("|\')?(?(1)(.*)|([^\s]*))(?(1)\1|)/', $_REDIS_ARGS, $_REDIS_PASS, PREG_SET_ORDER);
 
-				if (! empty($_REDIS_PASS[1])) {
-					// In case the option is specified multiple times, use the last effective one.
-					$_REDIS_PASS = end($_REDIS_PASS[1]);
+				if (! empty($_REDIS_PASS)) {
+					/*
+					 * In case the option is specified multiple times, use the last effective one.
+					 *
+					 * preg_match_all returns a multi-dimensional array, the first level array is in order of which was matched first,
+					 * and the password string is either matched in group 2 or group 3 which is always the end of the sub-array.
+					 */
+					$_REDIS_PASS = end(end($_REDIS_PASS));
 					
 					if (strlen($_REDIS_PASS) > 0) {
 						$REDIS_ROOT_PASSWORD = $_REDIS_PASS;