[backend] clean caldera settings if executor is not enable (#1550)

Signed-off-by: Marine LM <marine.lemezo@filigran.io>
OpenBAS-Platform · Sep 30, 2024 · b19e019 · b19e019
1 parent 24bd966
commit b19e019
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/executors/caldera/service/CalderaExecutorService.java b/openbas-api/src/main/java/io/openbas/executors/caldera/service/CalderaExecutorService.java
@@ -28,7 +28,6 @@
 import static java.time.Instant.now;
 import static java.time.ZoneOffset.UTC;
 
-@ConditionalOnProperty(prefix = "executor.caldera", name = "enable")
 @Log
 @Service
 public class CalderaExecutorService implements Runnable {
@@ -85,7 +84,8 @@ public CalderaExecutorService(
                 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());
+                this.platformSettingsService.cleanMessage(BannerMessage.BANNER_KEYS.CALDERA_UNAVAILABLE);
+                executorService.removeFromType(CALDERA_EXECUTOR_TYPE);
             }
         } catch (Exception e) {
             log.log(Level.SEVERE, "Error creating caldera executor: " + e);

diff --git a/openbas-framework/src/main/java/io/openbas/integrations/ExecutorService.java b/openbas-framework/src/main/java/io/openbas/integrations/ExecutorService.java
@@ -66,4 +66,8 @@ public Executor register(String id, String type, String name, InputStream iconDa
     public void remove(String id) {
         executorRepository.findById(id).ifPresent(executor -> executorRepository.deleteById(id));
     }
+    @Transactional
+    public void removeFromType(String type) {
+        executorRepository.findByType(type).ifPresent(executor -> executorRepository.deleteById(executor.getId()));
+    }
 }