first steps to add cmdArray support (not blocking)

Author: jandro996

dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java

@@ -27,14 +27,8 @@ public static void beforeStart(@CallSite.Argument @Nullable final String command
   @CallSite.Before("java.lang.Process java.lang.Runtime.exec(java.lang.String[])")
   public static void beforeExec(@CallSite.Argument @Nullable final String[] cmdArray) {
     if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(cmdArray);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
-        }
-      }
+      iastCallback(cmdArray);
+      raspCallback(cmdArray);
     }
   }
 
@@ -43,14 +37,8 @@ public static void beforeExec(
       @CallSite.Argument @Nullable final String command,
       @CallSite.Argument @Nullable final String[] envp) {
     if (command != null) { // runtime fails if null
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, command);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
-        }
-      }
+      iastCallback(envp, command);
+      raspCallback(command);
     }
   }
 
@@ -60,14 +48,8 @@ public static void beforeExec(
       @CallSite.Argument @Nullable final String[] cmdArray,
       @CallSite.Argument @Nullable final String[] envp) {
     if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, cmdArray);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
-        }
-      }
+      iastCallback(envp, cmdArray);
+      raspCallback(cmdArray);
     }
   }
 
@@ -78,14 +60,8 @@ public static void beforeExec(
       @CallSite.Argument @Nullable final String[] envp,
       @CallSite.Argument @Nullable final File dir) {
     if (command != null) { // runtime fails if null
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, command);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
-        }
-      }
+      iastCallback(envp, command);
+      raspCallback(command);
     }
   }
 
@@ -96,14 +72,8 @@ public static void beforeExec(
       @CallSite.Argument @Nullable final String[] envp,
       @CallSite.Argument @Nullable final File dir) {
     if (cmdArray != null && cmdArray.length > 0) { // runtime fails if null or empty
-      final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
-      if (module != null) {
-        try {
-          module.onRuntimeExec(envp, cmdArray);
-        } catch (final Throwable e) {
-          module.onUnexpectedException("beforeExec threw", e);
-        }
-      }
+      iastCallback(envp, cmdArray);
+      raspCallback(cmdArray);
     }
   }
 
@@ -113,12 +83,49 @@ private static void iastCallback(String command) {
       try {
         module.onRuntimeExec(command);
       } catch (final Throwable e) {
-        module.onUnexpectedException("beforeExec threw", e);
+        module.onUnexpectedException("iastCallback threw", e);
+      }
+    }
+  }
+
+  private static void iastCallback(String[] cmdArray) {
+    final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+    if (module != null) {
+      try {
+        module.onRuntimeExec(cmdArray);
+      } catch (final Throwable e) {
+        module.onUnexpectedException("iastCallback threw", e);
+      }
+    }
+  }
+
+  private static void iastCallback(String[] envp, String command) {
+    final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+    if (module != null) {
+      try {
+        module.onRuntimeExec(envp, command);
+      } catch (final Throwable e) {
+        module.onUnexpectedException("iastCallback threw", e);
+      }
+    }
+  }
+
+  private static void iastCallback(String[] envp, String[] cmdArray) {
+    final CommandInjectionModule module = InstrumentationBridge.COMMAND_INJECTION;
+    if (module != null) {
+      try {
+        module.onRuntimeExec(envp, cmdArray);
+      } catch (final Throwable e) {
+        module.onUnexpectedException("iastCallback threw", e);
       }
     }
   }
 
   private static void raspCallback(String command) {
     ShellCmdRaspHelper.INSTANCE.beforeShellCmd(command);
   }
+
+  private static void raspCallback(String[] cmdArray) {
+    ShellCmdRaspHelper.INSTANCE.beforeShellCmd(cmdArray);
+  }
 }

dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ShellCmdRaspHelper.java

@@ -25,6 +25,10 @@ private ShellCmdRaspHelper() {
     // prevent instantiation
   }
 
+  public void beforeShellCmd(@Nonnull final String[] cmdArray) {
+    // TODO
+  }
+
   public void beforeShellCmd(@Nonnull final String cmd) {
     if (!Config.get().isAppSecRaspEnabled()) {
       return;