[frontend|backend]Show prerequisites info in atomic testing

openbas-framework/src/main/java/io/openbas/execution/Executor.java → openbas-api/src/main/java/io/openbas/executors/Executor.java

@@ -1,4 +1,4 @@
-package io.openbas.execution;
+package io.openbas.executors;
 
 import static io.openbas.database.model.InjectStatusExecution.traceInfo;
 
@@ -9,6 +9,8 @@
 import io.openbas.database.repository.InjectRepository;
 import io.openbas.database.repository.InjectStatusRepository;
 import io.openbas.database.repository.InjectorRepository;
+import io.openbas.execution.ExecutableInject;
+import io.openbas.execution.ExecutionExecutorService;
 import jakarta.annotation.Resource;
 import java.time.Duration;
 import java.time.Instant;
@@ -96,9 +98,9 @@ private InjectStatus executeInternal(ExecutableInject executableInject, Inject i
             .orElseThrow(
                 () -> new UnsupportedOperationException("Inject does not have a contract"));
 
-    io.openbas.execution.Injector executor =
+    io.openbas.executors.Injector executor =
         this.context.getBean(
-            injectorContract.getInjector().getType(), io.openbas.execution.Injector.class);
+            injectorContract.getInjector().getType(), io.openbas.executors.Injector.class);
     Execution execution = executor.executeInjection(executableInject);
     Inject executedInject = injectRepository.findById(inject.getId()).orElseThrow();
     InjectStatus completeStatus = InjectStatus.fromExecution(execution, executedInject);

openbas-framework/src/main/java/io/openbas/execution/Injector.java → openbas-api/src/main/java/io/openbas/executors/Injector.java

@@ -1,13 +1,13 @@
-package io.openbas.execution;
+package io.openbas.executors;
 
 import static io.openbas.database.model.InjectStatusExecution.traceError;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.openbas.database.model.*;
 import io.openbas.database.repository.DocumentRepository;
+import io.openbas.execution.ExecutableInject;
 import io.openbas.model.ExecutionProcess;
-import io.openbas.model.expectation.*;
 import io.openbas.service.FileService;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
