From 63b479592aa33a70bd407cb12bc991f8efcd3742 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Sun, 7 Jan 2024 23:28:15 +0000
Subject: [PATCH] [core] parse CACHE_DSN using parse_url, and support username
 / password for redis, fixes #1000

---
 core/cacheengine.php | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/cacheengine.php b/core/cacheengine.php
index 0d7b3cc36..147af159c 100644
--- a/core/cacheengine.php
+++ b/core/cacheengine.php
@@ -102,24 +102,26 @@ public function has($key)
 
 function loadCache(?string $dsn): CacheInterface
 {
-    $matches = [];
     $c = null;
-    if ($dsn && preg_match("#(.*)://(.*)#", $dsn, $matches) && !isset($_GET['DISABLE_CACHE'])) {
-        if ($matches[1] == "memcached" || $matches[1] == "memcache") {
-            $hp = explode(":", $matches[2]);
-            $memcache = new \Memcached();
-            $memcache->addServer($hp[0], (int)$hp[1]);
-            $c = new \Sabre\Cache\Memcached($memcache);
-        } elseif ($matches[1] == "apc") {
-            $c = new \Sabre\Cache\Apcu();
-        } elseif ($matches[1] == "redis") {
-            $hp = explode(":", $matches[2]);
-            $redis = new \Predis\Client([
-                'scheme' => 'tcp',
-                'host' => $hp[0],
-                'port' => (int)$hp[1]
-            ], ['prefix' => 'shm:']);
-            $c = new \Naroga\RedisCache\Redis($redis);
+    if ($dsn && !isset($_GET['DISABLE_CACHE'])) {
+        $url = parse_url($dsn);
+        if($url) {
+            if ($url['scheme'] == "memcached" || $url['scheme'] == "memcache") {
+                $memcache = new \Memcached();
+                $memcache->addServer($url['host'], $url['port']);
+                $c = new \Sabre\Cache\Memcached($memcache);
+            } elseif ($url['scheme'] == "apc") {
+                $c = new \Sabre\Cache\Apcu();
+            } elseif ($url['scheme'] == "redis") {
+                $redis = new \Predis\Client([
+                    'scheme' => 'tcp',
+                    'host' => $url['host'],
+                    'port' => $url['port'],
+                    'username' => $url['user'],
+                    'password' => $url['pass'],
+                ], ['prefix' => 'shm:']);
+                $c = new \Naroga\RedisCache\Redis($redis);
+            }
         }
     }
     if(is_null($c)) {