openstack
/
zaqar
Code Issues Proposed changes

Merge "Fix invalid parsing of IPv6 address in sentinel server"

This commit is contained in:
Zuul 2024-04-23 01:57:59 +00:00 committed by Gerrit Code Review
parent 3172ed2316 70d2f725fe
commit 43d7c92168
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zaqar/storage/redis/driver.py
View File

@ -36,7 +36,7 @@ STRATEGY_SENTINEL = 3
class ConnectionURI(object):
def __init__(self, uri):
def __init__(self, uri): # noqa: C901
# TODO(prashanthr_): Add SSL support
try:
parsed_url = urllib.parse.urlparse(uri)
@ -89,7 +89,14 @@ class ConnectionURI(object):
# NOTE(kgriffs): Have to parse list of sentinel hosts ourselves
# since urllib doesn't support it.
for each_host in netloc.split(','):
name, sep, port = each_host.partition(':')
if not each_host.endswith(']') and ':' in each_host:
name, sep, port = each_host.rpartition(':')
else:
name = each_host
port = None
if name.startswith('[') and name.endswith(']'):
name = name[1:-1]
if port:
try:
@ -98,7 +105,6 @@ class ConnectionURI(object):
msg = _('The Redis configuration URI contains an '
'invalid port')
raise errors.ConfigurationError(msg)
else:
port = SENTINEL_DEFAULT_PORT

7
zaqar/tests/unit/storage/test_impl_redis.py
View File

@ -290,6 +290,13 @@ class RedisDriverTest(testing.TestBase):
self.assertEqual('dumbledore', uri.master)
self.assertEqual(0.1, uri.socket_timeout)
uri = driver.ConnectionURI(
'redis://[::1]:26389,[::2]?master=dumbledore')
self.assertEqual(driver.STRATEGY_SENTINEL, uri.strategy)
self.assertEqual([('::1', 26389), ('::2', 26379)], uri.sentinels)
self.assertEqual('dumbledore', uri.master)
self.assertEqual(0.1, uri.socket_timeout)
uri = driver.ConnectionURI(
'redis://s1?master=dumbledore&socket_timeout=0.5')
self.assertEqual(driver.STRATEGY_SENTINEL, uri.strategy)