Skip to content

Commit 64b3246

Browse files
committed
deprecate WHITELIST, switch to ALLOWLIST in HttpLoggingPolicy
1 parent 1838882 commit 64b3246

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

sdk/core/azure-core/azure/core/pipeline/policies/_universal.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class HttpLoggingPolicy(SansIOHTTPPolicy):
339339
"""The Pipeline policy that handles logging of HTTP requests and responses.
340340
"""
341341

342-
DEFAULT_HEADERS_WHITELIST = set([
342+
DEFAULT_HEADERS_ALLOWLIST = set([
343343
"x-ms-request-id",
344344
"x-ms-client-request-id",
345345
"x-ms-return-client-request-id",
@@ -364,14 +364,18 @@ class HttpLoggingPolicy(SansIOHTTPPolicy):
364364
"Transfer-Encoding",
365365
"User-Agent",
366366
])
367+
368+
# Deprecated
369+
DEFAULT_HEADERS_WHITELIST = DEFAULT_HEADERS_ALLOWLIST
370+
367371
REDACTED_PLACEHOLDER = "REDACTED"
368372

369373
def __init__(self, logger=None, **kwargs): # pylint: disable=unused-argument
370374
self.logger = logger or logging.getLogger(
371375
"azure.core.pipeline.policies.http_logging_policy"
372376
)
373377
self.allowed_query_params = set()
374-
self.allowed_header_names = set(HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST)
378+
self.allowed_header_names = set(HttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST)
375379

376380
def _redact_query_param(self, key, value):
377381
lower_case_allowed_query_params = [

sdk/core/azure-core/tests/azure_core_asynctests/test_pipeline.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def test_default_http_logging_policy():
153153
pipeline_client = AsyncPipelineClient(base_url="test")
154154
pipeline = pipeline_client._build_pipeline(config)
155155
http_logging_policy = pipeline._impl_policies[-1]._policy
156-
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST
156+
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST
157157

158158
def test_pass_in_http_logging_policy():
159159
config = Configuration()
@@ -166,7 +166,7 @@ def test_pass_in_http_logging_policy():
166166
pipeline_client = AsyncPipelineClient(base_url="test")
167167
pipeline = pipeline_client._build_pipeline(config)
168168
http_logging_policy = pipeline._impl_policies[-1]._policy
169-
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"})
169+
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST.union({"x-ms-added-header"})
170170

171171
@pytest.mark.asyncio
172172
async def test_conf_async_requests():

sdk/core/azure-core/tests/test_pipeline.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_default_http_logging_policy():
6767
pipeline_client = PipelineClient(base_url="test")
6868
pipeline = pipeline_client._build_pipeline(config)
6969
http_logging_policy = pipeline._impl_policies[-1]._policy
70-
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST
70+
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST
7171

7272
def test_pass_in_http_logging_policy():
7373
config = Configuration()
@@ -80,7 +80,7 @@ def test_pass_in_http_logging_policy():
8080
pipeline_client = PipelineClient(base_url="test")
8181
pipeline = pipeline_client._build_pipeline(config)
8282
http_logging_policy = pipeline._impl_policies[-1]._policy
83-
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_WHITELIST.union({"x-ms-added-header"})
83+
assert http_logging_policy.allowed_header_names == HttpLoggingPolicy.DEFAULT_HEADERS_ALLOWLIST.union({"x-ms-added-header"})
8484

8585

8686
def test_sans_io_exception():

0 commit comments

Comments
 (0)