remove unnecessary conversion to list

Author: Tenebriso

hubblestack/extmods/fileserver/s3fs.py

@@ -683,7 +683,7 @@ def _get_file():
             path_style=s3_key_kwargs['path_style'],
             https_enable=s3_key_kwargs['https_enable'])
         if ret:
-            for header_name, header_value in list(ret['headers'].items()):
+            for header_name, header_value in ret['headers'].items():
                 header_name = header_name.strip()
                 header_value = header_value.strip()
                 if six.text_type(header_name).lower() == 'last-modified':

hubblestack/extmods/grains/cloud_details.py

@@ -70,7 +70,7 @@ def _get_aws_details():
             r = requests.get('http://169.254.169.254/latest/meta-data/local-hostname', headers=aws_token_header, timeout=3, proxies=proxies)
             if r.status_code == requests.codes.ok:
                 aws_extra['cloud_private_hostname'] = r.text
-            for key in list(aws_extra.keys()):
+            for key in aws_extra.keys():
                 if not aws_extra[key]:
                     aws_extra.pop(key)
 

hubblestack/extmods/modules/conf_publisher.py

@@ -9,15 +9,16 @@
 
 log = logging.getLogger(__name__)
 
+
 def get_splunk_options(**kwargs):
     if not kwargs:
         kwargs['sourcetype'] = 'hubble_osquery'
     if '_nick' not in kwargs or not isinstance(kwargs['_nick'], dict):
         kwargs['_nick'] = {'sourcetype_nebula': 'sourcetype'}
     return gso(**kwargs)
 
-def publish(report_directly_to_splunk=True, remove_dots=True, *args):
 
+def publish(report_directly_to_splunk=True, remove_dots=True, *args):
     """
     Publishes config to splunk at an interval defined in schedule
 
@@ -44,7 +45,7 @@ def publish(report_directly_to_splunk=True, remove_dots=True, *args):
             opts_to_log.pop('grains')
     else:
         for arg in args:
-            if arg in  __opts__:
+            if arg in __opts__:
                 opts_to_log[arg] = __opts__[arg]
 
     filtered_conf = hubblestack.log.filter_logs(opts_to_log, remove_dots=remove_dots)
@@ -63,7 +64,7 @@ def _filter_config(opts_to_log, remove_dots=True):
     patterns_to_filter = ["password", "token", "passphrase", "privkey", "keyid", "s3.key"]
     filtered_conf = _remove_sensitive_info(opts_to_log, patterns_to_filter)
     if remove_dots:
-        for key in list(filtered_conf.keys()):
+        for key in filtered_conf.keys():
             if '.' in key:
                 filtered_conf[key.replace('.', '_')] = filtered_conf.pop(key)
     return filtered_conf

hubblestack/extmods/modules/hubble.py

@@ -333,7 +333,7 @@ def _run_audit(configs, tags, debug, labels, **kwargs):
     for failure_index in reversed(sorted(set(failures_to_remove))):
         results['Failure'].pop(failure_index)
 
-    for key in list(results.keys()):
+    for key in results.keys():
         if not results[key]:
             results.pop(key)
 
@@ -581,7 +581,7 @@ def _clean_up_results(results, show_success):
     if show_success was not passed, adding an error message if
     results is empty
     """
-    for key in list(results.keys()):
+    for key in results.keys():
         if not results[key]:
             results.pop(key)
 

hubblestack/extmods/modules/pulsar.py

@@ -558,16 +558,18 @@ def _wrapped(val):
     the_list = []
     for e in excludes:
         if isinstance(e,dict):
-            if list(e.values())[0].get('regex'):
-                r = list(e.keys())[0]
+            first_val = list(e.values())[0]
+            first_key = list(e.keys())[0]
+            if first_val.get('regex'):
+                r = first_key
                 try:
                     c = re.compile(r)
                     the_list.append(re_wrapper(c))
                 except Exception as e:
-                    log.warn('Failed to compile regex "%s": %s', r,e)
+                    log.warning('Failed to compile regex "%s": %s', r, e)
                 continue
             else:
