wip

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java

@@ -329,12 +329,6 @@ public void onDataAvailable(
         DataBundle newData,
         GatewayContext gwCtx) {
       Waf.ResultWithData resultWithData;
-      CtxAndAddresses ctxAndAddr = ctxAndAddresses.get();
-      if (ctxAndAddr == null) {
-        log.debug("Skipped; the WAF is not configured");
-        return;
-      }
-
       if (reqCtx.isWafContextClosed()) {
         log.debug("Skipped; the WAF context is closed");
         if (gwCtx.isRasp) {
@@ -562,9 +556,7 @@ private Waf.ResultWithData doRunWaf(
     private Waf.ResultWithData runWafContext(
         WafContext wafContext, WafMetrics metrics, DataBundle newData) throws AbstractWafException {
       return wafContext.run(
-          new DataBundleMapWrapper(ctxAndAddresses.get().addressesOfInterest, newData),
-          LIMITS,
-          metrics);
+          new DataBundleMapWrapper(getUsedAddresses(wafHandle), newData), LIMITS, metrics);
     }
   }
 
@@ -581,9 +573,7 @@ private static void incrementErrorCodeMetric(
   private Waf.ResultWithData runWafTransient(
       WafContext wafContext, WafMetrics metrics, DataBundle newData) throws AbstractWafException {
     return wafContext.runEphemeral(
-        new DataBundleMapWrapper(ctxAndAddresses.get().addressesOfInterest, newData),
-        LIMITS,
-        metrics);
+        new DataBundleMapWrapper(getUsedAddresses(wafHandle), newData), LIMITS, metrics);
   }
 
   private Collection<AppSecEvent> buildEvents(Waf.ResultWithData actionWithData) {