Skip to content

enhance executable check #3510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 18, 2024
Merged

enhance executable check #3510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6612576
enhance executable check
ArtemHoruzhenko Jun 17, 2024
d642350
Merge branch 'main' into be/feature/RI-5839-enhance
vlad-dargel Jun 18, 2024
91b7343
fix tests
ArtemHoruzhenko Jun 18, 2024
c158340
fix typo
ArtemHoruzhenko Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion redisinsight/api/src/modules/database/entities/database.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export enum HostingProvider {
KVROCKS = 'KVROCKS',
REDICT = 'REDICT',
UPSTASH = 'UPSTASH',
UKNOWN_LOCALHOST = 'UKNOWN_LOCALHOST',
UNKNOWN_LOCALHOST = 'UNKNOWN_LOCALHOST',
UNKNOWN = 'UNKNOWN',
}

Expand Down
39 changes: 24 additions & 15 deletions redisinsight/api/src/utils/hosting-provider-helper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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,
},
Expand All @@ -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,
},
Expand All @@ -61,7 +70,7 @@ const getHostingProviderTests = [
],
],
],
info: '#Server\r\n'
info: '# Server\r\n'
+ 'redis_version: 7.2.0',
output: HostingProvider.REDIS_ENTERPRISE,
},
Expand All @@ -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,
},
Expand Down
16 changes: 9 additions & 7 deletions redisinsight/api/src/utils/hosting-provider-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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$/,
Expand Down Expand Up @@ -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
Expand Down
24 changes: 23 additions & 1 deletion redisinsight/api/test/api/database/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(),
Expand All @@ -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),
Expand Down