Skip to content

fix: Parse ipv6 and other formats of addresses in parseNodesFromClusterInfoReply properly #4632

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

Closed
wants to merge 3 commits into from
Closed

fix: Parse ipv6 and other formats of addresses in parseNodesFromClusterInfoReply properly #4632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1c73de
Fix parseNodesFromClusterInfoReply to be able to handle non XXX.XXX.X…
Sylvain-Royer Jun 18, 2025
1cfed26
Add unit tests related to ipv6.
Sylvain-Royer Jun 18, 2025
752cb60
update documentation.
Sylvain-Royer Jun 30, 2025
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
5 changes: 5 additions & 0 deletions redisinsight/api/src/__mocks__/redis-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ export const mockRedisClusterNodesResponse: string =
'07c37dfeb235213a872192d90877d0cd55635b91 127.0.0.1:30004@31004 slave e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 0 1426238317239 4 connected\n' +
'e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 127.0.0.1:30001@31001 myself,master - 0 0 1 connected 0-16383';

// eslint-disable-next-line max-len
export const mockRedisClusterNodesResponseIPv6: string =
'07c37dfeb235213a872192d90877d0cd55635b91 2001:db8::1:7001@17001 slave e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 0 1426238317239 4 connected\n' +
'e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 2001:db8::2:7002@17002 myself,master - 0 0 1 connected 0-16383';

export const mockStandaloneRedisInfoReply: string = `${
mockRedisServerInfoResponse
}\r\n${mockRedisClientsInfoResponse}\r\n${mockRedisMemoryInfoResponse}\r\n${
Expand Down
30 changes: 30 additions & 0 deletions redisinsight/api/src/modules/redis/utils/reply.util.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
mockRedisClusterNodesResponse,
mockRedisClusterNodesResponseIPv6,
mockRedisServerInfoResponse,
} from 'src/__mocks__';
import { flatMap } from 'lodash';
Expand Down Expand Up @@ -38,6 +39,28 @@ const mockRedisClusterNodes: IRedisClusterNode[] = [
},
];

// IPv6 expected results
const mockRedisClusterNodesIPv6: IRedisClusterNode[] = [
{
id: '07c37dfeb235213a872192d90877d0cd55635b91',
host: '2001:db8::1',
port: 7001,
replicaOf: 'e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca',
linkState: RedisClusterNodeLinkState.Connected,
slot: undefined,
},
{
id: 'e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca',
host: '2001:db8::2',
port: 7002,
replicaOf: undefined,
linkState: RedisClusterNodeLinkState.Connected,
slot: '0-16383',
},
];



const mockIncorrectString = '$6\r\nfoobar\r\n';

describe('convertArrayReplyToObject', () => {
Expand Down Expand Up @@ -86,4 +109,11 @@ describe('parseNodesFromClusterInfoReply', () => {

expect(result).toEqual([]);
});
it('should parse IPv6 addresses correctly', async () => {
const result = parseNodesFromClusterInfoReply(
mockRedisClusterNodesResponseIPv6,
);

expect(result).toEqual(mockRedisClusterNodesIPv6);
});
});
17 changes: 13 additions & 4 deletions redisinsight/api/src/modules/redis/utils/reply.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ export const convertMultilineReplyToObject = (
* Parse and return all endpoints from the nodes list returned by "cluster info" command
* @Input
* ```
* 08418e3514990489e48fa05d642efc33e205f5 172.31.100.211:6379@16379 myself,master - 0 1698694904000 1 connected 0-5460\n
* d2dee846c715a917ec9a4963e8885b06130f9f 172.31.100.212:6379@16379 master - 0 1698694905285 2 connected 5461-10922\n
* 08418e3514990489e48fa05d642efc33e205f5 172.31.100.211:6379@16379 myself,master - 0 1698694904000 1 connected 0-5460
* d2dee846c715a917ec9a4963e8885b06130f9f 172.31.100.212:6379@16379 master - 0 1698694905285 2 connected 5461-10922
* 3e92457ab813ad7a62dacf768ec7309210feaf [2001:db8::1]:7001@17001 master - 0 1698694906000 3 connected 10923-16383
* ```
* @Output
* ```
Expand All @@ -99,6 +100,10 @@ export const convertMultilineReplyToObject = (
* {
* host: "172.31.100.212",
* port: 6379
* },
* {
* host: "2001:db8::1",
* port: 7001
* }
* ]
* ```
Expand All @@ -115,8 +120,12 @@ export const parseNodesFromClusterInfoReply = (
// fields = [id, endpoint, flags, master, pingSent, pongRecv, configEpoch, linkState, slot]
const fields = line.split(' ');
const [id, endpoint, , master, , , , linkState, slot] = fields;
const host = endpoint.split(':')[0];
const port = endpoint.split(':')[1].split('@')[0];

const hostAndPort = endpoint.split('@')[0]
const lastColonIndex = hostAndPort.lastIndexOf(':');

const host = hostAndPort.substring(0, lastColonIndex);
const port = hostAndPort.substring(lastColonIndex + 1);
nodes.push({
id,
host,
Expand Down