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

contentctl/actions/new_content.py

@@ -1,23 +1,116 @@
 
 
 from dataclasses import dataclass
-
-from contentctl.input.new_content_generator import NewContentGenerator, NewContentGeneratorInputDto, NewContentGeneratorOutputDto
+import questionary
+from typing import Any
+from contentctl.input.new_content_questions import NewContentQuestions
 from contentctl.output.new_content_yml_output import NewContentYmlOutput
+from contentctl.objects.config import new, NewContentType
+import uuid
+from datetime import datetime
+import pathlib
+from contentctl.objects.abstract_security_content_objects.security_content_object_abstract import SecurityContentObject_Abstract
+from contentctl.output.yml_writer import YmlWriter
 
+class NewContent:
 
-@dataclass(frozen=True)
-class NewContentInputDto:
-    new_content_generator_input_dto: NewContentGeneratorInputDto
-    output_path: str
+    def buildDetection(self)->dict[str,Any]:
+        questions = NewContentQuestions.get_questions_detection()
+        answers = questionary.prompt(questions)
+        answers.update(answers)
+        answers['name'] = answers['detection_name']
+        answers['id'] = str(uuid.uuid4())
+        answers['version'] = 1
+        answers['date'] = datetime.today().strftime('%Y-%m-%d')
+        answers['author'] = answers['detection_author']
+        answers['data_source'] = answers['data_source']
+        answers['type'] = answers['detection_type']
+        answers['status'] = "production" #start everything as production since that's what we INTEND the content to become   
+        answers['description'] = 'UPDATE_DESCRIPTION'   
+        file_name = answers['name'].replace(' ', '_').replace('-','_').replace('.','_').replace('/','_').lower()
+        answers['search'] = answers['detection_search'] + ' | `' + file_name + '_filter`'
+        answers['how_to_implement'] = 'UPDATE_HOW_TO_IMPLEMENT'
+        answers['known_false_positives'] = 'UPDATE_KNOWN_FALSE_POSITIVES'            
+        answers['references'] = ['REFERENCE']
+        answers['tags'] = dict()
+        answers['tags']['analytic_story'] = ['UPDATE_STORY_NAME']
+        answers['tags']['asset_type'] = 'UPDATE asset_type'
+        answers['tags']['confidence'] = 'UPDATE value between 1-100'
+        answers['tags']['impact'] = 'UPDATE value between 1-100'
+        answers['tags']['message'] = 'UPDATE message'
+        answers['tags']['mitre_attack_id'] = [x.strip() for x in answers['mitre_attack_ids'].split(',')]
+        answers['tags']['observable'] = [{'name': 'UPDATE', 'type': 'UPDATE', 'role': ['UPDATE']}]
+        answers['tags']['product'] = ['Splunk Enterprise','Splunk Enterprise Security','Splunk Cloud']
+        answers['tags']['required_fields'] = ['UPDATE']
+        answers['tags']['risk_score'] = 'UPDATE (impact * confidence)/100'
+        answers['tags']['security_domain'] = answers['security_domain']
+        answers['tags']['cve'] = ['UPDATE WITH CVE(S) IF APPLICABLE']
+        
+        #generate the tests section
+        answers['tests'] = [
+            {
+                'name': "True Positive Test",
+                'attack_data': [ 
+                    {
+                    'data': "Enter URL for Dataset Here.  This may also be a relative or absolute path on your local system for testing.",
+                    "sourcetype": "UPDATE SOURCETYPE",
+                    "source": "UPDATE SOURCE"
+                    }
+                ]
+            }
+        ]
+        return answers
 