@@ -40,7 +40,7 @@ public void setFileService(FileService fileService) {
   public abstract ExecutionProcess process(Execution execution, ExecutableInject injection)
       throws Exception;
 
-  public InjectStatusCommandLine getCommandsLines(String externalId) {
+  public StatusPayload getPayloadOutput(String externalId) {
     return null;
   }
 

openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaExecutor.java

@@ -16,9 +16,10 @@
 import io.openbas.asset.EndpointService;
 import io.openbas.database.model.*;
 import io.openbas.database.model.InjectExpectation.EXPECTATION_TYPE;
+import io.openbas.database.model.PayloadCommandBlock;
 import io.openbas.database.repository.InjectRepository;
 import io.openbas.execution.ExecutableInject;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.caldera.client.model.Ability;
 import io.openbas.injectors.caldera.client.model.Agent;
@@ -274,28 +275,32 @@
   }
 
   @Override
-  public InjectStatusCommandLine getCommandsLines(String externalId) {
-    InjectStatusCommandLine commandLine = new InjectStatusCommandLine();
-    Set<String> contents = new HashSet<>();
-    Set<String> cleanCommands = new HashSet<>();
+  public StatusPayload getPayloadOutput(String externalId) {
+    StatusPayload statusPayload = new StatusPayload();
     Ability ability = calderaService.findAbilityById(externalId);
     if (ability != null) {
       ability
           .getExecutors()
           .forEach(
               executor -> {
+                PayloadCommandBlock payloadCommandBlock = new PayloadCommandBlock();
                 if (executor.getCommand() != null && !executor.getCommand().isBlank()) {
-                  contents.add(executor.getCommand());
+                  payloadCommandBlock.setContent(executor.getCommand());
                 }
                 if (executor.getCleanup() != null && !executor.getCleanup().isEmpty()) {
-                  cleanCommands.addAll(executor.getCleanup());
+                  payloadCommandBlock.setCleanupCommand(executor.getCleanup());
                 }
+                if (executor.getCommandExecutor() != null
+                    && !executor.getCommandExecutor().isBlank()) {
+                  payloadCommandBlock.setExecutor(executor.getCommandExecutor());
+                }
+                statusPayload.setPayloadCommandBlocks(
+                    Collections.singletonList(payloadCommandBlock));
               });
+      statusPayload.setExternalId(externalId);
     }
-    commandLine.setExternalId(externalId);
-    commandLine.setContent(contents.stream().toList());
-    commandLine.setCleanupCommand(cleanCommands.stream().toList());
-    return commandLine;
+
+    return statusPayload;
   }
 
   // -- PRIVATE --

openbas-api/src/main/java/io/openbas/injectors/caldera/client/model/Executor.java

@@ -11,5 +11,6 @@
   private String name;
   private String platform;
   private String command;
+  private String commandExecutor;
   private List<String> cleanup;
 }

openbas-api/src/main/java/io/openbas/injectors/challenge/ChallengeExecutor.java

@@ -10,7 +10,7 @@
 import io.openbas.database.repository.ChallengeRepository;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.challenge.model.ChallengeContent;
 import io.openbas.injectors.challenge.model.ChallengeVariable;

openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java

@@ -10,7 +10,7 @@
 import io.openbas.database.repository.ArticleRepository;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.channel.model.ArticleVariable;
 import io.openbas.injectors.channel.model.ChannelContent;

openbas-api/src/main/java/io/openbas/injectors/email/EmailExecutor.java

@@ -7,7 +7,7 @@
 import io.openbas.database.model.*;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.email.model.EmailContent;
 import io.openbas.injectors.email.service.EmailService;

openbas-api/src/main/java/io/openbas/injectors/lade/LadeExecutor.java

@@ -8,7 +8,7 @@
 import io.openbas.database.model.Inject;
 import io.openbas.database.model.InjectorContract;
 import io.openbas.execution.ExecutableInject;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.injectors.lade.service.LadeService;
 import io.openbas.model.ExecutionProcess;
 import jakarta.validation.constraints.NotNull;

openbas-api/src/main/java/io/openbas/injectors/manual/ManualExecutor.java

@@ -2,7 +2,7 @@
 
 import io.openbas.database.model.Execution;
 import io.openbas.execution.ExecutableInject;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.model.ExecutionProcess;
 import jakarta.validation.constraints.NotNull;
 import org.springframework.stereotype.Component;

openbas-api/src/main/java/io/openbas/injectors/mastodon/MastodonExecutor.java

@@ -5,7 +5,7 @@
 
 import io.openbas.database.model.*;
 import io.openbas.execution.ExecutableInject;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.injectors.mastodon.model.MastodonContent;
 import io.openbas.injectors.mastodon.service.MastodonService;
 import io.openbas.model.ExecutionProcess;

openbas-api/src/main/java/io/openbas/injectors/openbas/OpenBASImplantExecutor.java

@@ -13,7 +13,7 @@
 import io.openbas.database.model.*;
 import io.openbas.database.repository.InjectRepository;
 import io.openbas.execution.ExecutableInject;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.openbas.model.OpenBASImplantInjectContent;
 import io.openbas.model.ExecutionProcess;

openbas-api/src/main/java/io/openbas/injectors/opencti/OpenCTIExecutor.java

@@ -5,7 +5,7 @@
 
 import io.openbas.database.model.*;
 import io.openbas.execution.ExecutableInject;
-import io.openbas.execution.Injector;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.opencti.model.CaseContent;
 import io.openbas.injectors.opencti.service.OpenCTIService;

openbas-api/src/main/java/io/openbas/injectors/ovh/OvhSmsExecutor.java

@@ -8,8 +8,8 @@
 import io.openbas.database.model.Inject;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
-import io.openbas.execution.Injector;
 import io.openbas.execution.ProtectUser;
+import io.openbas.executors.Injector;
 import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.ovh.model.OvhSmsContent;
 import io.openbas.injectors.ovh.service.OvhSmsService;

openbas-api/src/main/java/io/openbas/migration/V3_49__Update_Commands_In_Inject_Status.java

@@ -0,0 +1,81 @@
+package io.openbas.migration;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.openbas.database.model.PayloadCommandBlock;
+import io.openbas.database.model.StatusPayload;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
+import org.springframework.stereotype.Component;
+
+@Component
+public class V3_49__Update_Commands_In_Inject_Status extends BaseJavaMigration {
+
+  @Override
+  public void migrate(Context context) throws Exception {
+    Statement select = context.getConnection().createStatement();
+
+    select.execute("ALTER TABLE injects_statuses ADD status_payload_output json;");
+
+    select.execute(
+        "UPDATE injects_statuses SET status_commands_lines=null WHERE status_commands_lines='null';");
+    ResultSet results =
+        select.executeQuery("SELECT status_id,status_commands_lines FROM injects_statuses");
+
+    PreparedStatement statement =
+        context
+            .getConnection()
+            .prepareStatement(
+                "UPDATE injects_statuses SET status_payload_output = ?::json WHERE status_id=?");
+
+    ObjectMapper mapper = new ObjectMapper();
+    while (results.next()) {
+      String commandLine = results.getString("status_commands_lines");
+      String statusId = results.getString("status_id");
+      if (commandLine != null) {
+        JsonNode jsonNode = mapper.readTree(commandLine);
+        JsonNode content = jsonNode.get("content");
+        String contentString = "";
+        if (content.isArray()) {
+          for (JsonNode node : content) {
+            contentString += node.asText();
+          }
+        }
+        JsonNode cleanupCommand = jsonNode.get("cleanup_command");
+        List<String> cleanupCommandList = new ArrayList<>();
+        if (cleanupCommand.isArray()) {
+          for (JsonNode node : cleanupCommand) {
+            cleanupCommandList.add(node.asText());
+          }
+        }
+        String externalId = jsonNode.get("external_id").asText();
+        StatusPayload statusPayload =
+            new StatusPayload(
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                null,
+                externalId,
+                null,
+                null,
+                List.of(new PayloadCommandBlock(null, contentString, cleanupCommandList)),
+                null);
+        String value = mapper.writeValueAsString(statusPayload);
+        statement.setString(1, value);
+        statement.setString(2, statusId);
+        statement.addBatch();
+      }
+    }
+    statement.executeBatch();
+    select.execute("ALTER TABLE injects_statuses DROP column status_commands_lines;");
+  }
+}

openbas-api/src/main/java/io/openbas/rest/atomic_testing/AtomicTestingApi.java

@@ -4,10 +4,7 @@
 import io.openbas.database.model.Inject;
 import io.openbas.database.model.InjectExpectation;
 import io.openbas.inject_expectation.InjectExpectationService;
-import io.openbas.rest.atomic_testing.form.AtomicTestingInput;
-import io.openbas.rest.atomic_testing.form.AtomicTestingUpdateTagsInput;
-import io.openbas.rest.atomic_testing.form.InjectResultOutput;
-import io.openbas.rest.atomic_testing.form.InjectResultOverviewOutput;
+import io.openbas.rest.atomic_testing.form.*;
 import io.openbas.rest.helper.RestBehavior;
 import io.openbas.service.AtomicTestingService;
 import io.openbas.telemetry.Tracing;
@@ -48,6 +45,13 @@
     return atomicTestingService.findById(injectId);
   }
 
