chore(wsgi): remove some appsec code from wsgi contrib

ddtrace/appsec/_asm_request_context.py

@@ -120,7 +120,7 @@ def __init__(self):
 
     def finalise(self):
         if self.active:
-            env = core.get_item("asm_env")
+            env = self.execution_context.get_item("asm_env")
             # assert _CONTEXT_ID.get() == self._id
             callbacks = GLOBAL_CALLBACKS.get(_CONTEXT_CALL, []) + env.callbacks.get(_CONTEXT_CALL)
             if callbacks is not None:
@@ -319,12 +319,26 @@ def asm_request_context_manager(
     The ASM context manager
     """
     if config._appsec_enabled:
-        resources = _DataHandler()
-        asm_request_context_set(remote_ip, headers, headers_case_sensitive, block_request_callable)
+        resources = _on_context_started(remote_ip, headers, headers_case_sensitive, block_request_callable)
         try:
             yield resources
         finally:
-            resources.finalise()
-            core.set_item("asm_env", None)
+            _on_context_ended(resources)
     else:
         yield None
+
+
+def _on_context_started(remote_ip, headers, headers_case_sensitive, block_request_callable):
+    resources = _DataHandler()
+    asm_request_context_set(remote_ip, headers, headers_case_sensitive, block_request_callable)
+    core.on("wsgi.block_decided", _on_block_decided)
+    return resources
+
+
+def _on_context_ended(resources):
+    resources.finalise()
+    core.set_item("asm_env", None)
+
+
+def _on_block_decided(callback):
+    set_value(_CALLBACKS, "flask_block", callback)

ddtrace/contrib/wsgi/wsgi.py

@@ -2,10 +2,8 @@
 import sys
 from typing import TYPE_CHECKING
 
-from ddtrace.appsec import _asm_request_context
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from ...appsec._constants import SPAN_DATA_NAMES
 from ..trace_utils import _get_request_header_user_agent
 from ..trace_utils import _set_url_tag
 
@@ -27,6 +25,9 @@
 
 import ddtrace
 from ddtrace import config
+from ddtrace.appsec import _asm_request_context
+from ddtrace.appsec import utils
+from ddtrace.appsec._constants import SPAN_DATA_NAMES
 from ddtrace.ext import SpanKind
 from ddtrace.ext import SpanTypes
 from ddtrace.ext import http
@@ -38,7 +39,6 @@
 from ddtrace.vendor import wrapt
 
 from .. import trace_utils
-from ...appsec import utils
 from ...appsec._constants import WAF_CONTEXT_NAMES
 from ...constants import SPAN_KIND
 from ...internal import core
@@ -165,29 +165,25 @@ def __call__(self, environ, start_response):
         headers = get_request_headers(environ)
         closing_iterator = ()
         not_blocked = True
-        with _asm_request_context.asm_request_context_manager(
-            environ.get("REMOTE_ADDR"), headers, headers_case_sensitive=True
-        ):
+        with _asm_request_context.asm_request_context_manager(environ.get("REMOTE_ADDR"), headers, True):
             req_span = self.tracer.trace(
                 self._request_span_name,
                 service=trace_utils.int_service(self._pin, self._config),
                 span_type=SpanTypes.WEB,
             )
 
             if self.tracer._appsec_enabled:
-                # [IP Blocking]
                 if core.get_item(WAF_CONTEXT_NAMES.BLOCKED, span=req_span):
                     ctype, content = self._make_block_content(environ, headers, req_span)
                     start_response("403 FORBIDDEN", [("content-type", ctype)])
                     closing_iterator = [content]
                     not_blocked = False
 
-                # [Suspicious Request Blocking on request]
                 def blocked_view():
                     ctype, content = self._make_block_content(environ, headers, req_span)
                     return content, 403, [("content-type", ctype)]
 
-                _asm_request_context.set_value(_asm_request_context._CALLBACKS, "flask_block", blocked_view)
+                core.dispatch("wsgi.block_decided", [blocked_view])
 
             if not_blocked:
                 req_span.set_tag_str(COMPONENT, self._config.integration_name)
@@ -212,7 +208,6 @@ def blocked_view():
                     req_span.finish()
                     raise
                 if self.tracer._appsec_enabled and core.get_item(WAF_CONTEXT_NAMES.BLOCKED, span=req_span):
-                    # [Suspicious Request Blocking on request or response]
                     _, content = self._make_block_content(environ, headers, req_span)
                     closing_iterator = [content]