Dark Mode

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

[v3-1-test] Prevent client secrets and proxy credentials from being logged in Microsoft Graph hook logs (#59688) #59792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking "Sign up for GitHub", you agree to our terms of service and privacy statement. We'll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into apache:v3-1-test from astronomer:backport-a9dea6d-v3-1-test
Dec 25, 2025
Merged

[v3-1-test] Prevent client secrets and proxy credentials from being logged in Microsoft Graph hook logs (#59688) #59792

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
1 change: 1 addition & 0 deletions airflow-core/newsfragments/59688.improvement.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``proxy`` and ``proxies`` to ``DEFAULT_SENSITIVE_FIELDS`` in secrets_masker to treat proxy configurations as sensitive by default
10 changes: 6 additions & 4 deletions providers/microsoft/azure/src/airflow/providers/microsoft/az ure/hooks/msgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@

from airflow.models import Connection

from airflow_shared.secrets_masker import redact


class DefaultResponseHandler(ResponseHandler):
"""DefaultResponseHandler returns JSON payload or content in bytes or response headers."""
Expand Down Expand Up @@ -272,16 +274,16 @@ def _build_request_adapter(self, connection) -> tuple[str, RequestAdapter]:
self.log.info("Host: %s", host)
self.log.info("Base URL: %s", base_url)
self.log.info("Client id: %s", client_id)
self.log.info("Client secret: %s", client_secret)
self.log.info("Client secret: %s", redact(client_secret, name="client_secret"))
self.log.info("API version: %s", api_version)
self.log.info("Scope: %s", scopes)
self.log.info("Verify: %s", verify)
self.log.info("Timeout: %s", self.timeout)
self.log.info("Trust env: %s", trust_env)
self.log.info("Authority: %s", authority)
self.log.info("Allowed hosts: %s", allowed_hosts)
self.log.info("Proxies: %s", proxies)
self.log.info("HTTPX Proxies: %s", httpx_proxies)
self.log.info("Proxies: %s", redact(proxies, name="proxies"))
self.log.info("HTTPX Proxies: %s", redact(httpx_proxies, name="proxies"))
credentials = self.get_credentials(
login=connection.login,
password=connection.password,
Expand Down Expand Up @@ -391,7 +393,7 @@ def get_credentials(
self.log.info("Certificate data: %s", certificate_data is not None)
self.log.info("Authority: %s", authority)
self.log.info("Disable instance discovery: %s", disable_instance_discovery)
self.log.info("MSAL Proxies: %s", msal_proxies)
self.log.info("MSAL Proxies: %s", redact(msal_proxies, name="proxies"))
if certificate_path or certificate_data:
return CertificateCredential(
tenant_id=tenant_id,
Expand Down
21 changes: 21 additions & 0 deletions providers/microsoft/azure/tests/unit/microsoft/azure/hooks/t est_msgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,27 @@ async def test_throw_failed_responses_with_application_json_content_type(self):
error_code = actual.get_child_node("error").get_child_node("code").get_str_value()
assert error_code == "TenantThrottleThresholdExceeded"

@pytest.mark.asyncio
async def test_build_request_adapter_masks_secrets(self):
"""Test that sensitive data is masked when building request adapter."""
with patch(
f"{BASEHOOK_PATCH_PATH}.get_connection",
side_effect=lambda conn_id: get_airflow_connection(
conn_id=conn_id,
password="my_secret_password",
proxies={"http": "http://user:pass@proxy:3128"},
),
):
with patch("airflow.providers.microsoft.azure.hooks.msgraph.redac t") as mock_redact:
mock_redact.side_effect = lambda x, name=None: "***" if x else x

hook = KiotaRequestAdapterHook(conn_id="msgraph_api")
await hook.get_async_conn()

assert mock_redact.call_count >= 3
mock_redact.assert_any_call({"http": "http://user:pass@proxy:3128"}, name="proxies")
mock_redact.assert_any_call("my_secret_password", name="client_secret")


class TestResponseHandler:
def test_default_response_handler_when_json(self):
Expand Down
2 changes: 2 additions & 0 deletions shared/secrets_masker/src/airflow_shared/secrets_masker/secr ets_masker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ def to_dict(self) -> dict[str, Any]: ...
"passwd",
"password",
"private_key",
"proxy",
"proxies",
"secret",
"token",
"keyfile_dict",
Expand Down
4 changes: 1 addition & 3 deletions task-sdk/src/airflow/sdk/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@
from airflow.sdk.types import Logger, RuntimeTaskInstanceProtocol as RuntimeTI


__all__ = ["configure_logging", "reset_logging", "mask_secret"]
from airflow.sdk._shared.secrets_masker import redact


def mask_logs(logger: Any, method_name: str, event_dict: EventDict) -> EventDict:
from airflow.sdk._shared.secrets_masker import redact

event_dict = redact(event_dict) # type: ignore[assignment]
return event_dict

Expand Down