diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/http_challenge_cache.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/http_challenge_cache.py index 45c5a453218c..99f32091e24b 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/http_challenge_cache.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/http_challenge_cache.py @@ -59,10 +59,9 @@ def remove_challenge_for_url(url: str) -> None: if not url: raise ValueError("URL cannot be empty") - parsed = parse.urlparse(url) - + key = _get_cache_key(url) with _lock: - del _cache[parsed.netloc.lower()] + del _cache[key.lower()] def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: @@ -82,8 +81,9 @@ def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: if src_url.netloc.lower() != challenge.source_authority.lower(): raise ValueError("Source URL and Challenge URL do not match") + key = _get_cache_key(url) with _lock: - _cache[src_url.netloc.lower()] = challenge + _cache[key.lower()] = challenge def clear() -> None: diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/http_challenge_cache.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/http_challenge_cache.py index 45c5a453218c..99f32091e24b 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/http_challenge_cache.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/http_challenge_cache.py @@ -59,10 +59,9 @@ def remove_challenge_for_url(url: str) -> None: if not url: raise ValueError("URL cannot be empty") - parsed = parse.urlparse(url) - + key = _get_cache_key(url) with _lock: - del _cache[parsed.netloc.lower()] + del _cache[key.lower()] def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: @@ -82,8 +81,9 @@ def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: if src_url.netloc.lower() != challenge.source_authority.lower(): raise ValueError("Source URL and Challenge URL do not match") + key = _get_cache_key(url) with _lock: - _cache[src_url.netloc.lower()] = challenge + _cache[key.lower()] = challenge def clear() -> None: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/http_challenge_cache.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/http_challenge_cache.py index 45c5a453218c..99f32091e24b 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/http_challenge_cache.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/http_challenge_cache.py @@ -59,10 +59,9 @@ def remove_challenge_for_url(url: str) -> None: if not url: raise ValueError("URL cannot be empty") - parsed = parse.urlparse(url) - + key = _get_cache_key(url) with _lock: - del _cache[parsed.netloc.lower()] + del _cache[key.lower()] def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: @@ -82,8 +81,9 @@ def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: if src_url.netloc.lower() != challenge.source_authority.lower(): raise ValueError("Source URL and Challenge URL do not match") + key = _get_cache_key(url) with _lock: - _cache[src_url.netloc.lower()] = challenge + _cache[key.lower()] = challenge def clear() -> None: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/http_challenge_cache.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/http_challenge_cache.py index 45c5a453218c..99f32091e24b 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/http_challenge_cache.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/http_challenge_cache.py @@ -59,10 +59,9 @@ def remove_challenge_for_url(url: str) -> None: if not url: raise ValueError("URL cannot be empty") - parsed = parse.urlparse(url) - + key = _get_cache_key(url) with _lock: - del _cache[parsed.netloc.lower()] + del _cache[key.lower()] def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: @@ -82,8 +81,9 @@ def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: if src_url.netloc.lower() != challenge.source_authority.lower(): raise ValueError("Source URL and Challenge URL do not match") + key = _get_cache_key(url) with _lock: - _cache[src_url.netloc.lower()] = challenge + _cache[key.lower()] = challenge def clear() -> None: diff --git a/sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/http_challenge_cache.py b/sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/http_challenge_cache.py index 45c5a453218c..6034ff09d5ca 100644 --- a/sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/http_challenge_cache.py +++ b/sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/http_challenge_cache.py @@ -59,11 +59,9 @@ def remove_challenge_for_url(url: str) -> None: if not url: raise ValueError("URL cannot be empty") - parsed = parse.urlparse(url) - + key = _get_cache_key(url) with _lock: - del _cache[parsed.netloc.lower()] - + del _cache[key.lower()] def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: """Caches the challenge for the specified URL. @@ -82,8 +80,9 @@ def set_challenge_for_url(url: str, challenge: "HttpChallenge") -> None: if src_url.netloc.lower() != challenge.source_authority.lower(): raise ValueError("Source URL and Challenge URL do not match") + key = _get_cache_key(url) with _lock: - _cache[src_url.netloc.lower()] = challenge + _cache[key.lower()] = challenge def clear() -> None: