CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 18:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Only look for manager-type pillars

Browse Source 
* SID disabling is only managed globally for now, so don't give the option to edit a different pillar
This commit is contained in:
William Wernert
2021-02-22 10:38:53 -05:00
parent bb6f3107bc
commit f7bef9200b
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
salt/common/tools/sbin/so-rules
View File

@@ -44,11 +44,8 @@ def check_apply(args: dict):
return 0 return 0
def find_minion_pillar(minion_id: str) -> str: def find_minion_pillar() -> str:
if minion_id == None: regex = '^.*_(manager|standalone|import|eval)\.sls$'
regex = '^.*_(manager|standalone|import)\.sls$'
else:
regex = f'^{minion_id}\.sls$'
result = [] result = []
for root, _, files in os.walk(minion_pillar_dir): for root, _, files in os.walk(minion_pillar_dir):
@@ -57,22 +54,15 @@ def find_minion_pillar(minion_id: str) -> str:
result.append(os.path.join(root, f_minion_id)) result.append(os.path.join(root, f_minion_id))
if len(result) == 0: if len(result) == 0:
if minion_id == None: print_err('Could not find manager-type pillar (eval, standalone, manager, import.)')
print_err('Could not find minion pillar with minion id matching *_manager or *_standalone') print_err('Are you running this script on the manager?')
sys.exit(3)
else:
print_err(f'Could not find minion pillar for minion id: {minion_id}')
sys.exit(3) sys.exit(3)
elif len(result) > 1: elif len(result) > 1:
res_str = ', '.join(f'\"{result}\"') res_str = ', '.join(f'\"{result}\"')
if minion_id == None:
print_err('(This should not happen, the system is in an error state if you see this message.)') print_err('(This should not happen, the system is in an error state if you see this message.)')
print_err('More than one manager or standalone pillar exists, minion id\'s listed below:') print_err('More than one manager-type pillar exists, minion id\'s listed below:')
print_err(f' {res_str}') print_err(f' {res_str}')
sys.exit(3) sys.exit(3)
else:
print_err(f'Multiple minion pillars matched the minion id {minion_id}. Are you sure this is a complete minion id?')
sys.exit(3)
else: else:
return result[0] return result[0]
@@ -349,10 +339,6 @@ def main():
const=True, const=True,
required=False, required=False,
help="After updating rule configuration, apply the idstools state.") help="After updating rule configuration, apply the idstools state.")
main_parser.add_argument('--minion',
dest='minion_id',
required=False,
help='Defaults to manager (i.e. action applied to entire grid).')
subcommand_desc = textwrap.dedent( subcommand_desc = textwrap.dedent(
"""\ """\
@@ -427,8 +413,7 @@ def main():
if not hasattr(args, 'remove'): if not hasattr(args, 'remove'):
args.remove = False args.remove = False
args.pillar = find_minion_pillar(args.minion_id) args.pillar = find_minion_pillar()
if hasattr(args, 'func'): if hasattr(args, 'func'):
exit_code = args.func(args) exit_code = args.func(args)