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

[wip] Fix 'Nonetype' object is not callable error

Browse Source
This commit is contained in:
William Wernert
2021-07-28 14:28:00 -04:00
parent cf9121dfc2
commit 7ef5b39b04
1 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
salt/common/tools/sbin/so-learn
View File

@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from typing import List
import signal import signal
import sys import sys
@@ -23,12 +24,10 @@ import re
import subprocess import subprocess
import argparse import argparse
import textwrap import textwrap
from typing import List
import yaml import yaml
minion_pillar_dir = '/opt/so/saltstack/local/pillar/minions' minion_pillar_dir = '/opt/so/saltstack/local/pillar/minions'
salt_proc = subprocess.CompletedProcess = None salt_proc: subprocess.CompletedProcess = None
# Temp store of modules, will likely be broken out into salt # Temp store of modules, will likely be broken out into salt
learn_modules = [ learn_modules = [
@@ -80,19 +79,21 @@ def read_pillar(pillar: str):
def write_pillar(pillar: str, content: dict): def write_pillar(pillar: str, content: dict):
try: try:
with open(pillar, 'w') as f: with open(pillar, 'w') as f:
return yaml.dump(content, f, default_flow_style=False) yaml.dump(content, f, default_flow_style=False, sort_keys=False)
except: except:
print(f'Could not open {pillar}', file=sys.stderr) print(f'Could not open {pillar}', file=sys.stderr)
sys.exit(3) sys.exit(3)
def create_pillar_if_not_exist(pillar:str, content: dict): def create_pillar_if_not_exist(pillar:str, content: dict):
if content.get('learn', {}).get('modules') is None: pillar_dict = content
content['learn'] = {}
content['learn']['modules'] = learn_modules if pillar_dict.get('learn', {}).get('modules') is None:
pillar_dict['learn'] = {}
pillar_dict['learn']['modules'] = learn_modules
content.update()
write_pillar(pillar, content) write_pillar(pillar, content)
content.update()
return content return content
@@ -101,10 +102,10 @@ def apply(module_list: List):
for module in module_list: for module in module_list:
salt_cmd = ['salt-call', 'state.apply', '-l', 'quiet', f'learn.{module}', 'queue=True'] salt_cmd = ['salt-call', 'state.apply', '-l', 'quiet', f'learn.{module}', 'queue=True']
print(f' Applying salt state for {module} module...') print(f' Applying salt state for {module} module...')
cmd = subprocess.run(salt_cmd, stdout=subprocess.DEVNULL) salt_proc = subprocess.run(salt_cmd, stdout=subprocess.DEVNULL)
if cmd.returncode != 0: if salt_proc.returncode != 0:
print(f' [ERROR] Failed to apply salt state for {module} module.') print(f' [ERROR] Failed to apply salt state for {module} module.')
return_code = cmd.returncode return_code = salt_proc.returncode
return return_code return return_code
@@ -113,7 +114,6 @@ def check_apply(args: dict):
print('Configuration updated. Applying changes:') print('Configuration updated. Applying changes:')
return apply(args.modules) return apply(args.modules)
else: else:
if not hasattr(args, 'yes'):
message = 'Configuration updated. Would you like to apply your changes now? (y/N) ' message = 'Configuration updated. Would you like to apply your changes now? (y/N) '
answer = input(message) answer = input(message)
while answer.lower() not in [ 'y', 'n', '' ]: while answer.lower() not in [ 'y', 'n', '' ]:
@@ -123,8 +123,6 @@ def check_apply(args: dict):
else: else:
print('Applying changes:') print('Applying changes:')
return apply(args.modules) return apply(args.modules)
else:
return 0
def enable_disable_modules(args, enable: bool): def enable_disable_modules(args, enable: bool):
@@ -149,8 +147,8 @@ def enable_disable_modules(args, enable: bool):
args.pillar_dict.update() args.pillar_dict.update()
write_pillar(args.pillarm, args.pillar_dict) write_pillar(args.pillarm, args.pillar_dict)
salt_proc = check_apply(args) cmd_ret = check_apply(args)
return salt_proc return cmd_ret
def enable_modules(args): def enable_modules(args):
@@ -175,8 +173,6 @@ def main():
enable_apply_help = apply_help.replace('ACTION', 'enabling') enable_apply_help = apply_help.replace('ACTION', 'enabling')
disable_apply_help = apply_help.replace('ACTION', 'disabling') disable_apply_help = apply_help.replace('ACTION', 'disabling')
yes_help = 'Accept apply prompt.'
signal.signal(signal.SIGINT, sigint_handler) signal.signal(signal.SIGINT, sigint_handler)
if os.geteuid() != 0: if os.geteuid() != 0:
@@ -201,13 +197,11 @@ def main():
enable.set_defaults(func=enable_modules) enable.set_defaults(func=enable_modules)
enable.add_argument('modules', metavar='ML_MODULES', nargs='+', help=module_help_str) enable.add_argument('modules', metavar='ML_MODULES', nargs='+', help=module_help_str)
enable.add_argument('--apply', action='store_const', const=True, required=False, help=enable_apply_help) enable.add_argument('--apply', action='store_const', const=True, required=False, help=enable_apply_help)
enable.add_argument('--yes', '-y', action='store_const', const=True, required=False, help=yes_help)
disable = subparsers.add_parser('disable') disable = subparsers.add_parser('disable')
disable.set_defaults(func=disable_modules) disable.set_defaults(func=disable_modules)
disable.add_argument('modules', metavar='ML_MODULES', nargs='+', help=module_help_str) disable.add_argument('modules', metavar='ML_MODULES', nargs='+', help=module_help_str)
disable.add_argument('--apply', action='store_const', const=True, required=False, help=disable_apply_help) disable.add_argument('--apply', action='store_const', const=True, required=False, help=disable_apply_help)
disable.add_argument('--yes', '-y', action='store_const', const=True, required=False, help=yes_help)
list = subparsers.add_parser('list') list = subparsers.add_parser('list')
list.set_defaults(func=list_modules) list.set_defaults(func=list_modules)