Skip to content
Open
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
7 changes: 4 additions & 3 deletions datadog_lambda/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ def __call__(self, event, context, **kwargs):
if self.blocking_response:
return self.blocking_response
self.response = self.func(event, context, **kwargs)
return self.response
except BlockingException:
self.blocking_response = get_asm_blocked_response(self.event_source)
except Exception:
Expand All @@ -201,8 +200,10 @@ def __call__(self, event, context, **kwargs):
raise
finally:
self._after(event, context)
if self.blocking_response:
return self.blocking_response

if self.blocking_response:
return self.blocking_response
return self.response

def _inject_authorizer_span_headers(self, request_id):
reference_span = self.inferred_span if self.inferred_span else self.span
Expand Down
17 changes: 17 additions & 0 deletions tests/test_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,23 @@ def lambda_handler(event, context):

assert lambda_handler.span.get_tag("http.status_code") == "403"

def test_handler_exception_propagates_when_appsec_enabled(self):
# Regression guard: before the fix, `return` in the `finally` block
# would silently swallow handler exceptions when no blocking response
# was set, preventing them from reaching the caller.
self.mock_get_asm_blocking_response.return_value = None

class HandlerError(Exception):
pass

def lambda_handler(event, context):
raise HandlerError("handler error")

lambda_handler = wrapper.datadog_lambda_wrapper(lambda_handler)

with self.assertRaises(HandlerError):
lambda_handler(self.api_gateway_request, get_mock_context())

def test_no_blocking_appsec_disabled(self):
os.environ["DD_APPSEC_ENABLED"] = "false"

Expand Down