+    def buildStory(self)->dict[str,Any]:
+        questions = NewContentQuestions.get_questions_story()
+        answers = questionary.prompt(questions)
+        answers['name'] = answers['story_name']
+        answers['id'] = str(uuid.uuid4())
+        answers['version'] = 1
+        answers['date'] = datetime.today().strftime('%Y-%m-%d')
+        answers['author'] = answers['story_author']
+        answers['description'] = 'UPDATE_DESCRIPTION'
+        answers['narrative'] = 'UPDATE_NARRATIVE'
+        answers['references'] = []
+        answers['tags'] = dict()
+        answers['tags']['analytic_story'] = answers['name']
+        answers['tags']['category'] = answers['category']
+        answers['tags']['product'] = ['Splunk Enterprise','Splunk Enterprise Security','Splunk Cloud']
+        answers['tags']['usecase'] = answers['usecase']
+        answers['tags']['cve'] = ['UPDATE WITH CVE(S) IF APPLICABLE']
+        return answers
+    
 
-class NewContent:
+    def execute(self, input_dto: new) -> None:
+        if input_dto.type == NewContentType.detection:
+            content_dict = self.buildDetection()
+            subdirectory = pathlib.Path('detections') / content_dict.get('type')
+        elif input_dto.type == NewContentType.story:
+            content_dict = self.buildStory()
+            subdirectory = pathlib.Path('stories')
+        else:
+            raise Exception(f"Unsupported new content type: [{input_dto.type}]")
+    
+        full_output_path = input_dto.path / subdirectory / SecurityContentObject_Abstract.contentNameToFileName(content_dict.get('name'))
+        YmlWriter.writeYmlFile(str(full_output_path), content_dict)
+
+
+
+    def writeObjectNewContent(self, object: dict, subdirectory_name: str, type: NewContentType) -> None:
+        if type == NewContentType.detection:
+            file_path = os.path.join(self.output_path, 'detections', subdirectory_name, self.convertNameToFileName(object['name'], object['tags']['product']))
+            output_folder = pathlib.Path(self.output_path)/'detections'/subdirectory_name
+            #make sure the output folder exists for this detection
+            output_folder.mkdir(exist_ok=True)
 
-    def execute(self, input_dto: NewContentInputDto) -> None:
-        new_content_generator_output_dto = NewContentGeneratorOutputDto({},{})
-        new_content_generator = NewContentGenerator(new_content_generator_output_dto)
-        new_content_generator.execute(input_dto.new_content_generator_input_dto)
+            YmlWriter.writeYmlFile(file_path, object)
+            print("Successfully created detection " + file_path)
+        
+        elif type == NewContentType.story:
+            file_path = os.path.join(self.output_path, 'stories', self.convertNameToFileName(object['name'], object['tags']['product']))
+            YmlWriter.writeYmlFile(file_path, object)
+            print("Successfully created story " + file_path)        
+        
+        else:
+            raise(Exception(f"Object Must be Story or Detection, but is not: {object}"))
 
-        new_content_yml_output = NewContentYmlOutput(input_dto.output_path)
-        new_content_yml_output.writeObjectNewContent(new_content_generator_output_dto.obj, new_content_generator_output_dto.answers.get("detection_kind",None), input_dto.new_content_generator_input_dto.type)

contentctl/actions/release_notes.py

@@ -1,120 +1,131 @@
 import os
-
-from dataclasses import dataclass
-
-from contentctl.input.director import DirectorInputDto, Director, DirectorOutputDto
-from contentctl.output.svg_output import SvgOutput
-from contentctl.output.attack_nav_output import AttackNavOutput
+from contentctl.objects.config import release_notes
 from git import Repo
 import re
 import yaml
-from typing import Union
+import pathlib
+from typing import List, Union
 
 
-@dataclass(frozen=True)
-class ReleaseNotesInputDto:
-    director_input_dto: DirectorInputDto
 
 class ReleaseNotes:
