[backend/frontend] Bring execution traces at asset/agent level

openbas-api/src/main/java/io/openbas/executors/Executor.java

@@ -42,7 +42,8 @@ private InjectStatus executeExternal(ExecutableInject executableInject, Injector
       throws IOException, TimeoutException {
     Inject inject = executableInject.getInjection().getInject();
     String jsonInject = mapper.writeValueAsString(executableInject);
-    InjectStatus injectStatus = this.injectStatusRepository.findByInject(inject).orElseThrow();
+    InjectStatus injectStatus =
+        this.injectStatusRepository.findByInjectId(inject.getId()).orElseThrow();
     queueService.publish(injector.getType(), jsonInject);
     injectStatus.addInfoTrace(
         "The inject has been published and is now waiting to be consumed.",
@@ -58,7 +59,8 @@ private InjectStatus executeInternal(ExecutableInject executableInject, Injector
     // After execution, expectations are already created
     // Injection status is filled after complete execution
     // Report inject execution
-    InjectStatus injectStatus = this.injectStatusRepository.findByInject(inject).orElseThrow();
+    InjectStatus injectStatus =
+        this.injectStatusRepository.findByInjectId(inject.getId()).orElseThrow();
     InjectStatus completeStatus = injectStatusService.fromExecution(execution, injectStatus);
     return injectStatusRepository.save(completeStatus);
   }

openbas-api/src/main/java/io/openbas/executors/Injector.java

@@ -1,6 +1,6 @@
 package io.openbas.executors;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
 import static io.openbas.utils.InjectionUtils.isInInjectableRange;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

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

@@ -1,8 +1,8 @@
 package io.openbas.injectors.caldera;
 
 import static io.openbas.database.model.Command.COMMAND_TYPE;
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewInfoTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewInfoTrace;
 import static io.openbas.model.expectation.DetectionExpectation.*;
 import static io.openbas.model.expectation.ManualExpectation.*;
 import static io.openbas.model.expectation.PreventionExpectation.*;

openbas-api/src/main/java/io/openbas/injectors/caldera/service/CalderaResultCollectorService.java

@@ -79,7 +79,7 @@ public void run() {
                 && resultStatus.isComplete()
                 && resultStatus.isFail()) {
               injectStatus.addTrace(
-                  new ExecutionTraces(
+                  new ExecutionTrace(
                       injectStatus,
                       ExecutionTraceStatus.MAYBE_PREVENTED,
                       List.of(),
@@ -96,7 +96,7 @@ public void run() {
                 && resultStatus.isComplete()
                 && !resultStatus.isFail()) {
               injectStatus.addTrace(
-                  new ExecutionTraces(
+                  new ExecutionTrace(
                       injectStatus,
                       ExecutionTraceStatus.SUCCESS,
                       List.of(),
@@ -116,7 +116,7 @@ public void run() {
                     .isBefore(Instant.now().minus(5L, ChronoUnit.MINUTES))) {
 
               injectStatus.addTrace(
-                  new ExecutionTraces(
+                  new ExecutionTrace(
                       injectStatus,
                       ExecutionTraceStatus.MAYBE_PREVENTED,
                       List.of(),

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

@@ -1,7 +1,7 @@
 package io.openbas.injectors.challenge;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewSuccessTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewSuccessTrace;
 import static io.openbas.helper.StreamHelper.fromIterable;
 import static io.openbas.injectors.challenge.ChallengeContract.CHALLENGE_PUBLISH;
 

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

@@ -1,8 +1,8 @@
 package io.openbas.injectors.channel;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewInfoTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewSuccessTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewInfoTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewSuccessTrace;
 import static io.openbas.helper.StreamHelper.fromIterable;
 import static io.openbas.injectors.channel.ChannelContract.CHANNEL_PUBLISH;
 

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

@@ -1,6 +1,6 @@
 package io.openbas.injectors.email;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
 import static io.openbas.injectors.email.EmailContract.EMAIL_GLOBAL;
 
 import io.openbas.config.OpenBASConfig;

openbas-api/src/main/java/io/openbas/injectors/email/service/EmailService.java

@@ -1,8 +1,8 @@
 package io.openbas.injectors.email.service;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewInfoTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewSuccessTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewInfoTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewSuccessTrace;
 import static io.openbas.helper.TemplateHelper.buildContextualContent;
 import static java.util.stream.Collectors.joining;
 
@@ -75,7 +75,7 @@ public void sendEmail(
     execution.addTrace(
         getNewSuccessTrace("Mail sent to " + emails, ExecutionTraceAction.EXECUTION, userIds));
     // Store message in Imap after sending
-    storeMessageImap(execution, mimeMessage);
+    storeMessageImap(execution, mimeMessage, userIds);
   }
 
   public void sendEmail(
@@ -108,7 +108,7 @@ public void sendEmail(
     execution.addTrace(
         getNewSuccessTrace("Mail sent to " + email, ExecutionTraceAction.EXECUTION, userIds));
     // Store message in Imap after sending
-    storeMessageImap(execution, mimeMessage);
+    storeMessageImap(execution, mimeMessage, userIds);
   }
 
   private InternetAddress getInternetAddress(String email) {
@@ -119,12 +119,12 @@ private InternetAddress getInternetAddress(String email) {
     }
   }
 
-  private void storeMessageImap(Execution execution, MimeMessage mimeMessage)
+  private void storeMessageImap(Execution execution, MimeMessage mimeMessage, List<String> userIds)
       throws InterruptedException {
     if (!imapEnabled) {
       execution.addTrace(
           getNewSuccessTrace(
-              "Mail successfully send (imap disabled)", ExecutionTraceAction.COMPLETE));
+              "Mail successfully send (imap disabled)", ExecutionTraceAction.COMPLETE, userIds));
       return;
     }
     if (execution.isRuntime() && imapEnabled) {
@@ -133,18 +133,22 @@ private void storeMessageImap(Execution execution, MimeMessage mimeMessage)
           imapService.storeSentMessage(mimeMessage);
           execution.addTrace(
               getNewSuccessTrace(
-                  "Mail successfully stored in IMAP", ExecutionTraceAction.COMPLETE));
+                  "Mail successfully stored in IMAP", ExecutionTraceAction.COMPLETE, userIds));
           return;
         } catch (Exception e) {
           execution.addTrace(
               getNewInfoTrace(
-                  "Fail to store mail in IMAP " + e.getMessage(), ExecutionTraceAction.EXECUTION));
+                  "Fail to store mail in IMAP " + e.getMessage(),
+                  ExecutionTraceAction.EXECUTION,
+                  userIds));
           Thread.sleep(2000);
         }
       }
       execution.addTrace(
           getNewErrorTrace(
-              "Fail to store mail in IMAP after 3 attempts", ExecutionTraceAction.COMPLETE));
+              "Fail to store mail in IMAP after 3 attempts",
+              ExecutionTraceAction.COMPLETE,
+              userIds));
     }
   }
 

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

@@ -1,7 +1,7 @@
 package io.openbas.injectors.lade;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewInfoTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewInfoTrace;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.openbas.database.model.Execution;

openbas-api/src/main/java/io/openbas/injectors/lade/model/LadeWorkflow.java

@@ -1,6 +1,6 @@
 package io.openbas.injectors.lade.model;
 
-import io.openbas.database.model.ExecutionTraces;
+import io.openbas.database.model.ExecutionTrace;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,15 +10,15 @@
 @Getter
 public class LadeWorkflow {
 
-  private final List<ExecutionTraces> traces = new ArrayList<>();
+  private final List<ExecutionTrace> traces = new ArrayList<>();
 
   @Setter private boolean done = false;
 
   @Setter private boolean fail = false;
 
   @Setter private Instant stopTime;
 
-  public void addTrace(ExecutionTraces trace) {
+  public void addTrace(ExecutionTrace trace) {
     this.traces.add(trace);
   }
 }

openbas-api/src/main/java/io/openbas/injectors/lade/service/LadeService.java

@@ -15,8 +15,8 @@
 import com.fasterxml.jackson.databind.node.NullNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.openbas.database.model.Endpoint;
+import io.openbas.database.model.ExecutionTrace;
 import io.openbas.database.model.ExecutionTraceAction;
-import io.openbas.database.model.ExecutionTraces;
 import io.openbas.injector_contract.Contract;
 import io.openbas.injector_contract.ContractConfig;
 import io.openbas.injector_contract.ContractDef;
@@ -357,11 +357,11 @@ public LadeWorkflow getWorkflowStatus(String workflowId) {
             String eventLevel = workflowEvent.get("level").asText();
             String message = workflowEvent.get("message").asText();
             if (!message.isEmpty() && !message.equals("null")) {
-              ExecutionTraces trace;
+              ExecutionTrace trace;
               if (eventLevel.equals("error")) {
-                trace = ExecutionTraces.getNewErrorTrace(message, ExecutionTraceAction.COMPLETE);
+                trace = ExecutionTrace.getNewErrorTrace(message, ExecutionTraceAction.COMPLETE);
               } else {
-                trace = ExecutionTraces.getNewSuccessTrace(message, ExecutionTraceAction.COMPLETE);
+                trace = ExecutionTrace.getNewSuccessTrace(message, ExecutionTraceAction.COMPLETE);
               }
               ladeWorkflow.addTrace(trace);
             }

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

@@ -1,8 +1,8 @@
 package io.openbas.injectors.manual;
 
 import io.openbas.database.model.Execution;
+import io.openbas.database.model.ExecutionTrace;
 import io.openbas.database.model.ExecutionTraceAction;
-import io.openbas.database.model.ExecutionTraces;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.executors.Injector;
 import io.openbas.injectors.manual.model.ManualContent;
@@ -41,7 +41,7 @@ public ExecutionProcess process(
 
     injectExpectationService.buildAndSaveInjectExpectations(injection, expectations);
     execution.addTrace(
-        ExecutionTraces.getNewSuccessTrace(
+        ExecutionTrace.getNewSuccessTrace(
             "Manual inject execution", ExecutionTraceAction.COMPLETE));
     return new ExecutionProcess(false);
   }

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

@@ -1,7 +1,7 @@
 package io.openbas.injectors.mastodon;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewSuccessTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewSuccessTrace;
 
 import io.openbas.database.model.*;
 import io.openbas.execution.ExecutableInject;

openbas-api/src/main/java/io/openbas/injectors/mastodon/service/MastodonService.java

@@ -1,6 +1,6 @@
 package io.openbas.injectors.mastodon.service;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.openbas.database.model.DataAttachment;

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

@@ -1,6 +1,6 @@
 package io.openbas.injectors.openbas;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
 import static io.openbas.model.expectation.DetectionExpectation.*;
 import static io.openbas.model.expectation.ManualExpectation.*;
 import static io.openbas.model.expectation.PreventionExpectation.*;

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

@@ -1,6 +1,6 @@
 package io.openbas.injectors.opencti;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
 import static io.openbas.injectors.opencti.OpenCTIContract.OPENCTI_CREATE_CASE;
 
 import io.openbas.database.model.*;

openbas-api/src/main/java/io/openbas/injectors/opencti/service/OpenCTIService.java

@@ -1,7 +1,7 @@
 package io.openbas.injectors.opencti.service;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewSuccessTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewSuccessTrace;
 
 import io.openbas.database.model.DataAttachment;
 import io.openbas.database.model.Execution;

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

@@ -1,7 +1,7 @@
 package io.openbas.injectors.ovh;
 
-import static io.openbas.database.model.ExecutionTraces.getNewErrorTrace;
-import static io.openbas.database.model.ExecutionTraces.getNewSuccessTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewErrorTrace;
+import static io.openbas.database.model.ExecutionTrace.getNewSuccessTrace;
 import static org.springframework.util.StringUtils.hasText;
 
 import io.openbas.database.model.Execution;
@@ -58,7 +58,9 @@ public ExecutionProcess process(
               String email = user.getEmail();
               if (!StringUtils.hasLength(phone)) {
                 String message = "Sms fail for " + email + ": no phone number";
-                execution.addTrace(getNewErrorTrace(message, ExecutionTraceAction.COMPLETE));
+                execution.addTrace(
+                    getNewErrorTrace(
+                        message, ExecutionTraceAction.COMPLETE, List.of(user.getId())));
               } else {
                 try {
                   String callResult = smsService.sendSms(context, phone, smsMessage);
@@ -76,15 +78,20 @@ public ExecutionProcess process(
                             + " contains error ("
                             + callResult
                             + ")";
-                    execution.addTrace(getNewErrorTrace(message, ExecutionTraceAction.COMPLETE));
+                    execution.addTrace(
+                        getNewErrorTrace(
+                            message, ExecutionTraceAction.COMPLETE, List.of(user.getId())));
                   } else {
                     String message =
                         "Sms sent to " + email + " through " + phone + " (" + callResult + ")";
-                    execution.addTrace(getNewSuccessTrace(message, ExecutionTraceAction.COMPLETE));
+                    execution.addTrace(
+                        getNewSuccessTrace(
+                            message, ExecutionTraceAction.COMPLETE, List.of(user.getId())));
                   }
                 } catch (Exception e) {
                   execution.addTrace(
-                      getNewErrorTrace(e.getMessage(), ExecutionTraceAction.COMPLETE));
+                      getNewErrorTrace(
+                          e.getMessage(), ExecutionTraceAction.COMPLETE, List.of(user.getId())));
                 }
               }
             });