[backend] Fix inject resolution before execution (#2545)

OpenBAS-Platform · Feb 26, 2025 · 5ac9a0f · 5ac9a0f
1 parent dd64bc8
commit 5ac9a0f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/openbas-api/src/main/java/io/openbas/execution/ExecutableInject.java b/openbas-api/src/main/java/io/openbas/execution/ExecutableInject.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
+import org.hibernate.Hibernate;
 import org.springframework.web.multipart.MultipartFile;
 
 @Getter
@@ -39,8 +40,11 @@ public ExecutableInject(
     this.direct = direct;
     this.users = users;
     this.teams = teams;
+    this.teams.forEach(team -> Hibernate.initialize(team.getTags()));
     this.assets = assets;
+    this.assets.forEach(asset -> Hibernate.initialize(asset.getTags()));
     this.assetGroups = assetGroups;
+    this.assetGroups.forEach(assetGroup -> Hibernate.initialize(assetGroup.getTags()));
     this.teamSize = teams.size();
     this.documentSize = injection.getInject().getDocuments().size();
   }

diff --git a/openbas-api/src/main/java/io/openbas/helper/InjectHelper.java b/openbas-api/src/main/java/io/openbas/helper/InjectHelper.java
@@ -105,14 +105,15 @@ public List<ExecutableInject> getInjectsToRun() {
             .sorted(Inject.executionComparator)
             .map(
                 inject -> {
+                  // TODO This is inefficient, we need to refactor this loop with our own query
                   Hibernate.initialize(inject.getTags());
                   Hibernate.initialize(inject.getUser());
                   return new ExecutableInject(
                       true,
                       false,
                       inject,
                       getInjectTeams(inject),
-                      inject.getAssets(),
+                      inject.getAssets(), // TODO There is also inefficient lazy loading inside this get function
                       inject.getAssetGroups(),
                       usersFromInjection(inject));
                 });