Merge 220cb06ae0 into fd87c99abc

autorecon/default-plugins/reporting-markdown.py

@@ -10,31 +10,24 @@ class Markdown(Report):
 
 	async def run(self, targets):
 		if len(targets) > 1:
-			report = os.path.join(config['output'], 'Full_Report.md')
-			single_target = False
+			report = os.path.join(config['output'], 'report.md')
 		elif len(targets) == 1:
-			report = targets[0].reportdir
-			single_target = True
+			report = os.path.join(targets[0].reportdir, 'report.md')
 		else:
 			return
 
-
 		os.makedirs(report, exist_ok=True)
 
 		for target in targets:
-			# Use target.address subdirectory only if multiple targets exist
-			target_root = report if single_target else os.path.join(report, target.address)
-			os.makedirs(target_root, exist_ok=True)
+			os.makedirs(os.path.join(report, target.address), exist_ok=True)
 
 			files = [os.path.abspath(filename) for filename in glob.iglob(os.path.join(target.scandir, '**/*'), recursive=True) if os.path.isfile(filename) and filename.endswith(('.txt', '.html'))]
 
-			# --- Port Scans ---
 			if target.scans['ports']:
-				ports_dir = os.path.join(target_root, 'Port Scans')
-				os.makedirs(ports_dir, exist_ok=True)
+				os.makedirs(os.path.join(report, target.address, 'Port Scans'), exist_ok=True)
 				for scan in target.scans['ports'].keys():
 					if len(target.scans['ports'][scan]['commands']) > 0:
-						with open(os.path.join(ports_dir, 'PortScan - ' + target.scans['ports'][scan]['plugin'].name + '.md'), 'w') as output:
+						with open(os.path.join(report, target.address, 'Port Scans', 'PortScan - ' + target.scans['ports'][scan]['plugin'].name + '.md'), 'w') as output:
 							for command in target.scans['ports'][scan]['commands']:
 								output.writelines('```bash\n' + command[0] + '\n```')
 								for filename in files:
@@ -42,17 +35,13 @@ class Markdown(Report):
 										output.writelines('\n\n[' + filename + '](file://' + filename + '):\n\n')
 										with open(filename, 'r') as file:
 											output.writelines('```\n' + file.read() + '\n```\n')
-
-			# --- Services ---
 			if target.scans['services']:
-				services_dir = os.path.join(target_root, 'Services')
-				os.makedirs(services_dir, exist_ok=True)
+				os.makedirs(os.path.join(report, target.address, 'Services'), exist_ok=True)
 				for service in target.scans['services'].keys():
-					service_dir = os.path.join(services_dir, 'Service - ' + service.tag().replace('/', '-'))
-					os.makedirs(service_dir, exist_ok=True)
+					os.makedirs(os.path.join(report, target.address, 'Services', 'Service - ' + service.tag().replace('/', '-')), exist_ok=True)
 					for plugin in target.scans['services'][service].keys():
 						if len(target.scans['services'][service][plugin]['commands']) > 0:
-							with open(os.path.join(service_dir, target.scans['services'][service][plugin]['plugin'].name + '.md'), 'w') as output:
+							with open(os.path.join(report, target.address, 'Services', 'Service - ' + service.tag().replace('/', '-'), target.scans['services'][service][plugin]['plugin'].name + '.md'), 'w') as output:
 								for command in target.scans['services'][service][plugin]['commands']:
 									output.writelines('```bash\n' + command[0] + '\n```')
 									for filename in files:
@@ -61,30 +50,26 @@ class Markdown(Report):
 											with open(filename, 'r') as file:
 												output.writelines('```\n' + file.read() + '\n```\n')
 
-			# --- Manual Commands ---
 			manual_commands = os.path.join(target.scandir, '_manual_commands.txt')
 			if os.path.isfile(manual_commands):
-				with open(os.path.join(target_root, 'Manual Commands.md'), 'w') as output:
+				with open(os.path.join(report, target.address, 'Manual Commands' + '.md'), 'w') as output:
 					with open(manual_commands, 'r') as file:
 						output.writelines('```bash\n' + file.read() + '\n```')
 
-			# --- Patterns ---
 			patterns = os.path.join(target.scandir, '_patterns.log')
 			if os.path.isfile(patterns):
-				with open(os.path.join(target_root, 'Patterns.md'), 'w') as output:
+				with open(os.path.join(report, target.address, 'Patterns' + '.md'), 'w') as output:
 					with open(patterns, 'r') as file:
 						output.writelines(file.read())
 
-			# --- Commands ---
 			commands = os.path.join(target.scandir, '_commands.log')
 			if os.path.isfile(commands):
-				with open(os.path.join(target_root, 'Commands.md'), 'w') as output:
+				with open(os.path.join(report, target.address, 'Commands' + '.md'), 'w') as output:
 					with open(commands, 'r') as file:
 						output.writelines('```bash\n' + file.read() + '\n```')
 
-			# --- Errors ---
 			errors = os.path.join(target.scandir, '_errors.log')
 			if os.path.isfile(errors):
-				with open(os.path.join(target_root, 'Errors.md'), 'w') as output:
+				with open(os.path.join(report, target.address, 'Errors' + '.md'), 'w') as output:
 					with open(errors, 'r') as file:
 						output.writelines('```\n' + file.read() + '\n```')