+  @LogExecutionTime
+  @GetMapping("/{injectId}/payload")
+  @Tracing(name = "Get the payload of an atomic testing", layer = "api", operation = "GET")
+  public StatusPayloadOutput findAtomicTestingPayload(@PathVariable String injectId) {
+    return atomicTestingService.findPayloadOutputByInjectId(injectId);
+  }
+
   @PostMapping()
   @Transactional(rollbackFor = Exception.class)
   public InjectResultOverviewOutput createAtomicTesting(

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/AtomicInjectorContractOutput.java

@@ -0,0 +1,41 @@
+package io.openbas.rest.atomic_testing.form;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.openbas.database.converter.ContentConverter;
+import io.openbas.database.model.Endpoint;
+import jakarta.persistence.Convert;
+import jakarta.validation.constraints.NotBlank;
+import java.util.*;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Builder
+public class AtomicInjectorContractOutput {
+
+  @JsonProperty("injector_contract_id")
+  @NotBlank
+  private String id;
+
+  @JsonProperty("injector_contract_content")
+  @NotBlank
+  private String content;
+
+  @JsonProperty("convertedContent")
+  @Convert(converter = ContentConverter.class)
+  private ObjectNode convertedContent;
+
+  @JsonProperty("injector_contract_platforms")
+  private Endpoint.PLATFORM_TYPE[] platforms;
+
+  @JsonProperty("injector_contract_payload")
+  private PayloadSimple payload;
+
+  @Builder.Default
+  @JsonProperty("injector_contract_labels")
+  @NotBlank
+  private Map<String, String> labels = new HashMap<>();
+}

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/AttackPatternSimple.java

@@ -6,8 +6,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
-@Setter
 @Getter
+@Setter
 @Builder
 public class AttackPatternSimple {
 

openbas-api/src/main/java/io/openbas/rest/atomic_testing/form/InjectResultOverviewOutput.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.openbas.database.model.InjectStatusCommandLine;
 import io.openbas.utils.AtomicTestingUtils.ExpectationResultsByType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -38,10 +37,6 @@ public class InjectResultOverviewOutput {
   @JsonProperty("inject_content")
   private ObjectNode content;
 
-  @Schema(description = "Command lines for inject")
-  @JsonProperty("inject_commands_lines")
-  private InjectStatusCommandLine commandsLines;
-
   @Schema(description = "Type of inject")
   @JsonProperty("inject_type")
   private String type;
@@ -57,7 +52,7 @@ public class InjectResultOverviewOutput {
   @Schema(description = "Full contract")
   @JsonProperty("inject_injector_contract")
   @NotNull
-  private InjectorContractSimple injectorContract;
+  private AtomicInjectorContractOutput injectorContract;
 
   @Schema(description = "status")
   @JsonProperty("inject_status")