bugfix for issue #40

master
Marcus Bakker 2020-12-21 15:23:21 +01:00
parent 46f43d9a4a
commit de357bf156
2 changed files with 8 additions and 3 deletions

View File

@ -505,8 +505,9 @@ def generate_group_heat_map(groups, overlay, overlay_type, platform, software_gr
health_is_called=health_is_called) health_is_called=health_is_called)
if not groups_file_type: if not groups_file_type:
return None # the groups_file_type is not of the type FILE_TYPE_GROUP_ADMINISTRATION return None # the groups_file_type is not of the type FILE_TYPE_GROUP_ADMINISTRATION
elif isinstance(groups, str): elif isinstance(groups[0], str) and len(groups) == 1:
# reached when the groups are provided via the interactive menu # reached when the groups are provided via the interactive menu, or when the CLI only contained one argument
groups = groups[0]
groups = groups.split(',') groups = groups.split(',')
groups = list(map(lambda x: x.strip().lower(), groups)) groups = list(map(lambda x: x.strip().lower(), groups))
else: # reached when the groups are provided via CLI arguments else: # reached when the groups are provided via CLI arguments

View File

@ -532,9 +532,13 @@ def _menu_groups():
eql_all_scores = not eql_all_scores eql_all_scores = not eql_all_scores
elif choice == '6': elif choice == '6':
generate_group_heat_map(groups, groups_overlay, overlay_type, default_platform, if groups_overlay == ['']:
groups_overlay = None
generate_group_heat_map([groups], groups_overlay, overlay_type, default_platform,
software_group, eql_query_visibility, eql_query_detection, False, software_group, eql_query_visibility, eql_query_detection, False,
None, None, include_all_score_objs=eql_all_scores) None, None, include_all_score_objs=eql_all_scores)
if groups_overlay is None:
groups_overlay = ['']
_wait() _wait()
elif choice == '9': elif choice == '9':
interactive_menu() interactive_menu()