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

Author: Dimfacion

openaev-api/src/test/java/io/openaev/importer/V1_DataImporterTest.java

@@ -9,7 +9,6 @@
 import io.openaev.context.TenantContext;
 import io.openaev.database.model.*;
 import io.openaev.database.repository.*;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.openaev.OpenaevInjectorIntegrationFactory;
 import io.openaev.rest.domain.enums.PresetDomain;
 import io.openaev.utils.constants.Constants;
@@ -111,7 +110,7 @@ void testImportData() {
   @Test
   @Transactional
   void testScenario_with_attackpattern() throws Exception {
-    new Manager(List.of(openaevInjectorIntegrationFactory)).monitorIntegrations();
+    openaevInjectorIntegrationFactory.registerConnectorForTenant();
     MockitoAnnotations.openMocks(this);
     ObjectMapper mapper = new ObjectMapper();
     String jsonContent =
@@ -146,7 +145,7 @@ void testScenario_with_attackpattern() throws Exception {
     payloadRepository.deleteAll();
     entityManager.flush();
     entityManager.clear();
-    new Manager(List.of(openaevInjectorIntegrationFactory)).monitorIntegrations();
+    openaevInjectorIntegrationFactory.registerConnectorForTenant();
 
     this.importer.importData(
         this.importNode, Map.of(), null, null, null, null, Constants.IMPORTED_OBJECT_NAME_SUFFIX);

openaev-api/src/test/java/io/openaev/injector_contract/InjectorContratApiTest.java

@@ -10,7 +10,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import io.openaev.IntegrationTest;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.challenge.ChallengeInjectorIntegrationFactory;
 import io.openaev.integration.impl.injectors.channel.ChannelInjectorIntegrationFactory;
 import io.openaev.integration.impl.injectors.email.EmailInjectorIntegrationFactory;
@@ -38,13 +37,10 @@ class InjectorContratApiTest extends IntegrationTest {
 
   @BeforeEach
   public void before() throws Exception {
-    new Manager(
-            List.of(
-                emailInjectorIntegrationFactory,
-                challengeInjectorIntegrationFactory,
-                channelInjectorIntegrationFactory,
-                manualInjectorIntegrationFactory))
-        .monitorIntegrations();
+    emailInjectorIntegrationFactory.registerConnectorForTenant();
+    challengeInjectorIntegrationFactory.registerConnectorForTenant();
+    channelInjectorIntegrationFactory.registerConnectorForTenant();
+    manualInjectorIntegrationFactory.registerConnectorForTenant();
   }
 
   @Nested

openaev-api/src/test/java/io/openaev/injects/email/EmailExecutorTest.java

@@ -14,8 +14,10 @@
 import io.openaev.execution.ExecutableInject;
 import io.openaev.execution.ExecutionContext;
 import io.openaev.execution.ExecutionContextService;
+import io.openaev.executors.InjectorContext;
+import io.openaev.injectors.email.EmailExecutor;
 import io.openaev.injectors.email.model.EmailContent;
-import io.openaev.integration.Manager;
+import io.openaev.injectors.email.service.EmailService;
 import io.openaev.integration.impl.injectors.email.EmailInjectorIntegrationFactory;
 import io.openaev.model.inject.form.Expectation;
 import io.openaev.utils.fixtures.*;
@@ -41,6 +43,9 @@ public class EmailExecutorTest extends IntegrationTest {
   @Autowired private UserRepository userRepository;
   @Autowired private InjectExpectationRepository injectExpectationRepository;
   @Autowired private ExecutionContextService executionContextService;
+  @Autowired private InjectorContext injectorContext;
+  @Autowired private EmailService emailService;
+  @Autowired private io.openaev.service.InjectExpectationService injectExpectationService;
   @Resource protected ObjectMapper mapper;
   @Autowired private InjectorContractFixture injectorContractFixture;
   @Autowired private EmailInjectorIntegrationFactory emailInjectorIntegrationFactory;
@@ -104,9 +109,9 @@ void process() throws Exception {
     Execution execution = new Execution(executableInject.isRuntime());
 
     // -- EXECUTE --
-    Manager manager = new Manager(List.of(emailInjectorIntegrationFactory));
-    manager.monitorIntegrations();
-    io.openaev.executors.Injector emailExecutor = manager.requestEmailInjector();
+    emailInjectorIntegrationFactory.registerConnectorForTenant();
+    io.openaev.executors.Injector emailExecutor =
+        new EmailExecutor(injectorContext, emailService, injectExpectationService);
     emailExecutor.process(execution, executableInject);
 
     // -- ASSERT --
@@ -150,9 +155,9 @@ void givenExpectation_shouldComputeInjectExpectationAndInjectExpectationResult()
     Execution execution = new Execution(executableInject.isRuntime());
 
     // -- EXECUTE --
-    Manager manager = new Manager(List.of(emailInjectorIntegrationFactory));
-    manager.monitorIntegrations();
-    io.openaev.executors.Injector emailExecutor = manager.requestEmailInjector();
+    emailInjectorIntegrationFactory.registerConnectorForTenant();
+    io.openaev.executors.Injector emailExecutor =
+        new EmailExecutor(injectorContext, emailService, injectExpectationService);
     emailExecutor.process(execution, executableInject);
 
     // -- ASSERT --

openaev-api/src/test/java/io/openaev/injects/technical_inject/OpenAEVImplantExecutorTest.java

@@ -12,9 +12,9 @@
 import io.openaev.database.model.*;
 import io.openaev.database.repository.InjectExpectationRepository;
 import io.openaev.execution.ExecutableInject;
-import io.openaev.injectors.openaev.OpenAEVImplantContract;
+import io.openaev.executors.InjectorContext;
+import io.openaev.injectors.openaev.OpenAEVImplantExecutor;
 import io.openaev.injectors.openaev.model.OpenAEVImplantInjectContent;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.openaev.OpenaevInjectorIntegrationFactory;
 import io.openaev.model.inject.form.Expectation;
 import io.openaev.utils.fixtures.*;
@@ -40,6 +40,10 @@
 public class OpenAEVImplantExecutorTest extends IntegrationTest {
   @Autowired private OpenaevInjectorIntegrationFactory openaevInjectorIntegrationFactory;
   @Autowired private InjectExpectationRepository injectExpectationRepository;
+  @Autowired private InjectorContext injectorContext;
+  @Autowired private io.openaev.service.AssetGroupService assetGroupService;
+  @Autowired private io.openaev.service.InjectExpectationService injectExpectationService;
+  @Autowired private io.openaev.rest.inject.service.InjectService injectService;
 
   @Autowired private InjectComposer injectComposer;
   @Autowired private AssetGroupComposer assetGroupComposer;
@@ -124,10 +128,9 @@ void givenExpectation_shouldComputeInjectExpectationAndInjectExpectationResult(
     expectation.setExpectationGroup(false);
 
     openaevInjectorIntegrationFactory.registerConnectorForTenant();
-    Manager manager = new Manager(List.of(openaevInjectorIntegrationFactory));
-    manager.monitorIntegrations();
     io.openaev.executors.Injector openAEVImplantExecutor =
-        manager.requestInjectorExecutorByType(OpenAEVImplantContract.TYPE);
+        new OpenAEVImplantExecutor(
+            injectorContext, assetGroupService, injectExpectationService, injectService);
 
     Inject inject = createTechnicalInjectHelper(List.of(expectation));
     Injection injection = mock(Injection.class);

openaev-api/src/test/java/io/openaev/rest/ChallengeApiTest.java

@@ -20,7 +20,6 @@
 import io.openaev.database.repository.ChallengeRepository;
 import io.openaev.database.repository.InjectRepository;
 import io.openaev.database.repository.InjectorContractRepository;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.challenge.ChallengeInjectorIntegrationFactory;
 import io.openaev.service.scenario.ScenarioService;
 import io.openaev.utils.mockUser.WithMockUser;
@@ -48,7 +47,7 @@ class ChallengeApiTest extends IntegrationTest {
 
   @BeforeEach
   public void before() throws Exception {
-    new Manager(List.of(challengeInjectorIntegrationFactory)).monitorIntegrations();
+    challengeInjectorIntegrationFactory.registerConnectorForTenant();
   }
 
   // -- SCENARIOS --

openaev-api/src/test/java/io/openaev/rest/ExerciseLessonsApiTest.java

@@ -20,7 +20,6 @@
 import io.openaev.database.repository.LessonsCategoryRepository;
 import io.openaev.database.repository.TeamRepository;
 import io.openaev.database.repository.UserRepository;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.email.EmailInjectorIntegrationFactory;
 import io.openaev.rest.exercise.service.ExerciseService;
 import io.openaev.rest.lessons.form.LessonsSendInput;
@@ -61,7 +60,7 @@ public class ExerciseLessonsApiTest extends IntegrationTest {
 
   @BeforeAll
   void beforeAll() throws Exception {
-    new Manager(List.of(emailInjectorIntegrationFactory)).monitorIntegrations();
+    emailInjectorIntegrationFactory.registerConnectorForTenant();
     LESSONCATEGORY = getLessonCategory();
   }
 

openaev-api/src/test/java/io/openaev/rest/ExpectationApiTest.java

@@ -30,7 +30,6 @@
 import io.openaev.injectors.challenge.ChallengeContract;
 import io.openaev.injectors.email.EmailContract;
 import io.openaev.injectors.openaev.OpenAEVImplantContract;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.challenge.ChallengeInjectorIntegrationFactory;
 import io.openaev.integration.impl.injectors.email.EmailInjectorIntegrationFactory;
 import io.openaev.integration.impl.injectors.openaev.OpenaevInjectorIntegrationFactory;
@@ -850,12 +849,9 @@ class AvailableInjectExpectationsForInjects {
     @Test
     @DisplayName("Get available InjectExpectations for injects")
     void getAvailableInjectExpectationsForInjects() throws Exception {
-      new Manager(
-              List.of(
-                  emailInjectorIntegrationFactory,
-                  challengeInjectorIntegrationFactory,
-                  openaevInjectorIntegrationFactory))
-          .monitorIntegrations();
+      emailInjectorIntegrationFactory.registerConnectorForTenant();
+      challengeInjectorIntegrationFactory.registerConnectorForTenant();
+      openaevInjectorIntegrationFactory.registerConnectorForTenant();
       em.flush();
       em.clear();
       List<InjectorContract> injectorContracts =

openaev-api/src/test/java/io/openaev/rest/exercise/ExerciseApiExportTest.java

@@ -13,7 +13,6 @@
 import io.openaev.database.model.*;
 import io.openaev.database.model.Tag;
 import io.openaev.export.Mixins;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.challenge.ChallengeInjectorIntegrationFactory;
 import io.openaev.integration.impl.injectors.channel.ChannelInjectorIntegrationFactory;
 import io.openaev.rest.exercise.exports.ExerciseFileExport;
@@ -84,8 +83,8 @@ void before() throws Exception {
     tagComposer.reset();
     exerciseComposer.reset();
     payloadComposer.reset();
-    new Manager(List.of(channelInjectorIntegrationFactory, challengeInjectorIntegrationFactory))
-        .monitorIntegrations();
+    channelInjectorIntegrationFactory.registerConnectorForTenant();
+    challengeInjectorIntegrationFactory.registerConnectorForTenant();
 
     // delete the test files from the minio service
     for (String fileName : WELL_KNOWN_FILES.keySet()) {

openaev-api/src/test/java/io/openaev/rest/exercise/imports/ExerciseApiImportWithExistingItemsTest.java

@@ -11,7 +11,6 @@
 import io.openaev.database.model.*;
 import io.openaev.database.model.Tag;
 import io.openaev.database.repository.*;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.challenge.ChallengeInjectorIntegrationFactory;
 import io.openaev.integration.impl.injectors.channel.ChannelInjectorIntegrationFactory;
 import io.openaev.rest.exercise.exports.ExportOptions;
@@ -77,8 +76,8 @@ public class ExerciseApiImportWithExistingItemsTest extends IntegrationTest {
 
   @BeforeEach
   void before() throws Exception {
-    new Manager(List.of(channelInjectorIntegrationFactory, challengeInjectorIntegrationFactory))
-        .monitorIntegrations();
+    channelInjectorIntegrationFactory.registerConnectorForTenant();
+    challengeInjectorIntegrationFactory.registerConnectorForTenant();
 
     lessonsQuestionsComposer.reset();
     lessonsCategoryComposer.reset();

openaev-api/src/test/java/io/openaev/rest/exercise/imports/ExerciseApiImportWithoutExistingItemsTest.java

@@ -11,7 +11,6 @@
 import io.openaev.database.model.*;
 import io.openaev.database.model.Tag;
 import io.openaev.database.repository.*;
-import io.openaev.integration.Manager;
 import io.openaev.integration.impl.injectors.challenge.ChallengeInjectorIntegrationFactory;
 import io.openaev.rest.exercise.exports.ExportOptions;
 import io.openaev.rest.exercise.service.ExportService;
@@ -88,7 +87,7 @@ void before() throws Exception {
     documentComposer.reset();
     tagComposer.reset();
     exerciseComposer.reset();
-    new Manager(List.of(challengeInjectorIntegrationFactory)).monitorIntegrations();
+    challengeInjectorIntegrationFactory.registerConnectorForTenant();
   }
 
   // this is part of the "Arrange" part of the AAA pattern for the following tests