#RI-5376 - update parsing redis url

Author: rsergeenko

redisinsight/ui/src/utils/parseRedisUrl.ts

@@ -34,14 +34,15 @@ const parseRedisUrl = (urlString: string = ''): Nullable<ParsedRedisUrl> => {
   }
 
   // eslint-disable-next-line no-useless-escape
-  const redisUrlPattern = /^(redis[s]?):\/\/(?:([^:@]+)?(?::([^@]+))?@)?([^:\/]+)(?::(\d+))?(?:\/(\d+))?$/
+  const redisUrlPattern = /^(redis[s]?):\/\/(?:([^\/]+)?@)?(?:.*@)?([^:\/]+)(?::(\d+))?(?:\/(\d+))?$/
   const match = urlString.match(redisUrlPattern)
 
   if (!match) {
     return null
   }
 
-  const [, protocol, username, password, host, port, dbNumber] = match
+  const [, protocol, userInfo, host, port, dbNumber] = match
+  const [, username, password] = userInfo?.match(/^(.*?)(?::(.*))?$/) || []
 
   return {
     protocol: protocol || 'redis',

redisinsight/ui/src/utils/tests/parseRedisUrl.spec.ts

@@ -9,62 +9,22 @@ const defaultRedisParams = {
 }
 
 const parseRedisUrlTests: Array<[string, any]> = [
-  [
-    'http://user:pass@localhost:6380',
-    null
-  ],
-  [
-    'redis://:@localhost:6380',
-    null
-  ],
-  [
-    'redis://us@er:pass@localhost:6380',
-    null
-  ],
-  [
-    'localhost',
-    null
-  ],
-  [
-    'localhost:6379',
-    { ...defaultRedisParams, host: 'localhost', port: 6379 }
-  ],
-  [
-    'redis://localhost',
-    { ...defaultRedisParams, host: 'localhost' }
-  ],
-  [
-    'redis://localhost:6380',
-    { ...defaultRedisParams, host: 'localhost', port: 6380 }
-  ],
-  [
-    'redis://@localhost:6380',
-    { ...defaultRedisParams, host: 'localhost', port: 6380 }
-  ],
-  [
-    'redis://user@localhost:6380',
-    { ...defaultRedisParams, username: 'user', host: 'localhost', port: 6380 }
-  ],
-  [
-    'redis://:pass@localhost:6380',
-    { ...defaultRedisParams, password: 'pass', host: 'localhost', port: 6380 }
-  ],
-  [
-    'redis://user:pass@localhost:6380',
-    { ...defaultRedisParams, username: 'user', password: 'pass', host: 'localhost', port: 6380 }
-  ],
-  [
-    'rediss://user:pa%712ss@localhost:6380',
-    { ...defaultRedisParams, protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380 }
-  ],
-  [
-    'rediss://d&&21^$:pa%[email protected]:6380',
-    { ...defaultRedisParams, protocol: 'rediss', username: 'd&&21^$', password: 'pa%712ss', host: 'local-host-123.net.com', port: 6380 }
-  ],
-  [
-    'rediss://user:pa%712ss@localhost:6380/2',
-    { protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380, dbNumber: 2 }
-  ],
+  ['http://user:pass@localhost:6380', null],
+  ['localhost', null],
+  ['localhost:6379', { ...defaultRedisParams, host: 'localhost', port: 6379 }],
+  ['redis://localhost', { ...defaultRedisParams, host: 'localhost' }],
+  ['redis://:@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380 }],
+  ['redis://user:pa@ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'user', password: 'pa@ss' }],
+  ['redis://us@er:pa@ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'us@er', password: 'pa@ss' }],
+  ['redis://us@er:pa@:ss@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380, username: 'us@er', password: 'pa@:ss' }],
+  ['redis://localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380 }],
+  ['redis://@localhost:6380', { ...defaultRedisParams, host: 'localhost', port: 6380 }],
+  ['redis://user@localhost:6380', { ...defaultRedisParams, username: 'user', host: 'localhost', port: 6380 }],
+  ['redis://:pass@localhost:6380', { ...defaultRedisParams, password: 'pass', host: 'localhost', port: 6380 }],
+  ['redis://user:pass@localhost:6380', { ...defaultRedisParams, username: 'user', password: 'pass', host: 'localhost', port: 6380 }],
+  ['rediss://user:pa%712ss@localhost:6380', { ...defaultRedisParams, protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380 }],
+  ['rediss://d&@&21^$:pa%@7:12:[email protected]:6380', { ...defaultRedisParams, protocol: 'rediss', username: 'd&@&21^$', password: 'pa%@7:12:ss', host: 'local-host-123.net.com', port: 6380 }],
+  ['rediss://user:pa%712ss@localhost:6380/2', { protocol: 'rediss', username: 'user', password: 'pa%712ss', host: 'localhost', port: 6380, dbNumber: 2 }],
 ]
 
 describe('parseRedisUrl', () => {