Update autorecon.py

Made secure/insecure optional for --force-services
Fixed bug with keyboard monitor.
This commit is contained in:
Tib3rius 2021-09-09 12:39:06 -04:00
parent 35b5647f4d
commit e793903732
1 changed files with 3 additions and 3 deletions

View File

@ -390,7 +390,7 @@ async def scan_target(target):
forced_services = [x.strip().lower() for x in config['force_services']] forced_services = [x.strip().lower() for x in config['force_services']]
for forced_service in forced_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('(?P<protocol>(tcp|udp))\/(?P<port>\d+)\/(?P<service>[\w\-]+)(\/(?P<secure>secure|insecure))?', forced_service)
if match: if match:
protocol = match.group('protocol') protocol = match.group('protocol')
if config['proxychains'] and protocol == 'udp': if config['proxychains'] and protocol == 'udp':
@ -408,7 +408,6 @@ async def scan_target(target):
else: else:
error('No services were defined. Please check your service syntax: [tcp|udp]/<port>/<service-name>/[secure|insecure]') error('No services were defined. Please check your service syntax: [tcp|udp]/<port>/<service-name>/[secure|insecure]')
heartbeat.cancel() heartbeat.cancel()
keyboard_monitor.cancel()
autorecon.errors = True autorecon.errors = True
return return
else: else:
@ -1295,7 +1294,8 @@ async def main():
if i >= num_new_targets: if i >= num_new_targets:
break break
keyboard_monitor.cancel() if not config['disable_keyboard_control']:
keyboard_monitor.cancel()
# If there's only one target we don't need a combined report # If there's only one target we don't need a combined report
if len(autorecon.completed_targets) > 1: if len(autorecon.completed_targets) > 1: