Skip to content

Add handle for circular exceptions in SecretsMasker. #61254

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.

Sign up for GitHub

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

Closed
Crowiant wants to merge 1 commit into from
Closed

Add handle for circular exceptions in SecretsMasker. #61254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions airflow/utils/log/secrets_masker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,27 @@ def _record_attrs_to_ignore(self) -> Iterable[str]:
)
return frozenset(record.__dict__).difference({"msg", "args"})

def _redact_exception_with_context(self, exception):
def _redact_exception_with_context(self, exception, visited=None):
# Exception class may not be modifiable (e.g. declared by an
# extension module such as JDBC).
if visited is None:
visited = set()

if id(exception) in visited:
return

visited.add(id(exception))

if len(visited) > self.MAX_RECURSION_DEPTH:
return
try:
exception.args = (self.redact(v) for v in exception.args)
except AttributeError:
pass
if exception.__context__:
self._redact_exception_with_context(exception.__context__)
self._redact_exception_with_context(exception.__context__, visited)
if exception.__cause__ and exception.__cause__ is not exception.__context__:
self._redact_exception_with_context(exception.__cause__)
self._redact_exception_with_context(exception.__cause__, visited)

def filter(self, record) -> bool:
if settings.MASK_SECRETS_IN_LOGS is not True:
Expand Down
Loading