From f0bd51ac88d19b6195813cb21eb8fd638a071be9 Mon Sep 17 00:00:00 2001 From: Sophia Atkinson Date: Sun, 31 Mar 2024 23:01:57 -0700 Subject: [PATCH] added password auth for redis --- .env.example | 1 + app/modules/SteamApp.php | 10 ++++++++-- app/modules/SteamGroup.php | 14 ++++++++++---- app/modules/SteamServer.php | 12 +++++++++--- app/modules/SteamUser.php | 13 ++++++++++--- app/modules/SteamWorkshop.php | 13 ++++++++++--- 6 files changed, 48 insertions(+), 15 deletions(-) diff --git a/.env.example b/.env.example index da17f7f..e16821f 100644 --- a/.env.example +++ b/.env.example @@ -37,6 +37,7 @@ STEAM_API_KEY="" # Redis settings REDIS_HOST=localhost REDIS_PORT=6379 +REDIS_PASS=super-secure-password REDIS_DATABASE=15 REDIS_EXPIRATION=3600 diff --git a/app/modules/SteamApp.php b/app/modules/SteamApp.php index 4fbd5bd..62f87bd 100644 --- a/app/modules/SteamApp.php +++ b/app/modules/SteamApp.php @@ -78,7 +78,10 @@ class SteamApp { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index $cachedData = $redis->get($key); if ($cachedData !== false) { @@ -98,7 +101,10 @@ class SteamApp { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index $redis->set($key, json_encode($value), env('REDIS_EXPIRATION')); } diff --git a/app/modules/SteamGroup.php b/app/modules/SteamGroup.php index e504d54..4be4b8f 100644 --- a/app/modules/SteamGroup.php +++ b/app/modules/SteamGroup.php @@ -70,8 +70,11 @@ class SteamGroup { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 - + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index + $cachedData = $redis->get($key); if ($cachedData !== false) { return json_decode($cachedData); @@ -90,8 +93,11 @@ class SteamGroup { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index $redis->set($key, json_encode($value), env('REDIS_EXPIRATION')); } -} +} \ No newline at end of file diff --git a/app/modules/SteamServer.php b/app/modules/SteamServer.php index 6f11bef..8d99c24 100644 --- a/app/modules/SteamServer.php +++ b/app/modules/SteamServer.php @@ -69,8 +69,11 @@ class SteamServer { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 - + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index + $cachedData = $redis->get($key); if ($cachedData !== false) { return json_decode($cachedData); @@ -89,7 +92,10 @@ class SteamServer { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index $redis->set($key, json_encode($value), env('REDIS_EXPIRATION')); } diff --git a/app/modules/SteamUser.php b/app/modules/SteamUser.php index 3acd2fe..cb011a2 100644 --- a/app/modules/SteamUser.php +++ b/app/modules/SteamUser.php @@ -70,8 +70,11 @@ class SteamUser { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 - + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index + $cachedData = $redis->get($key); if ($cachedData !== false) { return json_decode($cachedData); @@ -90,8 +93,12 @@ class SteamUser { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index $redis->set($key, json_encode($value), env('REDIS_EXPIRATION')); } + } diff --git a/app/modules/SteamWorkshop.php b/app/modules/SteamWorkshop.php index def4e91..0effd50 100644 --- a/app/modules/SteamWorkshop.php +++ b/app/modules/SteamWorkshop.php @@ -69,8 +69,11 @@ class SteamWorkshop { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 - + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index + $cachedData = $redis->get($key); if ($cachedData !== false) { return json_decode($cachedData); @@ -89,8 +92,12 @@ class SteamWorkshop { $redis = new Redis(); $redis->connect(env('REDIS_HOST'), env('REDIS_PORT')); - $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index 5 + if (env('REDIS_PASS') !== '') { + $redis->auth(env('REDIS_PASS')); + } + $redis->select(env('REDIS_DATABASE')); // Selecting Redis database index $redis->set($key, json_encode($value), env('REDIS_EXPIRATION')); } + }