fix playbook detection and module info (#167)

Signed-off-by: hirokuni-kitahara <[email protected]>

ansible_risk_insight/finder.py

@@ -360,6 +360,12 @@ def could_be_playbook_detail(body: str = "", data: list = None, fpath: str = "")
     if not body:
         return False
 
+    if not data:
+        return False
+
+    if not isinstance(data, list):
+        return False
+
     if len(data) == 0:
         return False
 

ansible_risk_insight/model_loader.py

@@ -667,7 +667,7 @@ def load_playbooks(path, basedir="", skip_playbook_format_error=True, skip_task_
     playbooks = []
     playbook_names = []
     for fpath in candidates:
-        if could_be_playbook(fpath) and could_be_playbook_detail(fpath):
+        if could_be_playbook(fpath=fpath) and could_be_playbook_detail(fpath=fpath):
             relative_path = ""
             if fpath.startswith(path):
                 relative_path = fpath[len(path) :]

ansible_risk_insight/risk_assessment_model.py

@@ -424,11 +424,13 @@ def search_module(self, name, exact_match=False, max_match=-1, collection_name="
         found_index = None
         if short_name in self.module_index and self.module_index[short_name]:
             from_indices = True
-            # look for the module index with FQCN
-            for possible_index in self.module_index[short_name]:
-                if possible_index["fqcn"] == name:
-                    found_index = possible_index
-                    break
+            # look for the module index with FQCN (only when `name` is FQCN)
+            if "." in name:
+                for possible_index in self.module_index[short_name]:
+                    if possible_index["fqcn"] == name:
+                        found_index = possible_index
+                        break
+
             # if any candidates don't match with FQCN, use the first index
             if not found_index:
                 found_index = self.module_index[short_name][0]

ansible_risk_insight/scanner.py

@@ -261,12 +261,26 @@ def __post_init__(self):
                 if self.playbook_yaml:
                     self.target_playbook_name = self.name
                 else:
-                    _, self.target_playbook_name = split_target_playbook_fullpath(self.name)
+                    if self.base_dir:
+                        basedir = self.base_dir
+                        target_playbook_path = self.name.replace(basedir, "")
+                        if target_playbook_path[0] == "/":
+                            target_playbook_path = target_playbook_path[1:]
+                        self.target_playbook_name = target_playbook_path
+                    else:
+                        _, self.target_playbook_name = split_target_playbook_fullpath(self.name)
             elif self.type == LoadType.TASKFILE:
                 if self.taskfile_yaml:
                     self.target_taskfile_name = self.name
                 else:
-                    _, self.target_taskfile_name = split_target_taskfile_fullpath(self.name)
+                    if self.base_dir:
+                        basedir = self.base_dir
+                        target_taskfile_path = self.name.replace(basedir, "")
+                        if target_taskfile_path[0] == "/":
+                            target_taskfile_path = target_taskfile_path[1:]
+                        self.target_taskfile_name = target_taskfile_path
+                    else:
+                        _, self.target_taskfile_name = split_target_taskfile_fullpath(self.name)
             self.__path_mappings = {
                 "src": os.path.join(self.root_dir, type_root, proj_name, "src"),
                 "root_definitions": os.path.join(

ansible_risk_insight/task_keywords.txt

@@ -38,4 +38,5 @@ throttle
 timeout
 until
 vars
-when
+when
+listen