[backend] feat(multitenancy): adding builtin connectors for new tenants (#3505)

Author: Dimfacion

openaev-api/src/main/java/io/openaev/collectors/expectations_expiration_manager/ExpectationsExpirationManagerJob.java

@@ -4,6 +4,7 @@
 import io.openaev.collectors.expectations_expiration_manager.service.ExpectationsExpirationManagerService;
 import io.openaev.integration.BuiltinTenantRegistrable;
 import io.openaev.rest.collector.service.CollectorService;
+import io.openaev.rest.exception.ElementNotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,14 +42,18 @@ public ExpectationsExpirationManagerJob(
 
   @Override
   public void registerForTenant() throws Exception {
-    collectorService.register(
-        config.getId(),
-        FAKE_DETECTOR_COLLECTOR_TYPE,
-        FAKE_DETECTOR_COLLECTOR_NAME,
-        false,
-        0,
-        null,
-        getClass().getResourceAsStream("/img/icon-fake-detector.png"));
+    try {
+      collectorService.collector(config.getId());
+    } catch (ElementNotFoundException e) {
+      collectorService.register(
+          config.getId(),
+          FAKE_DETECTOR_COLLECTOR_TYPE,
+          FAKE_DETECTOR_COLLECTOR_NAME,
+          false,
+          0,
+          null,
+          getClass().getResourceAsStream("/img/icon-fake-detector.png"));
+    }
   }
 
   @Override

openaev-api/src/main/java/io/openaev/collectors/expectations_vulnerability_manager/ExpectationsVulnerabilityManagerCollector.java

@@ -2,7 +2,7 @@
 
 import io.openaev.integration.BuiltinTenantRegistrable;
 import io.openaev.rest.collector.service.CollectorService;
-import jakarta.annotation.PostConstruct;
+import io.openaev.rest.exception.ElementNotFoundException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -20,24 +20,19 @@ public class ExpectationsVulnerabilityManagerCollector implements BuiltinTenantR
   public static final String EXPECTATIONS_VULNERABILITY_COLLECTOR_NAME =
       "Expectations Vulnerability Manager";
 
-  @PostConstruct
-  public void init() {
-    try {
-      registerForTenant();
-    } catch (Exception e) {
-      log.error("Error creating expectations vulnerability manager ", e);
-    }
-  }
-
   @Override
   public void registerForTenant() throws Exception {
-    collectorService.register(
-        EXPECTATIONS_VULNERABILITY_COLLECTOR_ID,
-        EXPECTATIONS_VULNERABILITY_COLLECTOR_TYPE,
-        EXPECTATIONS_VULNERABILITY_COLLECTOR_NAME,
-        false,
-        0,
-        null,
-        getClass().getResourceAsStream("/img/icon-expectations-vulnerability-manager.png"));
+    try {
+      collectorService.collector(EXPECTATIONS_VULNERABILITY_COLLECTOR_ID);
+    } catch (ElementNotFoundException e) {
+      collectorService.register(
+          EXPECTATIONS_VULNERABILITY_COLLECTOR_ID,
+          EXPECTATIONS_VULNERABILITY_COLLECTOR_TYPE,
+          EXPECTATIONS_VULNERABILITY_COLLECTOR_NAME,
+          false,
+          0,
+          null,
+          getClass().getResourceAsStream("/img/icon-expectations-vulnerability-manager.png"));
+    }
   }
 }

openaev-api/src/main/java/io/openaev/integration/ManagerFactory.java

@@ -22,6 +22,7 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.Session;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -104,6 +105,12 @@ public void createDependencyForTenant(Tenant tenant) throws DependenciesManagerE
     String previousTenant = TenantContext.getCurrentTenant();
     try {
       TenantContext.setCurrentTenant(tenant.getId());
+      // Re-enable the Hibernate filter with the correct tenant — the AOP aspect already activated
+      // it with the previous tenant value before this method body runs.
+      entityManager
+          .unwrap(Session.class)
+          .enableFilter("tenantFilter")
+          .setParameter("tenantId", tenant.getId());
       for (BuiltinTenantRegistrable registrable : builtinRegistrables) {
         try {
           registrable.registerForTenant();

openaev-api/src/main/java/io/openaev/integration/impl/executors/openaev/OpenAEVExecutorIntegrationFactory.java

@@ -9,6 +9,7 @@
 import io.openaev.integration.BuiltinIntegrationFactory;
 import io.openaev.integration.ComponentRequestEngine;
 import io.openaev.integration.Integration;
+import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.service.catalog_connectors.CatalogConnectorService;
 import io.openaev.service.connector_instances.ConnectorInstanceService;
 import java.util.List;
@@ -67,18 +68,22 @@ public Integration spawn(ConnectorInstance instance) {
 
   @Override
   public void registerConnectorForTenant() throws Exception {
-    executorService.register(
-        OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_ID,
-        OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_TYPE,
-        OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_NAME,
-        OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_DOCUMENTATION_LINK,
-        OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_BACKGROUND_COLOR,
-        getClass().getResourceAsStream("/img/icon-openaev.png"),
-        getClass().getResourceAsStream("/img/banner-openaev.png"),
-        new String[] {
-          Endpoint.PLATFORM_TYPE.Windows.name(),
-          Endpoint.PLATFORM_TYPE.Linux.name(),
-          Endpoint.PLATFORM_TYPE.MacOS.name()
-        });
+    try {
+      executorService.executor(OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_ID);
+    } catch (ElementNotFoundException e) {
+      executorService.register(
+          OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_ID,
+          OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_TYPE,
+          OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_NAME,
+          OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_DOCUMENTATION_LINK,
+          OpenAEVExecutorIntegration.OPENAEV_EXECUTOR_BACKGROUND_COLOR,
+          getClass().getResourceAsStream("/img/icon-openaev.png"),
+          getClass().getResourceAsStream("/img/banner-openaev.png"),
+          new String[] {
+            Endpoint.PLATFORM_TYPE.Windows.name(),
+            Endpoint.PLATFORM_TYPE.Linux.name(),
+            Endpoint.PLATFORM_TYPE.MacOS.name()
+          });
+    }
   }
 }

openaev-api/src/main/java/io/openaev/integration/impl/injectors/challenge/ChallengeInjectorIntegration.java

@@ -3,7 +3,6 @@
 import io.openaev.database.model.ConnectorInstance;
 import io.openaev.database.repository.ChallengeRepository;
 import io.openaev.executors.InjectorContext;
-import io.openaev.healthcheck.enums.ExternalServiceDependency;
 import io.openaev.injectors.challenge.ChallengeContract;
 import io.openaev.injectors.challenge.ChallengeExecutor;
 import io.openaev.injectors.email.service.EmailService;
@@ -13,7 +12,6 @@
 import io.openaev.service.InjectExpectationService;
 import io.openaev.service.InjectorService;
 import io.openaev.service.connector_instances.ConnectorInstanceService;
-import java.util.List;
 
 public class ChallengeInjectorIntegration extends IntegrationInMemory {
   static final String CHALLENGE_INJECTOR_NAME = "Challenges";
@@ -51,16 +49,6 @@ public ChallengeInjectorIntegration(
 
   @Override
   protected void innerStart() throws Exception {
-    injectorService.registerBuiltinInjector(
-        CHALLENGE_INJECTOR_ID,
-        CHALLENGE_INJECTOR_NAME,
-        challengeContract,
-        false,
-        "capture-the-flag",
-        null,
-        null,
-        false,
-        List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.IMAP));
     this.challengeExecutor =
         new ChallengeExecutor(
             injectorContext, challengeRepository, emailService, injectExpectationService);

openaev-api/src/main/java/io/openaev/integration/impl/injectors/challenge/ChallengeInjectorIntegrationFactory.java

@@ -12,6 +12,7 @@
 import io.openaev.integration.BuiltinIntegrationFactory;
 import io.openaev.integration.ComponentRequestEngine;
 import io.openaev.integration.Integration;
+import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.service.InjectExpectationService;
 import io.openaev.service.InjectorService;
 import io.openaev.service.catalog_connectors.CatalogConnectorService;
@@ -101,15 +102,19 @@ public Integration spawn(ConnectorInstance instance)
 
   @Override
   public void registerConnectorForTenant() throws Exception {
-    injectorService.registerBuiltinInjector(
-        ChallengeInjectorIntegration.CHALLENGE_INJECTOR_ID,
-        ChallengeInjectorIntegration.CHALLENGE_INJECTOR_NAME,
-        challengeContract,
-        false,
-        "capture-the-flag",
-        null,
-        null,
-        false,
-        List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.IMAP));
+    try {
+      injectorService.injector(ChallengeInjectorIntegration.CHALLENGE_INJECTOR_ID);
+    } catch (ElementNotFoundException e) {
+      injectorService.registerBuiltinInjector(
+          ChallengeInjectorIntegration.CHALLENGE_INJECTOR_ID,
+          ChallengeInjectorIntegration.CHALLENGE_INJECTOR_NAME,
+          challengeContract,
+          false,
+          "capture-the-flag",
+          null,
+          null,
+          false,
+          List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.IMAP));
+    }
   }
 }

openaev-api/src/main/java/io/openaev/integration/impl/injectors/channel/ChannelInjectorIntegrationFactory.java

@@ -12,6 +12,7 @@
 import io.openaev.integration.BuiltinIntegrationFactory;
 import io.openaev.integration.ComponentRequestEngine;
 import io.openaev.integration.Integration;
+import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.service.InjectExpectationService;
 import io.openaev.service.InjectorService;
 import io.openaev.service.catalog_connectors.CatalogConnectorService;
@@ -99,15 +100,19 @@ public Integration spawn(ConnectorInstance instance)
 
   @Override
   public void registerConnectorForTenant() throws Exception {
-    injectorService.registerBuiltinInjector(
-        ChannelInjectorIntegration.CHANNEL_INJECTOR_ID,
-        ChannelInjectorIntegration.CHANNEL_INJECTOR_NAME,
-        channelContract,
-        false,
-        "media-pressure",
-        null,
-        null,
-        false,
-        List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.SMTP));
+    try {
+      injectorService.injector(ChannelInjectorIntegration.CHANNEL_INJECTOR_ID);
+    } catch (ElementNotFoundException e) {
+      injectorService.registerBuiltinInjector(
+          ChannelInjectorIntegration.CHANNEL_INJECTOR_ID,
+          ChannelInjectorIntegration.CHANNEL_INJECTOR_NAME,
+          channelContract,
+          false,
+          "media-pressure",
+          null,
+          null,
+          false,
+          List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.SMTP));
+    }
   }
 }

openaev-api/src/main/java/io/openaev/integration/impl/injectors/email/EmailInjectorIntegrationFactory.java

@@ -11,6 +11,7 @@
 import io.openaev.integration.BuiltinIntegrationFactory;
 import io.openaev.integration.ComponentRequestEngine;
 import io.openaev.integration.Integration;
+import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.service.InjectExpectationService;
 import io.openaev.service.InjectorService;
 import io.openaev.service.catalog_connectors.CatalogConnectorService;
@@ -95,15 +96,19 @@ public Integration spawn(ConnectorInstance instance)
 
   @Override
   public void registerConnectorForTenant() throws Exception {
-    injectorService.registerBuiltinInjector(
-        EmailInjectorIntegration.EMAIL_INJECTOR_ID,
-        EmailInjectorIntegration.EMAIL_INJECTOR_NAME,
-        emailContract,
-        false,
-        "communication",
-        null,
-        null,
-        false,
-        List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.IMAP));
+    try {
+      injectorService.injector(EmailInjectorIntegration.EMAIL_INJECTOR_ID);
+    } catch (ElementNotFoundException e) {
+      injectorService.registerBuiltinInjector(
+          EmailInjectorIntegration.EMAIL_INJECTOR_ID,
+          EmailInjectorIntegration.EMAIL_INJECTOR_NAME,
+          emailContract,
+          false,
+          "communication",
+          null,
+          null,
+          false,
+          List.of(ExternalServiceDependency.SMTP, ExternalServiceDependency.IMAP));
+    }
   }
 }

