Add TLSH, SHA1 column for binary analysis

Author: bjk7119

requirements.txt

@@ -4,8 +4,8 @@ openpyxl
 progress
 pyyaml
 beautifulsoup4
-fosslight_util>=1.4.36
+fosslight_util>=1.4.41
 fosslight_source>=1.7.3
 fosslight_dependency>=3.7.4
-fosslight_binary>=4.1.24
+fosslight_binary>=4.1.28
 fosslight_prechecker>=3.0.1

src/fosslight_scanner/common.py

@@ -21,6 +21,11 @@
 logger = logging.getLogger(constant.LOGGER_NAME)
 SRC_SHEET = 'SRC_FL_Source'
 BIN_SHEET = 'BIN_FL_Binary'
+BIN_EXT_HEADER = {'BIN_FL_Binary': ['ID', 'Binary Name', 'OSS Name',
+                                    'OSS Version', 'License', 'Download Location',
+                                    'Homepage', 'Copyright Text', 'Exclude',
+                                    'Comment', 'Vulnerability Link', 'TLSH', 'SHA1']}
+BIN_HIDDEN_HEADER = {'TLSH', "SHA1"}
 
 
 def copy_file(source, destination):
@@ -250,7 +255,7 @@ def correct_scanner_result(_output_dir, output_files, output_extension, exist_sr
                 logger.warning(err_msg)
         if exist_bin:
             success, err_msg = write_output_with_osslist(bin_oss_list, _output_dir, output_files['BIN'],
-                                                         output_extension, BIN_SHEET)
+                                                         output_extension, BIN_SHEET, BIN_EXT_HEADER, BIN_HIDDEN_HEADER)
             if not success:
                 logger.warning(err_msg)
         if duplicates:
@@ -260,18 +265,19 @@ def correct_scanner_result(_output_dir, output_files, output_extension, exist_sr
     return
 
 
-def write_output_with_osslist(oss_list, output_dir, output_file, output_extension, sheetname):
+def write_output_with_osslist(oss_list, output_dir, output_file, output_extension, sheetname, extended_hdr={}, hidden_hdr={}):
     new_oss_list = []
     sheet_list = {}
     sheet_list[sheetname] = []
 
     for src_item in oss_list:
-        new_oss_list.append(src_item.get_print_array()[0])
+        scanner_name = constant.supported_sheet_and_scanner[sheetname]
+        new_oss_list.append(src_item.get_print_array(scanner_name)[0])
     sheet_list[sheetname].extend(new_oss_list)
     if os.path.exists(os.path.join(output_dir, output_file)):
         os.remove(os.path.join(output_dir, output_file))
     success, err_msg, _ = write_output_file(os.path.join(output_dir, output_file).rstrip(output_extension),
-                                            output_extension, sheet_list)
+                                            output_extension, sheet_list, extended_hdr, hidden_hdr)
     return success, err_msg
 
 

src/fosslight_scanner/fosslight_scanner.py

@@ -11,6 +11,7 @@
 import sys
 import shutil
 import shlex
+import subprocess
 from pathlib import Path
 from datetime import datetime
 from fosslight_binary import binary_analysis
@@ -26,9 +27,9 @@
                      overwrite_excel,
                      merge_yamls, correct_scanner_result,
                      create_scancodejson)
-from fosslight_util.write_excel import merge_excels
+from fosslight_util.write_excel import merge_excels, merge_cover_comment
 from ._run_compare import run_compare
-import subprocess
+from fosslight_util.cover import CoverItem
 fosslight_source_installed = True
 try:
     from fosslight_source.cli import run_scanners as source_analysis
@@ -188,6 +189,10 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
         output_file_without_ext = os.path.join(final_excel_dir, output_file)
         final_report = f"{output_file_without_ext}{output_extension}"
         merge_files = [output_files["SRC"], output_files["BIN"], output_files["DEP"]]
+        cover = CoverItem(tool_name=PKG_NAME,
+                          start_time=_start_time,
+                          input_path=abs_path)
+        cover.comment = merge_cover_comment(_output_dir, merge_files)
 
         if output_extension == ".xlsx":
             tmp_dir = f"tmp_{datetime.now().strftime('%y%m%d_%H%M')}"
@@ -208,7 +213,7 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                 overwrite_excel(_output_dir, default_oss_name, "OSS Name")
                 overwrite_excel(_output_dir, default_oss_version, "OSS Version")
                 overwrite_excel(_output_dir, url, "Download Location")
-            success, err_msg = merge_excels(_output_dir, final_report, merge_files)
+            success, err_msg = merge_excels(_output_dir, final_report, merge_files, cover)
 
             if correct_mode:
                 if exist_src: