Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 1 deletion redis/asyncio/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,10 @@ def parse_url(url: str) -> ConnectKwargs:

for name, value_list in parse_qs(parsed.query).items():
if value_list and len(value_list) > 0:
value = unquote(value_list[0])
# parse_qs() already percent-decodes query values, so use the value
# as-is; unquoting again here would double-decode (e.g. "%2520" ->
# "%20" -> " "). See issue #4208.
value = value_list[0]
parser = URL_QUERY_ARGUMENT_PARSERS.get(name)
if parser:
try:
Expand Down
5 changes: 4 additions & 1 deletion redis/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -2291,7 +2291,10 @@ def parse_url(url):

for name, value in parse_qs(url.query).items():
if value and len(value) > 0:
value = unquote(value[0])
# parse_qs() already percent-decodes query values, so use the value
# as-is; unquoting again here would double-decode (e.g. "%2520" ->
# "%20" -> " "). See issue #4208.
value = value[0]
parser = URL_QUERY_ARGUMENT_PARSERS.get(name)
if parser:
try:
Expand Down
15 changes: 15 additions & 0 deletions tests/test_asyncio/test_connection_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,21 @@ def test_client_name_in_querystring(self):
pool = redis.ConnectionPool.from_url("redis://location?client_name=test-client")
assert pool.connection_kwargs["client_name"] == "test-client"

def test_querystring_value_percent_decoded_once(self):
# A single percent-encoded sequence is decoded exactly once.
pool = redis.ConnectionPool.from_url(
"redis://location?client_name=worker%20name"
)
assert pool.connection_kwargs["client_name"] == "worker name"

def test_querystring_value_not_double_percent_decoded(self):
# A literal percent sign in a query value (encoded as %2520) must survive
# as "%20" rather than being decoded a second time into a space. See #4208.
pool = redis.ConnectionPool.from_url(
"redis://location?client_name=worker%2520name"
)
assert pool.connection_kwargs["client_name"] == "worker%20name"

def test_invalid_extra_typed_querystring_options(self):
with pytest.raises(ValueError):
redis.ConnectionPool.from_url(
Expand Down
15 changes: 15 additions & 0 deletions tests/test_connection_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,21 @@ def test_client_name_in_querystring(self):
pool = redis.ConnectionPool.from_url("redis://location?client_name=test-client")
assert pool.connection_kwargs["client_name"] == "test-client"

def test_querystring_value_percent_decoded_once(self):
# A single percent-encoded sequence is decoded exactly once.
pool = redis.ConnectionPool.from_url(
"redis://location?client_name=worker%20name"
)
assert pool.connection_kwargs["client_name"] == "worker name"

def test_querystring_value_not_double_percent_decoded(self):
# A literal percent sign in a query value (encoded as %2520) must survive
# as "%20" rather than being decoded a second time into a space. See #4208.
pool = redis.ConnectionPool.from_url(
"redis://location?client_name=worker%2520name"
)
assert pool.connection_kwargs["client_name"] == "worker%20name"

def test_invalid_extra_typed_querystring_options(self):
with pytest.raises(ValueError):
redis.ConnectionPool.from_url(
Expand Down