openstack/tooz
Code Issues Proposed changes

Merge "Prevent potential ReDoS attack"

Browse Source
This commit is contained in:
Zuul
2024-02-13 18:42:13 +00:00
committed by Gerrit Code Review
parent 4d66c549fe a5940ad769
commit 179fe30ac4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tooz/drivers/redis.py
View File

@@ -422,11 +422,11 @@ return 1
@classmethod @classmethod
def _parse_sentinel(cls, sentinel): def _parse_sentinel(cls, sentinel):
# IPv6 (eg. [::1]:6379 ) # IPv6 (eg. [::1]:6379 )
match = re.search(r'\[(\S+)\]:(\d+)', sentinel) match = re.search(r'^\[(\S+)\]:(\d+)$', sentinel)
if match: if match:
return (match[1], int(match[2])) return (match[1], int(match[2]))
# IPv4 or hostname (eg. 127.0.0.1:6379 or localhost:6379) # IPv4 or hostname (eg. 127.0.0.1:6379 or localhost:6379)
match = re.search(r'(\S+):(\d+)', sentinel) match = re.search(r'^(\S+):(\d+)$', sentinel)
if match: if match:
return (match[1], int(match[2])) return (match[1], int(match[2]))
raise ValueError('Malformed sentinel server format') raise ValueError('Malformed sentinel server format')