[backend] Prevent looping of caldera injector (#874)

OpenBAS-Platform · May 17, 2024 · 6f9f521 · 6f9f521
1 parent 736ec12
commit 6f9f521
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaExecutor.java
@@ -144,7 +144,7 @@ private Endpoint findAndRegisterAssetForExecution(@NotNull final Inject inject,
                         newEndpoint.setIps(assetEndpoint.getIps());
                         newEndpoint.setHostname(assetEndpoint.getHostname());
                         newEndpoint.setPlatform(assetEndpoint.getPlatform());
-                        newEndpoint.setExternalReference(agents.get(i).getPaw());
+                        newEndpoint.setExternalReference(agents.get(j).getPaw());
                         newEndpoint.setExecutor(assetEndpoint.getExecutor());
                         endpointForExecution = this.endpointService.createEndpoint(newEndpoint);
                         break;

diff --git a/...api/src/main/java/io/openbas/injectors/caldera/service/CalderaResultCollectorService.java b/...api/src/main/java/io/openbas/injectors/caldera/service/CalderaResultCollectorService.java
@@ -28,6 +28,7 @@
 @Log
 @Service
 public class CalderaResultCollectorService implements Runnable {
+    private final int EXPIRATION_TIME = 900;
 
     private final InjectRepository injectRepository;
     private final InjectStatusRepository injectStatusRepository;
@@ -54,6 +55,7 @@ public CalderaResultCollectorService(
     }
 
     @Override
+    @Transactional
     public void run() {
         // Retrieve Caldera inject not done
         List<InjectStatus> injectStatuses = this.injectStatusRepository.pendingForInjectType(CalderaContract.TYPE);
@@ -74,7 +76,13 @@ public void run() {
                     ResultStatus resultStatus = this.calderaService.results(linkId);
                     log.log(Level.INFO, "Returning results");
                     if (resultStatus.getPaw() == null) {
-                        injectStatus.getTraces().add(traceInfo("Results are not yet available (still on-going)"));
+                        if (injectStatus.getTrackingSentDate().isBefore(Instant.now().minus(EXPIRATION_TIME / 60, ChronoUnit.MINUTES))) {
+                            injectStatus.getTraces().add(traceError("Cannot get result for " + linkId + ", injection is expired"));
+                            computeInjectStatus(injectStatus, finalExecutionTime, 0, 0);
+                            computeInject(injectStatus);
+                        } else {
+                            injectStatus.getTraces().add(traceInfo("Results are not yet available (still on-going)"));
+                        }
                     } else {
                         Endpoint currentEndpoint = this.endpointService.findByExternalReference(resultStatus.getPaw()).orElseThrow();
                         String currentAssetId = currentEndpoint.getId();