Merge ec2283ba45 into fd87c99abc

autorecon/main.py

@@ -329,6 +329,7 @@ async def port_scan(plugin, target):
 			target.running_tasks.pop(plugin.slug, None)
 
 		info('Port scan {bblue}' + plugin.name + ' {green}(' + plugin.slug + '){rst} against {byellow}' + target.address + '{rst} finished in ' + elapsed_time, verbosity=2)
+		os.system ('touch ' + os.path.join(target.scandir, '.port_scans', f".{plugin.slug}"))
 		return {'type':'port', 'plugin':plugin, 'result':result}
 
 async def service_scan(plugin, service):
@@ -453,6 +454,7 @@ async def service_scan(plugin, service):
 				service.target.running_tasks.pop(tag, None)
 
 			info('Service scan {bblue}' + plugin.name + ' {green}(' + tag + '){rst} against {byellow}' + service.target.address + '{rst} finished in ' + elapsed_time, verbosity=2)
+			os.system ('touch ' + os.path.join(scandir, '.service_scans', f".{plugin.slug}"))
 			return {'type':'service', 'plugin':plugin, 'result':result}
 
 async def generate_report(plugin, targets):
@@ -485,6 +487,7 @@ async def scan_target(target):
 	os.makedirs(scandir, exist_ok=True)
 
 	os.makedirs(os.path.join(scandir, 'xml'), exist_ok=True)
+	os.makedirs(os.path.join(scandir, '.port_scans'), exist_ok=True)
 
 	if not config['only_scans_dir']:
 		exploitdir = os.path.join(basedir, 'exploit')
@@ -506,7 +509,7 @@ async def scan_target(target):
 
 	target.reportdir = reportdir
 
-	pending = []
+	pending = set()
 
 	heartbeat = asyncio.create_task(start_heartbeat(target, period=config['heartbeat']))
 
@@ -515,7 +518,7 @@ async def scan_target(target):
 		forced_services = [x.strip().lower() for x in config['force_services']]
 
 		for forced_service in forced_services:
-			match = re.search('(?P<protocol>(tcp|udp))\/(?P<port>\d+)\/(?P<service>[\w\-]+)(\/(?P<secure>secure|insecure))?', forced_service)
+			match = re.search(r'(?P<protocol>(tcp|udp))/(?P<port>\d+)/(?P<service>[\w\-]+)(/(?P<secure>secure|insecure))?', forced_service)
 			if match:
 				protocol = match.group('protocol')
 				if config['proxychains'] and protocol == 'udp':
@@ -529,7 +532,7 @@ async def scan_target(target):
 				services.append(service)
 
 		if services:
-			pending.append(asyncio.create_task(asyncio.sleep(0)))
+			pending.add(asyncio.create_task(asyncio.sleep(0)))
 		else:
 			error('No services were defined. Please check your service syntax: [tcp|udp]/<port>/<service-name>/[secure|insecure]')
 			heartbeat.cancel()
@@ -539,6 +542,11 @@ async def scan_target(target):
 		for plugin in target.autorecon.plugin_types['port']:
 			if config['proxychains'] and plugin.type == 'udp':
 				continue
+			processed_marker = os.path.join(scandir, '.port_scans', f".{plugin.slug}")
+			# If the plugin has already been run against this target, skip it.
+			if os.path.exists(processed_marker):
+				info(f"Port Plugin {plugin.name} ({plugin.slug}) has already been run against {target.address}. Skipping.")
+				continue
 
 			if config['port_scans'] and plugin.slug in config['port_scans']:
 				matching_tags = True
@@ -560,7 +568,7 @@ async def scan_target(target):
 
 			if matching_tags and not excluded_tags:
 				target.scans['ports'][plugin.slug] = {'plugin':plugin, 'commands':[]}
-				pending.append(asyncio.create_task(port_scan(plugin, target)))
+				pending.add(asyncio.create_task(port_scan(plugin, target)))
 
 	async with autorecon.lock:
 		autorecon.scanning_targets.append(target)
@@ -627,6 +635,7 @@ async def scan_target(target):
 				scandir = os.path.join(scandir, protocol + str(port))
 				os.makedirs(scandir, exist_ok=True)
 				os.makedirs(os.path.join(scandir, 'xml'), exist_ok=True)
+				os.makedirs(os.path.join(scandir, '.service_scans'), exist_ok=True)
 
 			# Special cases for HTTP.
 			http_scheme = 'https' if 'https' in service.name or service.secure is True else 'http'
@@ -656,6 +665,13 @@ async def scan_target(target):
 				plugin_service_match = False
 				plugin_tag = service.tag() + '/' + plugin.slug
 
+				processed_marker = os.path.join(scandir, '.service_scans', f".{plugin.slug}")
+				# If the plugin has already been run against this service, skip it.
+				if os.path.exists(processed_marker):
+					info(f"Service Plugin {plugin.name} ({plugin.slug}) has already been run against {service.name} on {target.address}. Skipping.")
+					continue
+
+
 				for service_dict in plugin.services:
 					if service_dict['protocol'] == protocol and port in service_dict['port']:
 						for name in service_dict['name']:
@@ -1250,7 +1266,7 @@ async def run():
 				mode = 'udp'
 				port = port.split('U:')[1]
 
-			match = re.search('^([0-9]+)\-([0-9]+)$', port)
+			match = re.search(r'^([0-9]+)-([0-9]+)$', port)
 			if match:
 				num1 = int(match.group(1))
 				num2 = int(match.group(2))
@@ -1533,10 +1549,10 @@ async def run():
 	if not config['disable_keyboard_control']:
 		terminal_settings = termios.tcgetattr(sys.stdin.fileno())
 
-	pending = []
+	pending = set()
 	i = 0
 	while autorecon.pending_targets:
-		pending.append(asyncio.create_task(scan_target(autorecon.pending_targets.pop(0))))
+		pending.add(asyncio.create_task(scan_target(autorecon.pending_targets.pop(0))))
 		i+=1
 		if i >= num_initial_targets:
 			break