openaev-api/src/main/java/io/openaev/integration/impl/injectors/manual/ManualInjectorIntegrationFactory.java

@@ -9,6 +9,7 @@
 import io.openaev.integration.BuiltinIntegrationFactory;
 import io.openaev.integration.ComponentRequestEngine;
 import io.openaev.integration.Integration;
+import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.service.InjectExpectationService;
 import io.openaev.service.InjectorService;
 import io.openaev.service.catalog_connectors.CatalogConnectorService;
@@ -90,15 +91,19 @@ public Integration spawn(ConnectorInstance instance)
 
   @Override
   public void registerConnectorForTenant() throws Exception {
-    injectorService.registerBuiltinInjector(
-        ManualInjectorIntegration.MANUAL_INJECTOR_ID,
-        ManualInjectorIntegration.MANUAL_INJECTOR_NAME,
-        manualContract,
-        true,
-        "generic",
-        null,
-        null,
-        false,
-        List.of());
+    try {
+      injectorService.injector(ManualInjectorIntegration.MANUAL_INJECTOR_ID);
+    } catch (ElementNotFoundException e) {
+      injectorService.registerBuiltinInjector(
+          ManualInjectorIntegration.MANUAL_INJECTOR_ID,
+          ManualInjectorIntegration.MANUAL_INJECTOR_NAME,
+          manualContract,
+          true,
+          "generic",
+          null,
+          null,
+          false,
+          List.of());
+    }
   }
 }

