initial version of dependent service scans.

This commit is contained in:
blockomat2100 2021-11-08 07:31:14 +01:00
parent 52ba61e6eb
commit 42e2620f76
3 changed files with 198 additions and 191 deletions

View File

@ -2,9 +2,11 @@ import asyncio, colorama, os, re, string, sys, unidecode
from colorama import Fore, Style from colorama import Fore, Style
from autorecon.config import config from autorecon.config import config
def slugify(name): def slugify(name):
return re.sub(r'[\W_]+', '-', unidecode.unidecode(name).lower()).strip('-') return re.sub(r'[\W_]+', '-', unidecode.unidecode(name).lower()).strip('-')
def e(*args, frame_index=1, **kvargs): def e(*args, frame_index=1, **kvargs):
frame = sys._getframe(frame_index) frame = sys._getframe(frame_index)
@ -16,10 +18,13 @@ def e(*args, frame_index=1, **kvargs):
return string.Formatter().vformat(' '.join(args), args, vals) return string.Formatter().vformat(' '.join(args), args, vals)
def fformat(s): def fformat(s):
return e(s, frame_index=3) return e(s, frame_index=3)
def cprint(*args, color=Fore.RESET, char='*', sep=' ', end='\n', frame_index=1, file=sys.stdout, printmsg=True, verbosity=0, **kvargs):
def cprint(*args, color=Fore.RESET, char='*', sep=' ', end='\n', frame_index=1, file=sys.stdout, printmsg=True,
verbosity=0, **kvargs):
if printmsg and verbosity > config['verbose']: if printmsg and verbosity > config['verbose']:
return '' return ''
frame = sys._getframe(frame_index) frame = sys._getframe(frame_index)
@ -44,7 +49,8 @@ def cprint(*args, color=Fore.RESET, char='*', sep=' ', end='\n', frame_index=1,
} }
if config['accessible']: if config['accessible']:
vals = {'bgreen':'', 'bred':'', 'bblue':'', 'byellow':'', 'bmagenta':'', 'green':'', 'red':'', 'blue':'', 'yellow':'', 'magenta':'', 'bright':'', 'srst':'', 'crst':'', 'rst':''} vals = {'bgreen': '', 'bred': '', 'bblue': '', 'byellow': '', 'bmagenta': '', 'green': '', 'red': '',
'blue': '', 'yellow': '', 'magenta': '', 'bright': '', 'srst': '', 'crst': '', 'rst': ''}
vals.update(frame.f_globals) vals.update(frame.f_globals)
vals.update(frame.f_locals) vals.update(frame.f_locals)
@ -70,31 +76,37 @@ def cprint(*args, color=Fore.RESET, char='*', sep=' ', end='\n', frame_index=1,
else: else:
return fmted return fmted
def debug(*args, color=Fore.GREEN, sep=' ', end='\n', file=sys.stdout, **kvargs): def debug(*args, color=Fore.GREEN, sep=' ', end='\n', file=sys.stdout, **kvargs):
if config['verbose'] >= 2: if config['verbose'] >= 2:
if config['accessible']: if config['accessible']:
args = ('Debug:',) + args args = ('Debug:',) + args
cprint(*args, color=color, char='-', sep=sep, end=end, file=file, frame_index=2, **kvargs) cprint(*args, color=color, char='-', sep=sep, end=end, file=file, frame_index=2, **kvargs)
def info(*args, sep=' ', end='\n', file=sys.stdout, **kvargs): def info(*args, sep=' ', end='\n', file=sys.stdout, **kvargs):
cprint(*args, color=Fore.BLUE, char='*', sep=sep, end=end, file=file, frame_index=2, **kvargs) cprint(*args, color=Fore.BLUE, char='*', sep=sep, end=end, file=file, frame_index=2, **kvargs)
def warn(*args, sep=' ', end='\n', file=sys.stderr, **kvargs): def warn(*args, sep=' ', end='\n', file=sys.stderr, **kvargs):
if config['accessible']: if config['accessible']:
args = ('Warning:',) + args args = ('Warning:',) + args
cprint(*args, color=Fore.YELLOW, char='!', sep=sep, end=end, file=file, frame_index=2, **kvargs) cprint(*args, color=Fore.YELLOW, char='!', sep=sep, end=end, file=file, frame_index=2, **kvargs)
def error(*args, sep=' ', end='\n', file=sys.stderr, **kvargs): def error(*args, sep=' ', end='\n', file=sys.stderr, **kvargs):
if config['accessible']: if config['accessible']:
args = ('Error:',) + args args = ('Error:',) + args
cprint(*args, color=Fore.RED, char='!', sep=sep, end=end, file=file, frame_index=2, **kvargs) cprint(*args, color=Fore.RED, char='!', sep=sep, end=end, file=file, frame_index=2, **kvargs)
def fail(*args, sep=' ', end='\n', file=sys.stderr, **kvargs): def fail(*args, sep=' ', end='\n', file=sys.stderr, **kvargs):
if config['accessible']: if config['accessible']:
args = ('Failure:',) + args args = ('Failure:',) + args
cprint(*args, color=Fore.RED, char='!', sep=sep, end=end, file=file, frame_index=2, **kvargs) cprint(*args, color=Fore.RED, char='!', sep=sep, end=end, file=file, frame_index=2, **kvargs)
exit(-1) exit(-1)
class CommandStreamReader(object): class CommandStreamReader(object):
def __init__(self, stream, target, tag, patterns=None, outfile=None, plugin=None): def __init__(self, stream, target, tag, patterns=None, outfile=None, plugin=None):
@ -119,11 +131,14 @@ class CommandStreamReader(object):
try: try:
line = (await self.stream.readline()).decode('utf8').rstrip() line = (await self.stream.readline()).decode('utf8').rstrip()
except ValueError: except ValueError:
error('{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} A line was longer than 64 KiB and cannot be processed. Ignoring.') error(
'{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} A line was longer than 64 KiB and cannot be processed. Ignoring.')
continue continue
if line != '': if line != '':
info('{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} ' + line.replace('{', '{{').replace('}', '}}'), verbosity=3) info(
'{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} ' + line.replace(
'{', '{{').replace('}', '}}'), verbosity=3)
# Check lines for pattern matches. # Check lines for pattern matches.
for p in self.patterns: for p in self.patterns:
@ -132,28 +147,22 @@ class CommandStreamReader(object):
async with self.target.lock: async with self.target.lock:
with open(os.path.join(self.target.scandir, '_patterns.log'), 'a') as file: with open(os.path.join(self.target.scandir, '_patterns.log'), 'a') as file:
if p.description: if p.description:
info('{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} {bmagenta}' + p.description.replace('{match}', match) + '{rst}', verbosity=2) info(
'{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} {bmagenta}' + p.description.replace(
'{match}', match) + '{rst}', verbosity=2)
file.writelines(p.description.replace('{match}', match) + '\n\n') file.writelines(p.description.replace('{match}', match) + '\n\n')
else: else:
info('{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} {bmagenta}Matched Pattern: ' + match + '{rst}', verbosity=2) info(
'{bright}[{yellow}' + self.target.address + '{crst}/{bgreen}' + self.tag + '{crst}]{rst} {bmagenta}Matched Pattern: ' + match + '{rst}',
verbosity=2)
file.writelines('Matched Pattern: ' + match + '\n\n') file.writelines('Matched Pattern: ' + match + '\n\n')
debug(str(self.plugin.__dict__)) next_plugins_to_run = p.get_next_service_scan_plugins(self.target.autorecon)
next_plugins = self.target.autorecon.get_next_service_scan_plugins(self.plugin) for next_plugin in next_plugins_to_run:
info(str(next_plugins)) # ugly way to get the service details somehow
for next_plugin in next_plugins:
info("Dict: %s" % str(self.target.__dict__))
for service, details in self.target.scans.get('services', {}).items(): for service, details in self.target.scans.get('services', {}).items():
for key, value in details.items(): for key, value in details.items():
if value.get('plugin') == self.plugin: if value.get('plugin') == self.plugin:
info("Value: %s" % str(value))
# info("Value: %s" % str(value))
#info("Service Details: %s" % str(details))
#new_service = Service()
self.target.autorecon.queue_new_service_scan(next_plugin, service) self.target.autorecon.queue_new_service_scan(next_plugin, service)
#for next_plugin in next_plugins:
# async def service_scan(plugin, service, run_from_service_scan=False):
#autorecon_queue_service_scan(next_plugin, run_fr)
if self.outfile is not None: if self.outfile is not None:
with open(self.outfile, 'a') as writer: with open(self.outfile, 'a') as writer:
writer.write(line + '\n') writer.write(line + '\n')

View File

@ -53,7 +53,7 @@ async def get_semaphore(autorecon):
async def service_scan(plugin, service, run_from_service_scan=False): async def service_scan(plugin, service, run_from_service_scan=False):
# skip running service scan plugins that are meant to be run for specific services # skip running service scan plugins that are meant to be run for specific services
if plugin.has_previous_plugins() and not run_from_service_scan: if not plugin.run_standalone and not run_from_service_scan:
return return
semaphore = service.target.autorecon.service_scan_semaphore semaphore = service.target.autorecon.service_scan_semaphore
@ -159,13 +159,23 @@ async def service_scan(plugin, service, run_from_service_scan=False):
class Pattern: class Pattern:
def __init__(self, pattern, description=None, plugins=None): def __init__(self, pattern, description=None, plugin_names=None):
self.pattern = pattern self.pattern = pattern
self.description = description self.description = description
if not plugins: if not plugin_names:
self.plugins = [] self.plugin_names = []
else: else:
self.plugins = plugins self.plugin_names = plugin_names
def get_next_service_scan_plugins(self, autorecon):
next_plugins = []
if not self.plugin_names:
return next_plugins
for service_plugin in autorecon.plugin_types['service']:
for next_plugin in self.plugin_names:
if next_plugin == service_plugin.name:
next_plugins.append(service_plugin)
return next_plugins
class Plugin(object): class Plugin(object):
@ -238,13 +248,13 @@ class Plugin(object):
return self.get_global_option(name, default) return self.get_global_option(name, default)
@final @final
def add_pattern(self, pattern, description=None, plugins=None): def add_pattern(self, pattern, description=None, plugin_names=None):
try: try:
compiled = re.compile(pattern) compiled = re.compile(pattern)
if description: if description:
self.patterns.append(Pattern(compiled, description=description, plugins=plugins)) self.patterns.append(Pattern(compiled, description=description, plugin_names=plugin_names))
else: else:
self.patterns.append(Pattern(compiled, plugins=plugins)) self.patterns.append(Pattern(compiled, plugin_names=plugin_names))
except re.error: except re.error:
fail('Error: The pattern "' + pattern + '" in the plugin "' + self.name + '" is invalid regex.') fail('Error: The pattern "' + pattern + '" in the plugin "' + self.name + '" is invalid regex.')
@ -265,6 +275,7 @@ class ServiceScan(Plugin):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.ports = {'tcp': [], 'udp': []} self.ports = {'tcp': [], 'udp': []}
self.run_standalone = True
self.ignore_ports = {'tcp': [], 'udp': []} self.ignore_ports = {'tcp': [], 'udp': []}
self.services = [] self.services = []
self.service_names = [] self.service_names = []
@ -543,21 +554,6 @@ class AutoRecon(object):
return process, cout, cerr return process, cout, cerr
def get_plugin_by_name(self, name):
for key, value in self.plugins.items():
if value.name == name:
return self.plugins[key]
def get_next_service_scan_plugins(self, current_plugin):
next_plugins = []
for plugin in self.plugin_types['service']:
if not plugin.has_previous_plugins():
continue
for previous_plugin_name in plugin.get_previous_plugin_names():
if current_plugin.name == previous_plugin_name:
next_plugins.append(plugin)
return next_plugins
def queue_new_service_scan(self, plugin, service): def queue_new_service_scan(self, plugin, service):
# try using append. in the main method "pending" is sometimes set() and sometimes list() # try using append. in the main method "pending" is sometimes set() and sometimes list()
self.pending.append(asyncio.create_task(service_scan(plugin, service, run_from_service_scan=True))) self.pending.append(asyncio.create_task(service_scan(plugin, service, run_from_service_scan=True)))

View File

@ -22,9 +22,11 @@ class DirectoryListingVerify(ServiceScan):
""" """
this is a useless plugin that is only run, if directory listing was found. this is a useless plugin that is only run, if directory listing was found.
""" """
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.name = "Directory Listing verify" self.run_standalone = False
self.name = "Directory Listing Verify"
self.tags = ['default', 'safe', 'http', 'test'] self.tags = ['default', 'safe', 'http', 'test']
def configure(self): def configure(self):