-    def create_notes(self,repo_path, file_paths):
-            for file_path in file_paths:
-                # Check if the file exists
-                if os.path.exists(file_path) and os.path.isfile(file_path):
-                    # Check if the file is a YAML file
-                    if file_path.endswith('.yaml') or file_path.endswith('.yml'):
-                        # Read and parse the YAML file
-                        with open(file_path, 'r') as file:
-                            try:
-                                data = yaml.safe_load(file)
-                                # Check and create story link
-                                if 'name' in data and 'stories/' in file_path:
-                                    story_link = "https://research.splunk.com/stories/" + data['name']
-                                    story_link=story_link.replace(" ","_")
-                                    story_link = story_link.lower()
-                                    print("- "+"["+f"{data['name']}"+"]"+"("+story_link+")")
-              
-                                if 'name' in data and'playbooks/' in file_path:
-                                    playbook_link = "https://research.splunk.com" + file_path.replace(repo_path,"")
-                                    playbook_link=playbook_link.replace(".yml","/").lower()
-                                    print("- "+"["+f"{data['name']}"+"]"+"("+playbook_link+")")
-
-                                if 'name' in data and'macros/' in file_path:
-                                    print("- " + f"{data['name']}")
-
-                                if 'name' in data and'lookups/' in file_path:
-                                    print("- " + f"{data['name']}")
-
-                               # Create only SSA link when its production
-                                if 'name' in data and 'id' in data and 'ssa_detections/' in file_path:
-                                    if data['status'] == "production":
-                                        temp_link = "https://research.splunk.com" + file_path.replace(repo_path,"")
-                                        pattern = r'(?<=/)[^/]*$'
-                                        detection_link = re.sub(pattern, data['id'], temp_link)
-                                        detection_link = detection_link.replace("detections","" )
-                                        detection_link = detection_link.replace("ssa_/","" )
-                                        print("- "+"["+f"{data['name']}"+"]"+"("+detection_link+")")   
-
-                                    if data['status'] == "validation":
-                                        print("- "+f"{data['name']}"+" (Validation Mode)")   
-
-                                # Check and create detection link
-                                if 'name' in data and 'id' in data and 'detections/' in file_path and not 'ssa_detections/' in file_path:
-                                    temp_link = "https://research.splunk.com" + file_path.replace(repo_path,"")
+    def create_notes(self,repo_path:pathlib.Path, file_paths:List[pathlib.Path], header:str)->dict[str,Union[List[str], str]]:
+        updates:List[str] = []
+        warnings:List[str] = []
+        for file_path in file_paths:
+            # Check if the file exists
+            if file_path.exists() and file_path.is_file():
+                # Check if the file is a YAML file
+                if file_path.suffix in ['.yaml', '.yml']:
+                    # Read and parse the YAML file
+                    with open(file_path, 'r') as file:
+                        try:
+                            data = yaml.safe_load(file)
+                            # Check and create story link
+                            if 'name' in data and 'stories' in file_path.parts:
+                                story_link = "https://research.splunk.com/stories/" + data['name']
+                                story_link=story_link.replace(" ","_")
+                                story_link = story_link.lower()
+                                updates.append("- "+"["+f"{data['name']}"+"]"+"("+story_link+")")
+            
+                            if 'name' in data and'playbooks' in file_path.parts:
+                                playbook_link = "https://research.splunk.com/" + str(file_path).replace(str(repo_path),"")
+                                playbook_link=playbook_link.replace(".yml","/").lower()
+                                updates.append("- "+"["+f"{data['name']}"+"]"+"("+playbook_link+")")
+
+                            if 'name' in data and'macros' in file_path.parts:
+                                updates.append("- " + f"{data['name']}")
+
+                            if 'name' in data and'lookups' in file_path.parts:
+                                updates.append("- " + f"{data['name']}")
+
+                            # Create only SSA link when its production
+                            if 'name' in data and 'id' in data and 'ssa_detections' in file_path.parts:
+                                if data['status'] == "production":
+                                    temp_link = "https://research.splunk.com/" + str(file_path).replace(str(repo_path),"")
+                                    pattern = r'(?<=/)[^/]*$'
+                                    detection_link = re.sub(pattern, data['id'], temp_link)
+                                    detection_link = detection_link.replace("detections","" )
+                                    detection_link = detection_link.replace("ssa_/","" )
+                                    updates.append("- "+"["+f"{data['name']}"+"]"+"("+detection_link+")")   
+
+                                if data['status'] == "validation":
+                                    updates.append("- "+f"{data['name']}"+" (Validation Mode)")   
+                                
+
+                            # Check and create detection link
+                            if 'name' in data and 'id' in data and 'detections' in file_path.parts and not 'ssa_detections' in file_path.parts and 'detections/deprecated' not in file_path.parts:
+                                
+                                if data['status'] == "production":
+                                    temp_link = "https://research.splunk.com" + str(file_path).replace(str(repo_path),"")
                                     pattern = r'(?<=/)[^/]*$'
                                     detection_link = re.sub(pattern, data['id'], temp_link)
                                     detection_link = detection_link.replace("detections","" )
                                     detection_link = detection_link.replace(".com//",".com/" )
-                                    print("- "+"["+f"{data['name']}"+"]"+"("+detection_link+")") 
-
-                            except yaml.YAMLError as exc:
-                                print(f"Error parsing YAML file {file_path}: {exc}")
-                else:
-                    print(f"File not found or is not a file: {file_path}")
+                                    updates.append("- "+"["+f"{data['name']}"+"]"+"("+detection_link+")") 
+                                
+                                if data['status'] == "deprecated":
+                                    temp_link = "https://research.splunk.com" + str(file_path).replace(str(repo_path),"")
+                                    pattern = r'(?<=/)[^/]*$'
+                                    detection_link = re.sub(pattern, data['id'], temp_link)
+                                    detection_link = detection_link.replace("detections","" )
+                                    detection_link = detection_link.replace(".com//",".com/" )
+                                    updates.append("- "+"["+f"{data['name']}"+"]"+"("+detection_link+")")
+                            
+                        except yaml.YAMLError as exc:
+                            raise Exception(f"Error parsing YAML file for release_notes {file_path}: {str(exc)}")
+            else:
+                warnings.append(f"Error parsing YAML file for release_notes. File not found or is not a file: {file_path}")
+        #print out all updates at once
+        success_header = f'### {header} - [{len(updates)}]'
+        warning_header = f'### {header} - [{len(warnings)}]'
+        return {'header': success_header, 'changes': sorted(updates), 
+                'warning_header': warning_header, 'warnings': warnings}
+        
 
-    def release_notes(self, input_dto: DirectorInputDto, old_tag:Union[str,None], new_tag:str, latest_branch:str) -> None:
+    def release_notes(self, config:release_notes) -> None:
 
         ### Remove hard coded path
         directories = ['detections/','stories/','macros/','lookups/','playbooks/','ssa_detections/']
-        repo_path = os.path.abspath(input_dto.director_input_dto.input_path)
-        repo = Repo(repo_path)
+        
+        repo = Repo(config.path)
         # Ensure the new tag is in the tags if tags are supplied
       
-        if new_tag:    
-            if new_tag not in repo.tags:
-                raise ValueError(f"new_tag {new_tag} does not exist in the repository. Make sure your branch nameis ")
-            if old_tag is None:
+        if config.new_tag:    
+            if config.new_tag not in repo.tags:
+                raise Exception(f"new_tag {config.new_tag} does not exist in the repository. Make sure your branch nameis ")
+            if config.old_tag is None:
                 #Old tag was not supplied, so find the index of the new tag, then get the tag before it
                 tags_sorted = sorted(repo.tags, key=lambda t: t.commit.committed_datetime, reverse=True)
                 tags_names_sorted = [tag.name for tag in tags_sorted]            
-                new_tag_index = tags_names_sorted.index(new_tag)
+                new_tag_index = tags_names_sorted.index(config.new_tag)
                 try:
-                    old_tag = tags_names_sorted[new_tag_index+1]
+                    config.old_tag = tags_names_sorted[new_tag_index+1]
                 except Exception:
-                    raise ValueError(f"old_tag cannot be inferred.  {new_tag} is the oldest tag in the repo!")   
-            latest_tag = new_tag
-            previous_tag = old_tag   
+                    raise Exception(f"old_tag cannot be inferred.  {config.new_tag} is the oldest tag in the repo!")   
+            latest_tag = config.new_tag
+            previous_tag = config.old_tag   
             commit1 = repo.commit(latest_tag)
             commit2 = repo.commit(previous_tag)       
             diff_index = commit2.diff(commit1)
 
         # Ensure the branch is in the repo          
-        if latest_branch:
+        if config.latest_branch:
             #If a branch name is supplied, compare against develop
-            if latest_branch not in repo.branches:
-                raise ValueError(f"latest branch {latest_branch} does not exist in the repository. Make sure your branch name is correct")
-            latest_branch = latest_branch
+            if config.latest_branch not in repo.branches:
+                raise ValueError(f"latest branch {config.latest_branch} does not exist in the repository. Make sure your branch name is correct")
             compare_against = "develop"
-            commit1 = repo.commit(latest_branch)
+            commit1 = repo.commit(config.latest_branch)
             commit2 = repo.commit(compare_against)    
             diff_index = commit2.diff(commit1)
         
-        modified_files = []
-        added_files = []
+        modified_files:List[pathlib.Path] = []
+        added_files:List[pathlib.Path] = []
         for diff in diff_index:
-            file_path = diff.a_path
+            file_path = pathlib.Path(diff.a_path)
 
             # Check if the file is in the specified directories
-            if any(file_path.startswith(directory) for directory in directories):
+            if any(str(file_path).startswith(directory) for directory in directories):
                 # Check if a file is Modified
                 if diff.change_type == 'M':
                     modified_files.append(file_path)
@@ -124,91 +135,104 @@ class ReleaseNotes:
                 elif diff.change_type == 'A':
                     added_files.append(file_path)
                     # print(added_files)
-        detections_added = []
-        ba_detections_added = []
-        stories_added = []
-        macros_added = []
-        lookups_added = []
-        playbooks_added = []      
-        detections_modified = []
-        ba_detections_modified = []
-        stories_modified = []
-        macros_modified = []
-        lookups_modified = []
-        playbooks_modified = []
+        detections_added:List[pathlib.Path] = []
+        ba_detections_added:List[pathlib.Path] = []
+        stories_added:List[pathlib.Path] = []
+        macros_added:List[pathlib.Path] = []
+        lookups_added:List[pathlib.Path] = []
+        playbooks_added:List[pathlib.Path] = []      
+        detections_modified:List[pathlib.Path] = []
+        ba_detections_modified:List[pathlib.Path] = []
+        stories_modified:List[pathlib.Path] = []
+        macros_modified:List[pathlib.Path] = []
+        lookups_modified:List[pathlib.Path] = []
+        playbooks_modified:List[pathlib.Path] = []
+        detections_deprecated:List[pathlib.Path] = []
 
         for file in modified_files:
-            file=repo_path +"/"+file
-            if 'detections/' in file and 'ssa_detections/' not in file:
+            file= config.path / file
+            if 'detections' in file.parts and 'ssa_detections' not in file.parts and 'deprecated' not in file.parts:
                 detections_modified.append(file)
-            if 'stories/' in file:
+            if 'detections' in file.parts and 'ssa_detections' not in file.parts and 'deprecated' in file.parts:
+                detections_deprecated.append(file)
+            if 'stories' in file.parts:
                 stories_modified.append(file)
-            if 'macros/' in file:
+            if 'macros' in file.parts:
                 macros_modified.append(file)
-            if 'lookups/' in file:
+            if 'lookups' in file.parts:
                 lookups_modified.append(file)
-            if 'playbooks/' in file:
+            if 'playbooks' in file.parts:
                 playbooks_modified.append(file)
-            if 'ssa_detections/' in file:
+            if 'ssa_detections' in file.parts:
                 ba_detections_modified.append(file)
 
         for file in added_files:
-            file=repo_path +"/"+file
-            if 'detections/' in file and 'ssa_detections/' not in file:
+            file=config.path / file
+            if 'detections' in file.parts and 'ssa_detections' not in file.parts:
                 detections_added.append(file)
-            if 'stories/' in file:
+            if 'stories' in file.parts:
                 stories_added.append(file)
-            if 'macros/' in file:
+            if 'macros' in file.parts:
                 macros_added.append(file)
-            if 'lookups/' in file:
+            if 'lookups' in file.parts:
                 lookups_added.append(file)
-            if 'playbooks/' in file:
+            if 'playbooks' in file.parts:
                 playbooks_added.append(file)
-            if 'ssa_detections/' in file:
+            if 'ssa_detections' in file.parts:
                 ba_detections_added.append(file)
 
-        if new_tag:
+        if config.new_tag:
 
             print(f"Generating release notes       - \033[92m{latest_tag}\033[0m")
             print(f"Compared against               - \033[92m{previous_tag}\033[0m")
             print("\n## Release notes for ESCU " + latest_tag)
 
-        if latest_branch:
-            print(f"Generating release notes       - \033[92m{latest_branch}\033[0m")
+        if config.latest_branch:
+            print(f"Generating release notes       - \033[92m{config.latest_branch}\033[0m")
             print(f"Compared against               - \033[92m{compare_against}\033[0m")
-            print("\n## Release notes for ESCU " + latest_branch)
-
-        print("\n### New Analytics Story")
-        self.create_notes(repo_path, stories_added)
-        print("\n### Updated Analytics Story")
-        self.create_notes(repo_path,stories_modified)
-        print("\n### New Analytics")
-        self.create_notes(repo_path,detections_added)
-        print("\n### Updated Analytics")    
-        self.create_notes(repo_path,detections_modified)
-        print("\n### Macros Added")    
-        self.create_notes(repo_path,macros_added)
-        print("\n### Macros Updated")    
-        self.create_notes(repo_path,macros_modified)
-        print("\n### Lookups Added")    
-        self.create_notes(repo_path,lookups_added)
-        print("\n### Lookups Updated")    
-        self.create_notes(repo_path,lookups_modified)
-        print("\n### Playbooks Added")    
-        self.create_notes(repo_path,playbooks_added)
-        print("\n### Playbooks Updated")    
-        self.create_notes(repo_path,playbooks_modified)
-
-        print("\n### Other Updates\n-\n")
-
-        print("\n## BA Release Notes")
-
-        print("\n### New BA Analytics")
-        self.create_notes(repo_path,ba_detections_added)
-
-        print("\n### Updated BA Analytics")    
-        self.create_notes(repo_path,ba_detections_modified) 
-
-
+            print("\n## Release notes for ESCU " + config.latest_branch)
+
+        notes = [self.create_notes(config.path, stories_added, header="New Analytic Story"),
+                self.create_notes(config.path,stories_modified, header="Updated Analytic Story"),
+                self.create_notes(config.path,detections_added, header="New Analytics"),
+                self.create_notes(config.path,detections_modified, header="Updated Analytics"),
+                self.create_notes(config.path,macros_added, header="Macros Added"),
+                self.create_notes(config.path,macros_modified, header="Macros Updated"),
+                self.create_notes(config.path,lookups_added, header="Lookups Added"),
+                self.create_notes(config.path,lookups_modified, header="Lookups Updated"),
+                self.create_notes(config.path,playbooks_added, header="Playbooks Added"),
+                self.create_notes(config.path,playbooks_modified, header="Playbooks Updated"),
+                self.create_notes(config.path,detections_deprecated, header="Deprecated Analytics")]
+        
+        #generate and show ba_notes in a different section
+        ba_notes = [self.create_notes(config.path,ba_detections_added, header="New BA Analytics"),
+                    self.create_notes(config.path,ba_detections_modified, header="Updated BA Analytics") ]
         
+        
+        def printNotes(notes:List[dict[str,Union[List[str], str]]], outfile:Union[pathlib.Path,None]=None):
+            num_changes = sum([len(note['changes']) for note in notes])
+            num_warnings = sum([len(note['warnings']) for note in notes])
+            lines:List[str] = []
+            lines.append(f"Total New and Updated Content: [{num_changes}]")
+            for note in notes:
+                lines.append("")
+                lines.append(note['header'])
+                lines+=(note['changes'])
+            
+            lines.append(f"\n\nTotal Warnings: [{num_warnings}]")
+            for note in notes:
+                if len(note['warnings']) > 0:
+                    lines.append(note['warning_header'])
+                    lines+=note['warnings']
+            text_blob = '\n'.join(lines)
+            print(text_blob)
+            if outfile is not None:
+                with open(outfile,'w') as writer:
+                    writer.write(text_blob)
+            
+        printNotes(notes, config.releaseNotesFilename(f"release_notes.txt"))
+
+        print("\n\n### Other Updates\n-\n")
+        print("\n## BA Release Notes")
+        printNotes(ba_notes, config.releaseNotesFilename("ba_release_notes.txt"))
         print(f"Release notes completed succesfully")

contentctl/actions/reporting.py

@@ -2,32 +2,43 @@ import os
 
 from dataclasses import dataclass
 
-from contentctl.input.director import DirectorInputDto, Director, DirectorOutputDto
+from contentctl.input.director import DirectorOutputDto
 from contentctl.output.svg_output import SvgOutput
 from contentctl.output.attack_nav_output import AttackNavOutput
-
+from contentctl.objects.config import report
 
 @dataclass(frozen=True)
 class ReportingInputDto:
-    director_input_dto: DirectorInputDto
+    director_output_dto: DirectorOutputDto
+    config: report
 
 class Reporting:
 
     def execute(self, input_dto: ReportingInputDto) -> None:
-        director_output_dto = DirectorOutputDto([],[],[],[],[],[],[],[],[])
-        director = Director(director_output_dto)
-        director.execute(input_dto.director_input_dto)
 
+
+        #Ensure the reporting path exists
+        try:
+            input_dto.config.getReportingPath().mkdir(exist_ok=True,parents=True)
+        except Exception as e:
+            if input_dto.config.getReportingPath().is_file():
+                raise Exception(f"Error writing reporting: '{input_dto.config.getReportingPath()}' is a file, not a directory.")
+            else:
+                raise Exception(f"Error writing reporting : '{input_dto.config.getReportingPath()}': {str(e)}")
+
+        print("Creating GitHub Badges...")
+        #Generate GitHub Badges
         svg_output = SvgOutput()
         svg_output.writeObjects(
-            director_output_dto.detections, 
-            os.path.join(input_dto.director_input_dto.input_path, "reporting")
-        )
+            input_dto.director_output_dto.detections, 
+            input_dto.config.getReportingPath())
         
-        attack_nav_output = AttackNavOutput()        
+        #Generate coverage json
+        print("Generating coverage.json...")
+        attack_nav_output = AttackNavOutput()       
         attack_nav_output.writeObjects(
-            director_output_dto.detections, 
-            os.path.join(input_dto.director_input_dto.input_path, "reporting")
+            input_dto.director_output_dto.detections, 
+            input_dto.config.getReportingPath()
         )
         
-        print('Reporting of security content successful.')
+        print(f"Reporting successfully written to '{input_dto.config.getReportingPath()}'")