ESC step 4: move internal mods to internal named dirs

Author: jettero

hubblestack/extmods/__init__.py hubblestack/audit/__init__.py

@@ -170,9 +170,9 @@
 """
 import logging
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.extmods.module_runner.runner import Caller
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.module_runner.runner import Caller
+from hubblestack.exceptions import HubbleCheckValidationError
 from pyparsing import infixNotation, opAssoc, Keyword, Word, alphas, ParserElement
 
 log = logging.getLogger(__name__)

hubblestack/extmods/hubble_mods/bexpr.py hubblestack/audit/bexpr.py

@@ -246,8 +246,8 @@
 import logging
 import re
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 open_bracket_list = ["[", "{", "("]
 close_bracket_list = ["]", "}", ")"]

hubblestack/extmods/hubble_mods/command_line_parser.py hubblestack/audit/command_line_parser.py

@@ -224,10 +224,10 @@
 import logging
 import requests
 
-import hubblestack.extmods.module_runner.runner_factory as runner_factory
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
-from salt.exceptions import CommandExecutionError
+import hubblestack.module_runner.runner_factory as runner_factory
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
+from hubblestack.exceptions import CommandExecutionError
 
 log = logging.getLogger(__name__)
 

hubblestack/extmods/hubble_mods/curl.py hubblestack/audit/curl.py

@@ -180,9 +180,9 @@
 """
 import logging
 
-import hubblestack.extmods.module_runner.runner_factory as runner_factory
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_factory as runner_factory
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 

hubblestack/extmods/hubble_mods/fdg.py hubblestack/audit/fdg.py

@@ -189,9 +189,8 @@
 import os
 import logging
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
-from salt.exceptions import CommandExecutionError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError, CommandExecutionError
 
 log = logging.getLogger(__name__)
 
@@ -356,7 +355,7 @@ def _grep(path,
         cmd += [path]
 
     try:
-        ret = __salt__['cmd.run_all'](cmd, python_shell=False, ignore_retcode=True, stdin=string)
+        ret = __mods__['cmd.run_all'](cmd, python_shell=False, ignore_retcode=True, stdin=string)
     except (IOError, OSError) as exc:
         raise CommandExecutionError(exc.strerror)
 

hubblestack/extmods/hubble_mods/grep.py hubblestack/audit/grep.py

@@ -250,14 +250,14 @@
 
 import re
 
-from salt.exceptions import CommandExecutionError
+from hubblestack.exceptions import CommandExecutionError
 from collections import Counter
 
-import hubblestack.extmods.module_runner.comparator
-from hubblestack.extmods.module_runner.runner import Caller
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
-import hubblestack.extmods.hubble_mods.grep as grep_module
+import hubblestack.module_runner.comparator
+from hubblestack.module_runner.runner import Caller
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
+import hubblestack.audit.grep as grep_module
 
 log = logging.getLogger(__name__)
 
@@ -424,7 +424,7 @@ def _system_account_non_login(block_id, block_dict, extra_args=None):
         if user.strip() != "":
             users_list.append(user.strip())
     result = []
-    cmd = __salt__["cmd.run_all"]('egrep -v "^\+" /etc/passwd ')
+    cmd = __mods__["cmd.run_all"]('egrep -v "^\+" /etc/passwd ')
     for line in cmd['stdout'].split('\n'):
         tokens = line.split(':')
         if tokens[0] not in users_list and int(tokens[2]) < int(max_system_uid) and tokens[6] not in ( non_login_shell , "/bin/false" ):
@@ -567,7 +567,7 @@ def _check_directory_files_permission(block_id, block_dict, extra_args=None):
     return True if bad_permission_files == [] else str(bad_permission_files)
 
 def _compare_file_stats(block_id, path, permission):
-    path_details = __salt__['file.stats'](path)
+    path_details = __mods__['file.stats'](path)
 
     comparator_args = {
         "type": "file_permission",
@@ -576,7 +576,7 @@ def _compare_file_stats(block_id, path, permission):
         }
     }    
 
