contentctl 3.6.0__py3-none-any.whl → 4.0.2__py3-none-any.whl

contentctl/actions/test.py

@@ -1,14 +1,12 @@
 from dataclasses import dataclass
+from typing import List
 
-from contentctl.objects.test_config import TestConfig
-from contentctl.objects.enums import DetectionTestingMode
+from contentctl.objects.config import test_common
+from contentctl.objects.enums import DetectionTestingMode, DetectionStatus, AnalyticsType
+from contentctl.objects.detection import Detection
 
 from contentctl.input.director import DirectorOutputDto
 
-from contentctl.actions.detection_testing.GitService import (
-    GitService,
-)
-
 from contentctl.actions.detection_testing.DetectionTestingManager import (
     DetectionTestingManager,
     DetectionTestingManagerInputDto,
@@ -32,24 +30,45 @@ from contentctl.actions.detection_testing.views.DetectionTestingViewFile import
     DetectionTestingViewFile,
 )
 
-from argparse import Namespace
-from os.path import relpath
+from contentctl.objects.integration_test import IntegrationTest
+
+import pathlib
 
 MAXIMUM_CONFIGURATION_TIME_SECONDS = 600
 
 
 @dataclass(frozen=True)
 class TestInputDto:
-    test_director_output_dto: DirectorOutputDto
-    gitService: GitService
-    config: TestConfig
+    detections: List[Detection]
+    config: test_common
     
 
-class TestOutputDto:
-    results: list
-
-
 class Test:
+
+    def filter_detections(self, input_dto: TestInputDto)->TestInputDto:
+        
+        if not input_dto.config.enable_integration_testing:
+            #Skip all integraiton tests if integration testing is not enabled:
+            for detection in input_dto.detections:
+                for test in detection.tests:
+                    if isinstance(test, IntegrationTest):
+                        test.skip("TEST SKIPPED: Skipping all integration tests")
+        
+        list_after_filtering:List[Detection] = []
+        #extra filtering which may be removed/modified in the future
+        for detection in input_dto.detections:
+            if (detection.status != DetectionStatus.production.value):
+                #print(f"{detection.name} - Not testing because [STATUS: {detection.status}]")
+                pass
+            elif detection.type == AnalyticsType.Correlation:
+                #print(f"{detection.name} - Not testing because [  TYPE: {detection.type}]")
+                pass
+            else:
+                list_after_filtering.append(detection)
+        
+        return TestInputDto(list_after_filtering, input_dto.config)
+        
+        
     def execute(self, input_dto: TestInputDto) -> bool:
 
         
@@ -62,19 +81,19 @@ class Test:
 
         manager_input_dto = DetectionTestingManagerInputDto(
             config=input_dto.config,
-            testContent=input_dto.test_director_output_dto,
+            detections=input_dto.detections,
             views=[web, cli, file],
         )
         manager = DetectionTestingManager(
             input_dto=manager_input_dto, output_dto=output_dto
         )
         
-        if len(input_dto.test_director_output_dto.detections) == 0:
-            print(f"With Detection Testing Mode '{input_dto.config.mode.value}', there were detections [{len(input_dto.test_director_output_dto.detections)}] found to test.\nAs such, we will quit immediately.")
+        if len(input_dto.detections) == 0:
+            print(f"With Detection Testing Mode '{input_dto.config.getModeName()}', there were [0] detections found to test.\nAs such, we will quit immediately.")
         else:
-            print(f"MODE: [{input_dto.config.mode.value}] - Test [{len(input_dto.test_director_output_dto.detections)}] detections")
+            print(f"MODE: [{input_dto.config.getModeName()}] - Test [{len(input_dto.detections)}] detections")
             if input_dto.config.mode in [DetectionTestingMode.changes, DetectionTestingMode.selected]:
-                files_string = '\n- '.join([relpath(detection.file_path) for detection in input_dto.test_director_output_dto.detections])
+                files_string = '\n- '.join([str(pathlib.Path(detection.file_path).relative_to(input_dto.config.path)) for detection in input_dto.detections])
                 print(f"Detections:\n- {files_string}")
 
             manager.setup()

contentctl/actions/validate.py

@@ -6,42 +6,32 @@ from pydantic import ValidationError
 from typing import Union
 
 from contentctl.objects.enums import SecurityContentProduct
+from contentctl.objects.abstract_security_content_objects.security_content_object_abstract import SecurityContentObject_Abstract
 from contentctl.input.director import (
     Director,
-    DirectorInputDto,
-    DirectorOutputDto,
+    DirectorOutputDto
 )
 
-
-@dataclass(frozen=True)
-class ValidateInputDto:
-    director_input_dto: DirectorInputDto
-
+from contentctl.objects.config import validate
+from contentctl.enrichments.attack_enrichment import AttackEnrichment
+from contentctl.enrichments.cve_enrichment import CveEnrichment
+from contentctl.objects.atomic import AtomicTest
 
 class Validate:
-    def execute(self, input_dto: ValidateInputDto) -> None:
-        director_output_dto = DirectorOutputDto([], [], [], [], [], [], [], [], [])
+    def execute(self, input_dto: validate) -> DirectorOutputDto:
+        
+        director_output_dto = DirectorOutputDto(AtomicTest.getAtomicTestsFromArtRepo(repo_path=input_dto.getAtomicRedTeamRepoPath(), 
+                                                                                     enabled=input_dto.enrichments),
+                                                AttackEnrichment.getAttackEnrichment(input_dto),
+                                                [],[],[],[],[],[],[],[],[])
+
+        
         director = Director(director_output_dto)
-        director.execute(input_dto.director_input_dto)
-
-        # uuid validation all objects
-        try:
-            security_content_objects = (
-                director_output_dto.detections
-                + director_output_dto.stories
-                + director_output_dto.baselines
-                + director_output_dto.investigations
-                + director_output_dto.playbooks
-            )
-            self.validate_duplicate_uuids(security_content_objects)
-
-        except ValueError as e:
-            print(e)
-            sys.exit(1)
+        director.execute(input_dto)
 
-        return None
+        return director_output_dto
 
-    def validate_duplicate_uuids(self, security_content_objects):
+    def validate_duplicate_uuids(self, security_content_objects:list[SecurityContentObject_Abstract]):
         all_uuids = set()
         duplicate_uuids = set()
         for elem in security_content_objects:
@@ -54,28 +44,15 @@ class Validate:
 
         if len(duplicate_uuids) == 0:
             return
-
+        
         # At least once duplicate uuid has been found. Enumerate all
         # the pieces of content that use duplicate uuids
-        content_with_duplicate_uuid = [
-            content_object
-            for content_object in security_content_objects
-            if content_object.id in duplicate_uuids
-        ]
-
+        duplicate_messages = []
+        for uuid in duplicate_uuids:
+            duplicate_uuid_content = [str(content.file_path) for content in security_content_objects if content.id in duplicate_uuids]
+            duplicate_messages.append(f"Duplicate UUID [{uuid}] in {duplicate_uuid_content}")
+        
         raise ValueError(
-            "ERROR: Duplicate ID found in objects:\n"
-            + "\n".join([obj.name for obj in content_with_duplicate_uuid])
+            "ERROR: Duplicate ID(s) found in objects:\n"
+            + "\n - ".join(duplicate_messages)
         )
-
-    # def validate_detection_exist_for_test(self, tests: list, detections: list):
-    #     for test in tests:
-    #         found_detection = False
-    #         for detection in detections:
-    #             if test.tests[0].file in detection.file_path:
-    #                 found_detection = True
-
-    #         if not found_detection:
-    #             raise ValueError(
-    #                 "ERROR: detection doesn't exist for test file: " + test.name
-    #             )