openaev-api/src/main/java/io/openaev/integration/impl/injectors/openaev/OpenaevInjectorIntegrationFactory.java

@@ -10,6 +10,7 @@
 import io.openaev.integration.BuiltinIntegrationFactory;
 import io.openaev.integration.ComponentRequestEngine;
 import io.openaev.integration.Integration;
+import io.openaev.rest.exception.ElementNotFoundException;
 import io.openaev.rest.inject.service.InjectService;
 import io.openaev.service.AssetGroupService;
 import io.openaev.service.InjectExpectationService;
@@ -104,20 +105,24 @@ public Integration spawn(ConnectorInstance instance)
 
   @Override
   public void registerConnectorForTenant() throws Exception {
-    Map<String, String> executorCommands =
-        OpenaevImplantCommandBuilder.buildExecutorCommands(openAEVConfig);
-    Map<String, String> executorClearCommands =
-        OpenaevImplantCommandBuilder.buildExecutorClearCommands();
+    try {
+      injectorService.injector(OpenaevInjectorIntegration.OPENAEV_INJECTOR_ID);
+    } catch (ElementNotFoundException e) {
+      Map<String, String> executorCommands =
+          OpenaevImplantCommandBuilder.buildExecutorCommands(openAEVConfig);
+      Map<String, String> executorClearCommands =
+          OpenaevImplantCommandBuilder.buildExecutorClearCommands();
 
-    injectorService.registerBuiltinInjector(
-        OpenaevInjectorIntegration.OPENAEV_INJECTOR_ID,
-        OpenaevInjectorIntegration.OPENAEV_INJECTOR_NAME,
-        openAEVImplantContract,
-        false,
-        "simulation-implant",
-        executorCommands,
-        executorClearCommands,
-        true,
-        List.of());
+      injectorService.registerBuiltinInjector(
+          OpenaevInjectorIntegration.OPENAEV_INJECTOR_ID,
+          OpenaevInjectorIntegration.OPENAEV_INJECTOR_NAME,
+          openAEVImplantContract,
+          false,
+          "simulation-implant",
+          executorCommands,
+          executorClearCommands,
+          true,
+          List.of());
+    }
   }
 }