[backend] Fix

openbas-api/src/main/java/io/openbas/executors/caldera/service/CalderaExecutorService.java

@@ -48,6 +48,7 @@ public class CalderaExecutorService implements Runnable {
     private final CalderaExecutorContextService calderaExecutorContextService;
 
     private final InjectorService injectorService;
+    private final PlatformSettingsService platformSettingsService;
 
     private Executor executor = null;
 
@@ -81,54 +82,58 @@ public CalderaExecutorService(
         this.endpointService = endpointService;
         this.calderaExecutorContextService = calderaExecutorContextService;
         this.injectorService = injectorService;
+        this.platformSettingsService = platformSettingsService;
         try {
             if (config.isEnable()) {
                 this.executor = executorService.register(config.getId(), CALDERA_EXECUTOR_TYPE, CALDERA_EXECUTOR_NAME, getClass().getResourceAsStream("/img/icon-caldera.png"), new String[]{Endpoint.PLATFORM_TYPE.Windows.name(), Endpoint.PLATFORM_TYPE.Linux.name(), Endpoint.PLATFORM_TYPE.MacOS.name()});
                 this.calderaExecutorContextService.registerAbilities();
             } else {
                 executorService.remove(config.getId());
             }
-            platformSettingsService.cleanMessage();
         } catch (Exception e) {
             log.log(Level.SEVERE, "Error creating caldera executor: " + e);
-            platformSettingsService.errorMessage("Executor Caldera is not responding, your exercises may be impacted.");
         }
     }
 
     @Override
     public void run() {
-        log.info("Running Caldera executor endpoints gathering...");
-        // The executor only retrieve "main" agents (without the keyword "executor")
-        // This is NOT a standard behaviour, this is because we are using Caldera as an executor and we should not
-        // Will be replaced by the XTM agent
-        List<Agent> agents = this.client.agents().stream().filter(agent -> !agent.getExe_name().contains("implant")).toList();
-        List<Endpoint> endpoints = toEndpoint(agents).stream().filter(Asset::getActive).toList();
-        log.info("Caldera executor provisioning based on " + endpoints.size() + " assets");
-        endpoints.forEach(endpoint -> {
-            List<Endpoint> existingEndpoints = this.endpointService.findAssetsForInjectionByHostname(endpoint.getHostname()).stream().filter(endpoint1 -> Arrays.stream(endpoint1.getIps()).anyMatch(s -> Arrays.stream(endpoint.getIps()).toList().contains(s))).toList();
-            if (existingEndpoints.isEmpty()) {
-                Optional<Endpoint> endpointByExternalReference = endpointService.findByExternalReference(endpoint.getExternalReference());
-                if (endpointByExternalReference.isPresent()) {
-                    this.updateEndpoint(endpoint, List.of(endpointByExternalReference.get()));
+        try {
+            log.info("Running Caldera executor endpoints gathering...");
+            // The executor only retrieve "main" agents (without the keyword "executor")
+            // This is NOT a standard behaviour, this is because we are using Caldera as an executor and we should not
+            // Will be replaced by the XTM agent
+            List<Agent> agents = this.client.agents().stream().filter(agent -> !agent.getExe_name().contains("implant")).toList();
+            List<Endpoint> endpoints = toEndpoint(agents).stream().filter(Asset::getActive).toList();
+            log.info("Caldera executor provisioning based on " + endpoints.size() + " assets");
+            endpoints.forEach(endpoint -> {
+                List<Endpoint> existingEndpoints = this.endpointService.findAssetsForInjectionByHostname(endpoint.getHostname()).stream().filter(endpoint1 -> Arrays.stream(endpoint1.getIps()).anyMatch(s -> Arrays.stream(endpoint.getIps()).toList().contains(s))).toList();
+                if (existingEndpoints.isEmpty()) {
+                    Optional<Endpoint> endpointByExternalReference = endpointService.findByExternalReference(endpoint.getExternalReference());
+                    if (endpointByExternalReference.isPresent()) {
+                        this.updateEndpoint(endpoint, List.of(endpointByExternalReference.get()));
+                    } else {
+                        this.endpointService.createEndpoint(endpoint);
+                    }
                 } else {
-                    this.endpointService.createEndpoint(endpoint);
+                    this.updateEndpoint(endpoint, existingEndpoints);
                 }
-            } else {
-                this.updateEndpoint(endpoint, existingEndpoints);
-            }
-        });
-        List<Endpoint> inactiveEndpoints = toEndpoint(agents).stream().filter(endpoint -> !endpoint.getActive()).toList();
-        inactiveEndpoints.forEach(endpoint -> {
-            Optional<Endpoint> optionalExistingEndpoint = this.endpointService.findByExternalReference(endpoint.getExternalReference());
-            if (optionalExistingEndpoint.isPresent()) {
-                Endpoint existingEndpoint = optionalExistingEndpoint.get();
-                if ((now().toEpochMilli() - existingEndpoint.getClearedAt().toEpochMilli()) > DELETE_TTL) {
-                    log.info("Found stale agent " + existingEndpoint.getName() + ", deleting it...");
-                    this.client.deleteAgent(existingEndpoint);
-                    this.endpointService.deleteEndpoint(existingEndpoint.getId());
+            });
+            List<Endpoint> inactiveEndpoints = toEndpoint(agents).stream().filter(endpoint -> !endpoint.getActive()).toList();
+            inactiveEndpoints.forEach(endpoint -> {
+                Optional<Endpoint> optionalExistingEndpoint = this.endpointService.findByExternalReference(endpoint.getExternalReference());
+                if (optionalExistingEndpoint.isPresent()) {
+                    Endpoint existingEndpoint = optionalExistingEndpoint.get();
+                    if ((now().toEpochMilli() - existingEndpoint.getClearedAt().toEpochMilli()) > DELETE_TTL) {
+                        log.info("Found stale agent " + existingEndpoint.getName() + ", deleting it...");
+                        this.client.deleteAgent(existingEndpoint);
+                        this.endpointService.deleteEndpoint(existingEndpoint.getId());
+                    }
                 }
-            }
-        });
+            });
+            this.platformSettingsService.cleanMessage();
+        } catch (Exception e) {
+            this.platformSettingsService.errorMessage("Executor Caldera is not responding, your exercises may be impacted.");
+        }
     }
 
     // -- PRIVATE --

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

@@ -1,10 +1,8 @@
 package io.openbas.injectors.caldera.client;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.openbas.database.model.Endpoint;
-import io.openbas.database.model.Injector;
 import io.openbas.injectors.caldera.client.model.Ability;
 import io.openbas.injectors.caldera.client.model.Agent;
 import io.openbas.injectors.caldera.client.model.Result;
@@ -13,8 +11,8 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
 import org.apache.hc.client5.http.ClientProtocolException;
-import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpDelete;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.classic.methods.HttpPatch;
@@ -27,13 +25,13 @@
 import org.springframework.util.StringUtils;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @RequiredArgsConstructor
 @Service
+@Log
 public class CalderaInjectorClient {
 
     private static final String KEY_HEADER = "KEY";
@@ -86,6 +84,7 @@ public List<Agent> agents() {
             return this.objectMapper.readValue(jsonResponse, new TypeReference<>() {
             });
         } catch (IOException e) {
+            log.severe("Cannot retrieve agent list");
             throw new RuntimeException(e);
         }
     }

openbas-framework/src/main/java/io/openbas/executors/caldera/client/CalderaExecutorClient.java

@@ -49,7 +49,7 @@ public List<Agent> agents() {
             });
         } catch (IOException e) {
             log.severe("Cannot retrieve agent list");
-            return new ArrayList<>();
+            throw new RuntimeException(e);
         }
     }