Merge pull request #3510 from RedisInsight/be/feature/RI-5839-enhance

enhance executable check

Author: vlad-dargel

redisinsight/api/src/modules/database/entities/database.entity.ts

@@ -27,7 +27,7 @@ export enum HostingProvider {
   KVROCKS = 'KVROCKS',
   REDICT = 'REDICT',
   UPSTASH = 'UPSTASH',
-  UKNOWN_LOCALHOST = 'UKNOWN_LOCALHOST',
+  UNKNOWN_LOCALHOST = 'UNKNOWN_LOCALHOST',
   UNKNOWN = 'UNKNOWN',
 }
 

redisinsight/api/src/utils/hosting-provider-helper.spec.ts

@@ -3,10 +3,10 @@ import { mockStandaloneRedisClient } from 'src/__mocks__';
 import { getHostingProvider } from './hosting-provider-helper';
 
 const getHostingProviderTests = [
-  { input: '127.0.0.1', output: HostingProvider.UKNOWN_LOCALHOST },
-  { input: '0.0.0.0', output: HostingProvider.UKNOWN_LOCALHOST },
-  { input: 'localhost', output: HostingProvider.UKNOWN_LOCALHOST },
-  { input: '172.18.0.2', output: HostingProvider.UKNOWN_LOCALHOST },
+  { input: '127.0.0.1', output: HostingProvider.UNKNOWN_LOCALHOST },
+  { input: '0.0.0.0', output: HostingProvider.UNKNOWN_LOCALHOST },
+  { input: 'localhost', output: HostingProvider.UNKNOWN_LOCALHOST },
+  { input: '172.18.0.2', output: HostingProvider.UNKNOWN_LOCALHOST },
   { input: '176.87.56.244', output: HostingProvider.UNKNOWN },
   { input: '192.12.56.244', output: HostingProvider.UNKNOWN },
   { input: '255.255.56.244', output: HostingProvider.UNKNOWN },
@@ -37,7 +37,7 @@ const getHostingProviderTests = [
     hello: [
       'server', 'redis',
     ],
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'executable:/opt/redis/bin/redis-server',
     output: HostingProvider.REDIS_COMMUNITY_EDITION,
   },
@@ -46,7 +46,16 @@ const getHostingProviderTests = [
     hello: [
       'server', 'redis',
     ],
-    info: '#Server\r\n'
+    info: '# Server\r\n'
+      + 'executable:/data/redis-server',
+    output: HostingProvider.REDIS_COMMUNITY_EDITION,
+  },
+  {
+    input: 'localhost',
+    hello: [
+      'server', 'redis',
+    ],
+    info: '# Server\r\n'
       + 'executable:/opt/redis-stack/bin/redis-server',
     output: HostingProvider.REDIS_STACK,
   },
@@ -61,7 +70,7 @@ const getHostingProviderTests = [
         ],
       ],
     ],
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'redis_version: 7.2.0',
     output: HostingProvider.REDIS_ENTERPRISE,
   },
@@ -80,49 +89,49 @@ const getHostingProviderTests = [
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'server_name:valkey',
     output: HostingProvider.VALKEY,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'dragonfly_version:df-7.0.0',
     output: HostingProvider.DRAGONFLY,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'garnet_version:gr-7.0.0',
     output: HostingProvider.GARNET,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'kvrocks_version:kv-7.0.0',
     output: HostingProvider.KVROCKS,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'redict_version:rd-7.0.0',
     output: HostingProvider.REDICT,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'upstash_version:up-7.0.0',
     output: HostingProvider.UPSTASH,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'ElastiCache:sometinhg',
     output: HostingProvider.AWS_ELASTICACHE,
   },
   {
     input: 'localhost',
-    info: '#Server\r\n'
+    info: '# Server\r\n'
       + 'MemoryDB:sometinhg',
     output: HostingProvider.AWS_MEMORYDB,
   },

redisinsight/api/src/utils/hosting-provider-helper.ts

@@ -1,6 +1,7 @@
 import { IP_ADDRESS_REGEX, PRIVATE_IP_ADDRESS_REGEX } from 'src/constants';
 import { HostingProvider } from 'src/modules/database/entities/database.entity';
 import { RedisClient } from 'src/modules/redis/client';
+import { convertRedisInfoReplyToObject } from 'src/utils/redis-reply-converter';
 
 const PROVIDER_HOST_REGEX = {
   RLCP: /\.rlrcp\.com$/,
@@ -97,24 +98,25 @@ export const getHostingProvider = async (client: RedisClient, databaseHost: stri
         return HostingProvider.UPSTASH;
       }
 
-      if (info.includes('executable:/opt/redis/bin/redis-server')) {
-        return HostingProvider.REDIS_COMMUNITY_EDITION;
-      }
+      const infoObj = convertRedisInfoReplyToObject(info);
 
-      if (info.includes('executable:/opt/redis-stack/bin/redis-server')) {
-        return HostingProvider.REDIS_STACK;
+      if (infoObj.server.executable.includes('redis-server')) {
+        if (infoObj.server.executable.includes('redis-stack')) {
+          return HostingProvider.REDIS_STACK;
+        }
+        return HostingProvider.REDIS_COMMUNITY_EDITION;
       }
     } catch (e) {
       // ignore error
     }
 
     if (host === '0.0.0.0' || host === 'localhost' || host === '127.0.0.1') {
-      return HostingProvider.UKNOWN_LOCALHOST;
+      return HostingProvider.UNKNOWN_LOCALHOST;
     }
 
     // todo: investigate weather we need this
     if (IP_ADDRESS_REGEX.test(host) && PRIVATE_IP_ADDRESS_REGEX.test(host)) {
-      return HostingProvider.UKNOWN_LOCALHOST;
+      return HostingProvider.UNKNOWN_LOCALHOST;
     }
   } catch (e) {
     // ignore any error

redisinsight/api/test/api/database/constants.ts

@@ -1,6 +1,28 @@
 import { Joi } from '../../helpers/test';
 import { caCertSchema, clientCertSchema } from '../certificate/constants';
 
+const providers = [
+  'RE_CLUSTER',
+  'RE_CLOUD',
+  'REDIS_STACK',
+  'REDIS_ENTERPRISE',
+  'AZURE_CACHE',
+  'AZURE_CACHE_REDIS_ENTERPRISE',
+  'REDIS_COMMUNITY_EDITION',
+  'AWS_ELASTICACHE',
+  'AWS_MEMORYDB',
+  'VALKEY',
+  'MEMORYSTORE',
+  'DRAGONFLY',
+  'KEYDB',
+  'GARNET',
+  'KVROCKS',
+  'REDICT',
+  'UPSTASH',
+  'UNKNOWN_LOCALHOST',
+  'UNKNOWN',
+];
+
 export const databaseSchema = Joi.object().keys({
   id: Joi.string().required(),
   name: Joi.string().required(),
@@ -14,7 +36,7 @@ export const databaseSchema = Joi.object().keys({
   compressor: Joi.string().valid('NONE', 'LZ4', 'GZIP', 'ZSTD', 'SNAPPY').required(),
   nameFromProvider: Joi.string().allow(null),
   lastConnection: Joi.string().isoDate().allow(null),
-  provider: Joi.string().valid('LOCALHOST', 'UNKNOWN', 'RE_CLOUD', 'RE_CLUSTER'),
+  provider: Joi.string().valid(...providers),
   new: Joi.boolean().allow(null),
   tls: Joi.boolean().allow(null),
   tlsServername: Joi.string().allow(null),