Fix the bug if not generated the src/bin result

Signed-off-by: Jiyeong Seok <[email protected]>

Author: dd-jy

src/fosslight_scanner/cli.py

@@ -28,7 +28,7 @@ def main():
     parser.add_argument('--no_correction', help='No correction with sbom-info.yaml',
                         action='store_true', required=False, default=False)
     parser.add_argument('--correct_fpath', help='Path to the sbom-info.yaml',
-                        nargs=1, type=str, required=False, default='')
+                        type=str, required=False, default='')
 
     try:
         args = parser.parse_args()
@@ -42,7 +42,7 @@ def main():
     else:
         run_main(args.mode, args.path, args.dep_argument, args.output, args.file,
                  args.link, args.db_url, args.timer, args.raw, args.core,
-                 args.no_correction, args.correct_fpath)
+                 not args.no_correction, args.correct_fpath)
 
 
 if __name__ == "__main__":

src/fosslight_scanner/common.py

@@ -201,60 +201,66 @@ def merge_yamls(_output_dir, merge_yaml_files, final_report, remove_src_data=Fal
     return success, err_msg
 
 
-def correct_scanner_result(_output_dir, output_files):
+def correct_scanner_result(_output_dir, output_files, exist_src, exist_bin):
     src_oss_list = []
     bin_oss_list = []
+    duplicates = False
 
-    try:
+    if exist_src:
         src_oss_list = check_exclude_dir(get_osslist_with_xlsx(_output_dir, output_files['SRC'], SRC_SHEET))
+    if exist_bin:
         bin_oss_list = check_exclude_dir(get_osslist_with_xlsx(_output_dir, output_files['BIN'], BIN_SHEET))
 
-        duplicates = False
-        dup_bin_list = []
-        exclude_list = []
-        for src_item in src_oss_list:
-            dup_bin = ''
-            for idx, bin_item in enumerate(bin_oss_list):
-                if not src_item.source_name_or_path:
-                    continue
-                if src_item.source_name_or_path[0] == bin_item.source_name_or_path[0]:
-                    dup_bin = copy.deepcopy(bin_item)
-                    if not dup_bin.license:
-                        if dup_bin.exclude:
-                            src_item.exclude = dup_bin.exclude
-                        dup_bin.set_sheet_item(src_item.get_print_array()[0])
-                        if dup_bin.comment:
-                            dup_bin.comment += '/'
-                        dup_bin.comment += 'Loaded from SRC OSS info'
-                        dup_bin_list.append(dup_bin)
-                        exclude_list.append(idx)
-            if dup_bin:
-                src_item.exclude = True
-                if src_item.comment:
-                    src_item.comment += '/'
-                src_item.comment += 'Excluded by duplicated binary within BIN'
-                duplicates = True
-
-        exclude_list = list(set(exclude_list))
-        for idx in exclude_list:
-            bin_oss_list[idx].exclude = True
-            if bin_oss_list[idx].comment:
-                bin_oss_list[idx].comment += '/'
-            bin_oss_list[idx].comment += 'Excluded by SRC OSS info'
-        bin_oss_list.extend(dup_bin_list)
-
-        success, err_msg = write_xlsx_with_osslist(src_oss_list, _output_dir, output_files['SRC'], SRC_SHEET)
-        if not success:
-            logger.warning(err_msg)
-        success, err_msg = write_xlsx_with_osslist(bin_oss_list, _output_dir, output_files['BIN'], BIN_SHEET)
-        if not success:
-            logger.warning(err_msg)
+    if exist_src and exist_bin:
+        try:
+            dup_bin_list = []
+            exclude_list = []
+            for src_item in src_oss_list:
+                dup_bin = ''
+                for idx, bin_item in enumerate(bin_oss_list):
+                    if not src_item.source_name_or_path:
+                        continue
+                    if src_item.source_name_or_path[0] == bin_item.source_name_or_path[0]:
+                        dup_bin = copy.deepcopy(bin_item)
+                        if not dup_bin.license:
+                            if dup_bin.exclude:
+                                src_item.exclude = dup_bin.exclude
+                            dup_bin.set_sheet_item(src_item.get_print_array()[0])
+                            if dup_bin.comment:
+                                dup_bin.comment += '/'
+                            dup_bin.comment += 'Loaded from SRC OSS info'
+                            dup_bin_list.append(dup_bin)
+                            exclude_list.append(idx)
+                if dup_bin:
+                    src_item.exclude = True
+                    if src_item.comment:
+                        src_item.comment += '/'
+                    src_item.comment += 'Excluded by duplicated binary within BIN'
+                    duplicates = True
+
+            exclude_list = list(set(exclude_list))
+            for idx in exclude_list:
+                bin_oss_list[idx].exclude = True
+                if bin_oss_list[idx].comment:
+                    bin_oss_list[idx].comment += '/'
+                bin_oss_list[idx].comment += 'Excluded by SRC OSS info'
+            bin_oss_list.extend(dup_bin_list)
+        except Exception as ex:
+            logger.warning(f"correct the scanner result:{ex}")
+
+    try:
+        if exist_src:
+            success, err_msg = write_xlsx_with_osslist(src_oss_list, _output_dir, output_files['SRC'], SRC_SHEET)
+            if not success:
+                logger.warning(err_msg)
+        if exist_bin:
+            success, err_msg = write_xlsx_with_osslist(bin_oss_list, _output_dir, output_files['BIN'], BIN_SHEET)
+            if not success:
+                logger.warning(err_msg)
         if duplicates:
             logger.info('Success to correct the src/bin scanner result')
-
     except Exception as ex:
-        logger.warning(f"correct the scanner result:{ex}")
-
+        logger.warning(f"Corrected src/bin scanner result:{ex}")
     return
 
 

src/fosslight_scanner/fosslight_scanner.py

@@ -192,12 +192,19 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
     try:
         output_file_without_ext = os.path.join(final_excel_dir, output_file)
         final_report = f"{output_file_without_ext}{output_extension}"
-        tmp_dir = 'tmp'
+        tmp_dir = f"tmp_{datetime.now().strftime('%y%m%d_%H%M')}"
+        exist_src = False
+        exist_bin = False
         if correct_mode:
             os.makedirs(os.path.join(_output_dir, tmp_dir), exist_ok=True)
-            shutil.copy2(os.path.join(_output_dir, output_files['SRC']), os.path.join(_output_dir, tmp_dir))
-            shutil.copy2(os.path.join(_output_dir, output_files['BIN']), os.path.join(_output_dir, tmp_dir))
-            correct_scanner_result(_output_dir, output_files)
+            if os.path.exists(os.path.join(_output_dir, output_files['SRC'])):
+                exist_src = True
+                shutil.copy2(os.path.join(_output_dir, output_files['SRC']), os.path.join(_output_dir, tmp_dir))
+            if os.path.exists(os.path.join(_output_dir, output_files['BIN'])):
+                exist_bin = True
+                shutil.copy2(os.path.join(_output_dir, output_files['BIN']), os.path.join(_output_dir, tmp_dir))
+            if exist_src or exist_bin:
+                correct_scanner_result(_output_dir, output_files, exist_src, exist_bin)
         if output_extension == ".xlsx":
             if remove_src_data:
                 overwrite_excel(_output_dir, default_oss_name, "OSS Name")
@@ -208,9 +215,13 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
             success, err_msg = merge_yamls(_output_dir, merge_yaml_files, final_report,
                                            remove_src_data, default_oss_name, url)
         if correct_mode:
-            shutil.move(os.path.join(_output_dir, tmp_dir, output_files['SRC']), os.path.join(_output_dir, output_files['SRC']))
-            shutil.move(os.path.join(_output_dir, tmp_dir, output_files['BIN']), os.path.join(_output_dir, output_files['BIN']))
-            shutil.rmtree(os.path.join(_output_dir, tmp_dir), ignore_errors=False)
+            if exist_src:
+                shutil.move(os.path.join(_output_dir, tmp_dir, output_files['SRC']),
+                            os.path.join(_output_dir, output_files['SRC']))
+            if exist_bin:
+                shutil.move(os.path.join(_output_dir, tmp_dir, output_files['BIN']),
+                            os.path.join(_output_dir, output_files['BIN']))
+            shutil.rmtree(os.path.join(_output_dir, tmp_dir), ignore_errors=True)
         if success:
             if os.path.isfile(final_report):
                 result_log["Output File"] = final_report
@@ -282,17 +293,13 @@ def init(output_path="", make_outdir=True):
 
 
 def run_main(mode, path_arg, dep_arguments, output_file_or_dir, file_format, url_to_analyze, db_url,
-             hide_progressbar=False, keep_raw_data=False, num_cores=-1, no_correction=False, correct_fpath=""):
+             hide_progressbar=False, keep_raw_data=False, num_cores=-1, correct_mode=True, correct_fpath=""):
     global _executed_path, _start_time
 
     output_file = ""
     default_oss_name = ""
     src_path = ""
     _executed_path = os.getcwd()
-    correct_mode = True
-
-    if no_correction:
-        correct_mode = False
 
     if mode == "compare":
         CUSTOMIZED_FORMAT = {'excel': '.xlsx', 'html': '.html', 'json': '.json', 'yaml': '.yaml'}