-                e = list(e.keys())[0]
+                e = first_key
         if '*' in e:
             the_list.append(fn_wrapper(e))
         else:
@@ -576,7 +578,7 @@ def _wrapped(val):
     # finally, wrap the whole decision set in a decision wrapper
     def _final(val):
         for i in the_list:
-            if i( val ):
+            if i(val):
                 return True
         return False
     return _final
@@ -972,7 +974,7 @@ def _dict_update(dest, upd, recursive_update=True, merge_lists=False):
         return dest
     else:
         try:
-            for k in list(upd.keys()):
+            for k in upd.keys():
                 dest[k] = upd[k]
         except AttributeError:
             # this mapping is not a dict

hubblestack/extmods/returners/graylog_nebula_return.py

@@ -53,7 +53,7 @@ def returner(ret):
 
     for opts in opts_list:
         for query in ret['return']:
-            for query_name, value in list(query.items()):
+            for query_name, value in query.items():
                 for query_data in value['data']:
                     args = {'query': query_name,
                             'job_id': ret['jid'],

hubblestack/files/hubblestack_nova/misc.py

@@ -449,7 +449,7 @@ def check_duplicate_uids(reason=''):
     """
     uids = _execute_shell_command("cat /etc/passwd | cut -f3 -d\":\"", python_shell=True).strip()
     uids = uids.split('\n') if uids != "" else []
-    duplicate_uids = [k for k, v in list(Counter(uids).items()) if v > 1]
+    duplicate_uids = [k for k, v in Counter(uids).items() if v > 1]
     if duplicate_uids is None or duplicate_uids == []:
         return True
     return str(duplicate_uids)
@@ -461,7 +461,7 @@ def check_duplicate_gids(reason=''):
     """
     gids = _execute_shell_command("cat /etc/group | cut -f3 -d\":\"", python_shell=True).strip()
     gids = gids.split('\n') if gids != "" else []
-    duplicate_gids = [k for k, v in list(Counter(gids).items()) if v > 1]
+    duplicate_gids = [k for k, v in Counter(gids).items() if v > 1]
     if duplicate_gids is None or duplicate_gids == []:
         return True
     return str(duplicate_gids)
@@ -473,7 +473,7 @@ def check_duplicate_unames(reason=''):
     """
     unames = _execute_shell_command("cat /etc/passwd | cut -f1 -d\":\"", python_shell=True).strip()
     unames = unames.split('\n') if unames != "" else []
-    duplicate_unames = [k for k, v in list(Counter(unames).items()) if v > 1]
+    duplicate_unames = [k for k, v in Counter(unames).items() if v > 1]
     if duplicate_unames is None or duplicate_unames == []:
         return True
     return str(duplicate_unames)
@@ -485,7 +485,7 @@ def check_duplicate_gnames(reason=''):
     """
     gnames = _execute_shell_command("cat /etc/group | cut -f1 -d\":\"", python_shell=True).strip()
     gnames = gnames.split('\n') if gnames != "" else []
-    duplicate_gnames = [k for k, v in list(Counter(gnames).items()) if v > 1]
+    duplicate_gnames = [k for k, v in Counter(gnames).items() if v > 1]
     if duplicate_gnames is None or duplicate_gnames == []:
         return True
     return str(duplicate_gnames)

hubblestack/files/hubblestack_nova/oval_scanner.py

@@ -90,7 +90,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
 
 def parse_impact_report(report, local_pkgs, hubble_format, impacted_pkgs=[]):
     """Parse into Hubble friendly format"""
-    for key, value in list(report.items()):
+    for key, value in report.items():
         pkg_desc = 'Vulnerable Package(s): '
         for pkg in value['installed']:
             pkg_desc += '{0}-{1}, '.format(pkg['name'], pkg['version'])
@@ -125,7 +125,7 @@ def get_impact_report(vulns, local_pkgs, distro_name):
 def build_impact(vulns, local_pkgs, distro_name, result={}):
     """Build impacts based on pkg comparisons"""
     logging.debug('build_impact')
-    for data in list(vulns.values()):
+    for data in vulns.values():
         for pkg in data['pkg']:
             name = pkg['name']
             ver = pkg['version']
@@ -152,7 +152,7 @@ def build_impact(vulns, local_pkgs, distro_name, result={}):
 def build_impact_report(impact, report={}):
     """Build a report based on impacts"""
     logging.debug('build_impact_report')
-    for adv, detail in list(impact.items()):
+    for adv, detail in impact.items():
         if adv not in report:
             report[adv] = {
                 'updated_pkg': [],
@@ -187,7 +187,7 @@ def create_vulns(oval_and_maps, vulns={}):
     logging.debug('create_vulns')
     id_maps = oval_and_maps[0]
     oval = oval_and_maps[1]
-    for definition, data in list(id_maps.items()):
+    for definition, data in id_maps.items():
         if definition in oval['definitions']:
             vulns[definition] = oval['definitions'][definition]
             vulns[definition]['pkg'] = []
@@ -217,7 +217,7 @@ def create_vulns(oval_and_maps, vulns={}):
 def map_oval_ids(oval, id_maps={}):
     """For every test, grab only tests with both state and obj references"""
     logging.debug('map_oval_ids')
-    for definition, data in list(oval['definitions'].items()):
+    for definition, data in oval['definitions'].items():
         id_maps[definition] = {'objects': []}
         objects = id_maps[definition]['objects']
         tests = data['tests']

hubblestack/files/hubblestack_nova/stat_nova.py

@@ -112,7 +112,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
                     if e in tag_data:
                         expected[e] = tag_data[e]
 
-                if 'allow_more_strict' in list(expected.keys()) and 'mode' not in list(expected.keys()):
+                if 'allow_more_strict' in expected.keys() and 'mode' not in expected.keys():
                     reason_dict = {}
                     reason = "'allow_more_strict' tag can't be specified without 'mode' tag." \
                              " Seems like a bug in hubble profile."
@@ -129,7 +129,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
                 if not salt_ret:
                     if not expected:
                         ret['Success'].append(tag_data)
-                    elif 'match_on_file_missing' in list(expected.keys()) and expected['match_on_file_missing']:
+                    elif 'match_on_file_missing' in expected.keys() and expected['match_on_file_missing']:
                         ret['Success'].append(tag_data)
                     else:
                         tag_data['failure_reason'] = "Could not get access any file at '{0}'. " \
@@ -140,7 +140,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
 
                 passed = True
                 reason_dict = {}
-                for e in list(expected.keys()):
+                for e in expected.keys():
                     if e == 'allow_more_strict' or e == 'match_on_file_missing':
                         continue
                     r = salt_ret[e]
@@ -149,7 +149,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
                         if r != '0':
                             r = r[1:]
                         allow_more_strict = False
-                        if 'allow_more_strict' in list(expected.keys()):
+                        if 'allow_more_strict' in expected.keys():
                             allow_more_strict = expected['allow_more_strict']
                         if not isinstance(allow_more_strict, bool):
                             passed = False

hubblestack/files/hubblestack_nova/vulners_scanner.py

@@ -139,5 +139,5 @@ def _process_vulners(vulners):
 
     return [{'tag': 'Vulnerable package: {0}'.format(pkg),
              'vulnerabilities': packages[pkg],
-             'description': ', '.join(list(packages[pkg].keys()))}
+             'description': ', '.join(packages[pkg].keys())}
             for pkg in packages]

hubblestack/files/hubblestack_nova/win_reg.py

@@ -99,7 +99,7 @@ def audit(data_list, tags, labels, debug=False, **kwargs):
                     current = _find_option_value_in_reg(reg_dict['hive'], reg_dict['key'], reg_dict['value'])
                     if isinstance(current, dict):
                         tag_data['value_found'] = current
-                        if any(x is False for x in list(current.values())):
+                        if any(x is False for x in current.values()):
                             ret['Failure'].append(tag_data)
                         else:
                             answer_list = []

hubblestack/hec/opt.py

@@ -98,7 +98,7 @@ def _get_splunk_options(space, modality, **kw):
                     else:
                         final_opts[j] = opt[k]
 
-            if REQUIRED in list(final_opts.values()):
+            if REQUIRED in final_opts.values():
                 raise Exception('{0} must be specified in the {1} configs!'.format(req, space))
             ret.append(final_opts)
 

hubblestack/log.py

@@ -207,7 +207,7 @@ def filter_logs(opts_to_log, remove_dots=True):
     """
     filtered_conf = _remove_sensitive_info(opts_to_log, PATTERNS_TO_FILTER)
     if remove_dots:
-        for key in list(filtered_conf.keys()):
+        for key in filtered_conf.keys():
             if '.' in key:
                 filtered_conf[key.replace('.', '_')] = filtered_conf.pop(key)
     return filtered_conf

hubblestack/status.py

@@ -90,6 +90,7 @@ def get_hubble_status_opt(name, require_type=None):
     return opts
 
 
+
 def get_hubble_or_salt_opt(name):
     """return the option specified by name found in __opts__ or __opts__['hubble'] """
     if name in __opts__:
@@ -100,6 +101,7 @@ def get_hubble_or_salt_opt(name):
     return None
 
 
+
 class HubbleStatusResourceNotFound(Exception):
     """ Exception caused by trying to mark() a counter that wasn't explicitly defined
     """
@@ -411,9 +413,7 @@ def inner(*a, **kw):
                 ret = func(*a, **kw)
                 stat_handle.fin()
                 return ret
-
             return inner
-
         if invoke:
             return decorator(invoke)
         return decorator

tests/unittests/conftest.py

@@ -240,4 +240,4 @@ def pytest_sessionfinish(session, exitstatus):
         import subprocess
         p = subprocess.Popen(['chown', '-R', pcmf, sources_dir])
         p.communicate()
-        print(('\nchowned back files to {}'.format(pcmf)))
+        print('\nchowned back files to {}'.format(pcmf))

tests/unittests/test_counters.py

@@ -133,7 +133,7 @@ def __enter__(self):
         max_buckets = self.kwargs.pop('max_buckets', 1e3)
         namespace = self.kwargs.pop('namespace', 'x')
         if self.kwargs:
-            raise ValueError('unknown arguments: {}', ', '.join(list(self.kwargs.keys())))
+            raise ValueError('unknown arguments: {}', ', '.join(self.kwargs.keys()))
         opts = dict(bucket_len=bucket_len, max_buckets=max_buckets)
 
         # setup hubble_status

utils/win_yaml_updater.py

@@ -28,7 +28,7 @@ def ItemAdder(title, server, key, tag, match, vtype, desc,):
         print("There is more than 1 pdf in the folder")
         truefile = False
         while not truefile:
-            filename = eval(input('Path to PDF: '))
+            filename = input('Path to PDF: ')
             if os.path.isfile(filename):
                 truefile = True
             else:
@@ -38,7 +38,7 @@ def ItemAdder(title, server, key, tag, match, vtype, desc,):
 else:
     truefile = False
     while not truefile:
-        filename = eval(input('Path to PDF: '))
+        filename = input('Path to PDF: ')
         if os.path.isfile(filename):
             truefile = True
         else:
@@ -80,7 +80,7 @@ def ItemAdder(title, server, key, tag, match, vtype, desc,):
         print("There is more than 1 pdf in the folder")
         truefile = False
         while not truefile:
-            yamlname = eval(input('Path to YAML: '))
+            yamlname = input('Path to YAML: ')
             if os.path.isfile(filename):
                 truefile = True
             else:
@@ -90,7 +90,7 @@ def ItemAdder(title, server, key, tag, match, vtype, desc,):
 else:
     truefile = False
     while not truefile:
-        yamlname = eval(input('Path to yaml: '))
+        yamlname = input('Path to yaml: ')
         if os.path.isfile(filename):
             truefile = True
         else: