wip

Author: jandro996

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastGlobalContext.java

@@ -46,7 +46,7 @@ public IastContext resolve() {
 
     @Override
     public IastContext buildRequestContext() {
-      return new IastRequestContext((TaintedObjects) globalContext.getTaintedObjects());
+      return new IastRequestContext(globalContext.getTaintedObjects());
     }
 
     @Override

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastOptOutContext.java

@@ -32,7 +32,7 @@ public IastContext resolve() {
 
     @Override
     public IastContext buildRequestContext() {
-      return new IastRequestContext((TaintedObjects) optOutContext.getTaintedObjects());
+      return new IastRequestContext(optOutContext.getTaintedObjects());
     }
 
     @Override

dd-java-agent/agent-iast/src/main/java/com/datadog/iast/IastRequestContext.java

@@ -57,12 +57,14 @@ public IastRequestContext(final TaintedObjects taintedObjects) {
    * Use this constructor only when you want to create a new context with a fresh overhead context
    * (e.g. for testing purposes).
    *
+   * @param taintedObjects the tainted objects to use
    * @param overheadContext the overhead context to use
    */
-  public IastRequestContext(final OverheadContext overheadContext) {
+  public IastRequestContext(
+      final TaintedObjects taintedObjects, final OverheadContext overheadContext) {
     this.vulnerabilityBatch = new VulnerabilityBatch();
     this.overheadContext = overheadContext;
-    this.taintedObjects = TaintedObjects.build(TaintedMap.build(MAP_SIZE));
+    this.taintedObjects = taintedObjects;
   }
 
   public VulnerabilityBatch getVulnerabilityBatch() {

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/IastRequestContextTest.groovy

@@ -2,6 +2,7 @@ package com.datadog.iast
 
 import com.datadog.iast.model.Range
 import com.datadog.iast.overhead.OverheadContext
+import com.datadog.iast.taint.TaintedMap
 import com.datadog.iast.taint.TaintedObjects
 import datadog.trace.api.Config
 import datadog.trace.api.gateway.RequestContext
@@ -125,7 +126,7 @@ class IastRequestContextTest extends DDSpecification {
   void 'on release context overheadContext reset is called'() {
     setup:
     final overheadCtx = Mock(OverheadContext)
-    final ctx = new IastRequestContext(overheadCtx)
+    final ctx = new IastRequestContext(TaintedObjects.build(TaintedMap.build(TaintedMap.DEFAULT_CAPACITY)), overheadCtx)
 
     when:
     provider.releaseRequestContext(ctx)