-    ret_status, ret_val = hubblestack.extmods.module_runner.comparator.run(
+    ret_status, ret_val = hubblestack.module_runner.comparator.run(
         block_id, comparator_args, path_details.get('mode'))
     return True if ret_status else path_details.get('mode')
 
@@ -603,13 +603,13 @@ def _check_service_status(block_id, block_dict, extra_args=None):
     service_name = runner_utils.get_param_for_module(block_id, block_dict, 'service_name')
     state = runner_utils.get_param_for_module(block_id, block_dict, 'state')
 
-    all_services = __salt__['cmd.run']('systemctl list-unit-files')
+    all_services = __mods__['cmd.run']('systemctl list-unit-files')
     if re.search(service_name, all_services, re.M):
-        output = __salt__['cmd.retcode']('systemctl is-enabled ' + service_name, ignore_retcode=True)
+        output = __mods__['cmd.retcode']('systemctl is-enabled ' + service_name, ignore_retcode=True)
         if (state == "disabled" and str(output) == "1") or (state == "enabled" and str(output) == "0"):
             return True
         else:
-            return __salt__['cmd.run_stdout']('systemctl is-enabled ' + service_name, ignore_retcode=True)
+            return __mods__['cmd.run_stdout']('systemctl is-enabled ' + service_name, ignore_retcode=True)
     else:
         if state == "disabled":
             return True
@@ -665,7 +665,7 @@ def _check_users_home_directory_permissions(block_id, block_dict, extra_args=Non
             users_list.append(user.strip())
 
     users_dirs = []
-    cmd = __salt__["cmd.run_all"]('egrep -v "^\+" /etc/passwd ')
+    cmd = __mods__["cmd.run_all"]('egrep -v "^\+" /etc/passwd ')
     for line in cmd['stdout'].split('\n'):
         tokens = line.split(':')
         if tokens[0] not in users_list and 'nologin' not in tokens[6] and 'false' not in tokens[6]:
@@ -712,7 +712,7 @@ def _check_users_own_their_home(block_id, block_dict, extra_args=None):
                     error += ["Either home directory " + user_uid_dir[2] + " of user " + user_uid_dir[0] + " is invalid or does not exist."]
             elif int(user_uid_dir[1]) >= max_system_uid and user_uid_dir[0] != "nfsnobody" and 'nologin' not in user_uid_dir[3] \
                     and 'false' not in user_uid_dir[3]:
-                owner = __salt__['cmd.run']("stat -L -c \"%U\" \"" + user_uid_dir[2] + "\"")
+                owner = __mods__['cmd.run']("stat -L -c \"%U\" \"" + user_uid_dir[2] + "\"")
                 if owner != user_uid_dir[0]:
                     error += ["The home directory " + user_uid_dir[2] + " of user " + user_uid_dir[0] + " is owned by " + owner]
         else:
@@ -737,7 +737,7 @@ def _check_users_dot_files(block_id, block_dict, extra_args):
             dot_files = dot_files.split('\n') if dot_files != "" else []
             for dot_file in dot_files:
                 if os.path.isfile(dot_file):
-                    path_details = __salt__['file.stats'](dot_file)
+                    path_details = __mods__['file.stats'](dot_file)
                     given_permission = path_details.get('mode')
                     file_permission = given_permission[-3:]
                     if file_permission[1] in ["2", "3", "6", "7"]:
@@ -1031,7 +1031,7 @@ def _check_sshd_parameters(block_id, block_dict, extra_args=None):
     values = runner_utils.get_param_for_module(block_id, block_dict, 'values')
     comparetype = runner_utils.get_param_for_module(block_id, block_dict, 'comparetype', 'regex')
 
-    output = __salt__['cmd.run']('sshd -T')
+    output = __mods__['cmd.run']('sshd -T')
     if comparetype == 'only':
         if not values:
             return "You need to provide values for comparetype 'only'."
@@ -1079,5 +1079,5 @@ def _execute_shell_command(cmd, python_shell=False):
     """
     This function will execute passed command in /bin/shell
     """
-    return __salt__['cmd.run'](cmd, python_shell=python_shell, shell='/bin/bash', ignore_retcode=True)
+    return __mods__['cmd.run'](cmd, python_shell=python_shell, shell='/bin/bash', ignore_retcode=True)
 

hubblestack/extmods/hubble_mods/misc.py hubblestack/audit/misc.py

@@ -186,8 +186,8 @@
 import logging
 import os
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 
@@ -309,7 +309,7 @@ def _osquery(block_id, query, osquery_path=None, args=None, cast_to_string=None)
         cmd.extend(args)
 
     # Run the command
-    res = __salt__['cmd.run_all'](cmd, timeout=10000, python_shell=False)
+    res = __mods__['cmd.run_all'](cmd, timeout=10000, python_shell=False)
     if res['retcode'] == 0:
         ret = json.loads(res['stdout'])
         for result in ret:

hubblestack/extmods/hubble_mods/osquery.py hubblestack/audit/osquery.py

@@ -181,8 +181,8 @@
 import logging
 import fnmatch
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 
@@ -239,7 +239,7 @@ def execute(block_id, block_dict, extra_args=None):
     if not name:
         name = runner_utils.get_param_for_module(block_id, block_dict, 'name')
 
-    installed_pkgs_dict = __salt__['pkg.list_pkgs']()
+    installed_pkgs_dict = __mods__['pkg.list_pkgs']()
     filtered_pkgs_list = fnmatch.filter(installed_pkgs_dict, name)
     result_dict = {}
     for package in filtered_pkgs_list:

hubblestack/extmods/hubble_mods/pkg.py hubblestack/audit/pkg.py

@@ -229,8 +229,8 @@
 import re
 
 from hubblestack.utils.encoding import encode_base64
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 

hubblestack/extmods/hubble_mods/readfile.py hubblestack/audit/readfile.py

@@ -185,8 +185,8 @@
 import logging
 import fnmatch
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 
@@ -245,10 +245,10 @@ def execute(block_id, block_dict, extra_args=None):
         name = runner_utils.get_param_for_module(block_id, block_dict, 'name')
 
     result = []
-    matched_services = fnmatch.filter(__salt__['service.get_all'](), name)
+    matched_services = fnmatch.filter(__mods__['service.get_all'](), name)
     for matched_service in matched_services:
-        service_status = __salt__['service.status'](matched_service)
-        is_enabled = __salt__['service.enabled'](matched_service)
+        service_status = __mods__['service.status'](matched_service)
+        is_enabled = __mods__['service.enabled'](matched_service)
         result.append({
             "name": matched_service,
             "running": service_status,

hubblestack/extmods/hubble_mods/service.py hubblestack/audit/service.py

@@ -217,8 +217,8 @@
 from datetime import datetime
 from socket import setdefaulttimeout
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 

hubblestack/extmods/hubble_mods/ssl_certificate.py hubblestack/audit/ssl_certificate.py

@@ -197,8 +197,8 @@
 import os
 import logging
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 
@@ -257,7 +257,7 @@ def execute(block_id, block_dict, extra_args=None):
     if not os.path.isfile(filepath):
         return runner_utils.prepare_negative_result_for_module(block_id, 'file_not_found')
 
-    stat_res = __salt__['file.stats'](filepath)
+    stat_res = __mods__['file.stats'](filepath)
     return runner_utils.prepare_positive_result_for_module(block_id, stat_res)
 
 

hubblestack/extmods/hubble_mods/stat.py hubblestack/audit/stat.py

@@ -171,8 +171,8 @@
 
 import logging
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 
@@ -229,7 +229,7 @@ def execute(block_id, block_dict, extra_args=None):
     if not name:
         name = runner_utils.get_param_for_module(block_id, block_dict, 'name')
 
-    sysctl_res = __salt__['sysctl.get'](name)
+    sysctl_res = __mods__['sysctl.get'](name)
     result = {name: sysctl_res}
     if not sysctl_res or "No such file or directory" in sysctl_res:
         return runner_utils.prepare_negative_result_for_module(block_id, "Could not find attribute %s in the kernel" %(name))

hubblestack/extmods/hubble_mods/sysctl.py hubblestack/audit/sysctl.py

@@ -201,12 +201,12 @@
 
 import logging
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
-import salt.utils.platform
+import hubblestack.utils.platform
 
-if not salt.utils.platform.is_windows():
+if not hubblestack.utils.platform.is_windows():
     import ntplib
 log = logging.getLogger(__name__)
 
@@ -324,8 +324,8 @@ def _query_ntp_server(ntp_server):
         string containing the NTP server to query
     """
     # use w32tm instead of ntplib
-    if salt.utils.platform.is_windows():
-        ret = __salt__['cmd.run']('w32tm /stripchart /computer:{0} /dataonly /samples:1'.format(
+    if hubblestack.utils.platform.is_windows():
+        ret = __mods__['cmd.run']('w32tm /stripchart /computer:{0} /dataonly /samples:1'.format(
             ntp_server))
         try:
             return float(ret.split('\n')[-1].split()[1][:-1])

hubblestack/extmods/hubble_mods/time_sync.py hubblestack/audit/time_sync.py

@@ -263,12 +263,10 @@
 import logging
 import re
 
-from salt.exceptions import ArgumentValueError
 from hubblestack.utils.encoding import encode_base64 as utils_encode_base64
-
-from hubblestack.extmods.module_runner.runner import Caller
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+from hubblestack.module_runner.runner import Caller
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError, ArgumentValueError
 
 log = logging.getLogger(__name__)
 

hubblestack/extmods/hubble_mods/util.py hubblestack/audit/util.py

@@ -169,16 +169,16 @@
 
 import csv
 import logging
-import salt.utils.platform
+import hubblestack.utils.platform
 
-import hubblestack.extmods.module_runner.runner_utils as runner_utils
-from hubblestack.utils.hubble_error import HubbleCheckValidationError
+import hubblestack.module_runner.runner_utils as runner_utils
+from hubblestack.exceptions import HubbleCheckValidationError
 
 log = logging.getLogger(__name__)
 
 
 def __virtual__():
-    if not salt.utils.platform.is_windows():
+    if not hubblestack.utils.platform.is_windows():
         return False, 'This audit module only runs on windows'
     return True
 
@@ -276,11 +276,11 @@ def _auditpol_import():
 
 def _auditpol_export():
     try:
-        dump = __salt__['cmd.run']('auditpol /get /category:* /r')
+        dump = __mods__['cmd.run']('auditpol /get /category:* /r')
         if dump:
             dump = dump.split('\n')
             return dump
         else:
             log.error('Nothing was returned from the auditpol command.')
     except Exception:
-        log.error('An error occurred running the auditpol command.')
+        log.error('An error occurred running the auditpol command.')