fix(redis): allow tls config to be used for redis

ar-io · Sep 25, 2024 · 11eb323 · 11eb323
1 parent 6242301
commit 11eb323
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -64,6 +64,7 @@ services:
       - IO_PROCESS_ID=${IO_PROCESS_ID:-}
       - CHAIN_CACHE_TYPE=${CHAIN_CACHE_TYPE:-redis}
       - REDIS_CACHE_URL=${REDIS_CACHE_URL:-redis://redis:6379}
+      - REDIS_USE_TLS=${REDIS_USE_TLS:-false}
       - REDIS_CACHE_TTL_SECONDS=${REDIS_CACHE_TTL_SECONDS:-}
       - NODE_JS_MAX_OLD_SPACE_SIZE=${NODE_JS_MAX_OLD_SPACE_SIZE:-}
       - ENABLE_FS_HEADER_CACHE_CLEANUP=${ENABLE_FS_HEADER_CACHE_CLEANUP:-true}

diff --git a/src/config.ts b/src/config.ts
@@ -209,6 +209,9 @@ export const REDIS_CACHE_URL = env.varOrDefault(
   'redis://localhost:6379',
 );
 
+export const REDIS_USE_TLS =
+  env.varOrDefault('REDIS_USE_TLS', 'false') === 'true';
+
 // Default Redis TTL
 export const REDIS_CACHE_TTL_SECONDS = +env.varOrDefault(
   'REDIS_CACHE_TTL_SECONDS',

diff --git a/src/init/header-stores.ts b/src/init/header-stores.ts
@@ -50,6 +50,7 @@ const createKvBufferStore = ({
       return new RedisKvStore({
         redisUrl: config.REDIS_CACHE_URL,
         ttlSeconds: redisTtlSeconds,
+        useTls: config.REDIS_USE_TLS,
         log,
       });
     }

diff --git a/src/init/resolvers.ts b/src/init/resolvers.ts
@@ -36,12 +36,14 @@ export const createArNSKvStore = ({
   log,
   type,
   redisUrl,
+  useTls,
   ttlSeconds,
   maxKeys,
 }: {
   type: 'redis' | 'node' | string;
   log: Logger;
   redisUrl: string;
+  useTls: boolean;
   ttlSeconds: number;
   maxKeys: number;
 }): KVBufferStore => {
@@ -56,6 +58,7 @@ export const createArNSKvStore = ({
       log,
       redisUrl,
       ttlSeconds,
+      useTls,
     });
   }
   return new NodeKvStore({ ttlSeconds, maxKeys });

diff --git a/src/store/redis-kv-store.ts b/src/store/redis-kv-store.ts
@@ -28,16 +28,19 @@ export class RedisKvStore implements KVBufferStore {
   constructor({
     log,
     redisUrl,
+    useTls,
     ttlSeconds,
   }: {
     log: winston.Logger;
     redisUrl: string;
+    useTls: boolean;
     ttlSeconds: number;
   }) {
     this.log = log.child({ class: this.constructor.name });
     this.ttlSeconds = ttlSeconds;
     this.client = createClient({
       url: redisUrl,
+      ...(useTls ? { tls: {} } : {}), // use base tls options if useTls is true
     });
     this.client.on('error', (error: any) => {
       this.log.error(`Redis error`, {

diff --git a/src/system.ts b/src/system.ts
@@ -558,6 +558,7 @@ export const arnsResolverCache = new KvArnsStore({
     redisUrl: config.REDIS_CACHE_URL,
     ttlSeconds: config.ARNS_CACHE_TTL_SECONDS,
     maxKeys: config.ARNS_CACHE_MAX_KEYS,
+    useTls: config.REDIS_USE_TLS,
   }),
 });