fosslight-binary 4.1.20__tar.gz → 4.1.22__tar.gz

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_binary
-Version: 4.1.20
+Version: 4.1.22
 Summary: FOSSLight Binary Scanner
 Home-page: https://github.com/fosslight/fosslight_binary_scanner
 Author: LG Electronics

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/setup.py

@@ -33,7 +33,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='4.1.20',
+        version='4.1.22',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Binary Scanner',

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/src/fosslight_binary/_binary.py

@@ -27,7 +27,10 @@ class OssItem:
         self.comment = ""
 
     def set_comment(self, value):
-        self.comment += value
+        if self.comment:
+            self.comment = f"{self.comment} / {value}"
+        else:
+            self.comment = value
 
     def set_exclude(self, value):
         self.exclude = value
@@ -89,7 +92,10 @@ class BinaryItem:
         return ", ".join(nvd_url)
 
     def set_comment(self, value):
-        self.comment = value
+        if self.comment:
+            self.comment = f"{self.comment} / {value}"
+        else:
+            self.comment = value
 
     def set_bin_name(self, value):
         self.bin_name = value
@@ -110,16 +116,26 @@ class BinaryItem:
         return (self.binary_strip_root + "\t" + self.checksum + "\t" + self.tlsh)
 
     def get_oss_report(self):
+        comment = ""
         if len(self.oss_items) > 0:
             for oss in self.oss_items:
                 exclude = _EXCLUDE_TRUE_VALUE if (self.exclude or oss.exclude) else ""
                 nvd_url = self.get_vulnerability_items()
+
+                if self.comment:
+                    if oss.comment:
+                        comment = f"{self.comment} / {oss.comment}"
+                    else:
+                        comment = self.comment
+                else:
+                    comment = oss.comment
+
                 yield from [self.binary_strip_root, oss.name, oss.version,
-                            oss.license, oss.dl_url, '', '', exclude, oss.comment, nvd_url]
+                            oss.license, oss.dl_url, '', '', exclude, comment, nvd_url]
         else:
             exclude = _EXCLUDE_TRUE_VALUE if self.exclude else ""
             yield from [self.binary_strip_root, '',
-                        '', '', '', '', '', exclude, '']
+                        '', '', '', '', '', exclude, self.comment]
 
     def set_checksum_tlsh(self):
         self.checksum, self.tlsh, error, msg = get_checksum_and_tlsh(

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/src/fosslight_binary/_help.py

@@ -14,6 +14,7 @@ _HELP_MESSAGE_BINARY = """
         -p <binary_path>\t\t    Path to analyze binaries (Default: current directory)
         -h\t\t\t\t    Print help message
         -v\t\t\t\t    Print FOSSLight Binary Scanner version
+        -s\t\t\t\t    Extract only the binary list in simple mode
         -o <output_path>\t\t    Output path
         \t\t\t\t    (If you want to generate the specific file name, add the output path with file name.)
         -f <format>\t\t\t    Output file format (excel, csv, opossum, yaml)

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/src/fosslight_binary/binary_analysis.py

@@ -70,10 +70,10 @@ def init(path_to_find_bin, output_file_name, format):
             bin_txt_file = f"{output_file}.txt"
         else:
             if output_extension == _json_ext:
-                result_report = f"fosslight_opossum_{_start_time}"
+                result_report = f"fosslight_opossum_bin_{_start_time}"
             else:
-                result_report = f"fosslight_report_{_start_time}"
-            bin_txt_file = f"fosslight_binary_{_start_time}.txt"
+                result_report = f"fosslight_report_bin_{_start_time}"
+            bin_txt_file = f"fosslight_binary_bin_{_start_time}.txt"
 
         result_report = os.path.join(output_path, result_report)
         binary_txt_file = os.path.join(output_path, bin_txt_file)
@@ -81,7 +81,7 @@ def init(path_to_find_bin, output_file_name, format):
         logger.error(f"Format error - {msg}")
         sys.exit(1)
 
-    log_file = os.path.join(output_path, f"fosslight_log_{_start_time}.txt")
+    log_file = os.path.join(output_path, f"fosslight_log_bin_{_start_time}.txt")
     logger, _result_log = init_log(log_file, True, logging.INFO, logging.DEBUG, _PKG_NAME, path_to_find_bin)
 
     if not success:
@@ -125,7 +125,7 @@ def get_file_list(path_to_find):
     return file_cnt, bin_list, found_jar
 
 
-def find_binaries(path_to_find_bin, output_dir, format, dburl=""):
+def find_binaries(path_to_find_bin, output_dir, format, dburl="", simple_mode=False):
 
     _result_log, result_report, binary_txt_file, output_extension = init(
         path_to_find_bin, output_dir, format)
@@ -138,6 +138,7 @@ def find_binaries(path_to_find_bin, output_dir, format, dburl=""):
     extended_header = {}
     content_list = []
     result_file = ""
+    bin_list = []
 
     if not os.path.isdir(path_to_find_bin):
         error_occured(error_msg=f"Can't find the directory : {path_to_find_bin}",
@@ -151,39 +152,41 @@ def find_binaries(path_to_find_bin, output_dir, format, dburl=""):
                       result_log=_result_log,
                       exit=True)
     total_bin_cnt = len(return_list)
-    try:
-        # Run OWASP Dependency-check
-        if found_jar:
-            logger.info("Run OWASP Dependency-check to analyze .jar file")
-            owasp_items, vulnerability_items, success = analyze_jar_file(path_to_find_bin)
-            if success:
-                return_list = merge_binary_list(owasp_items, vulnerability_items, return_list)
-                extended_header = JAR_VUL_HEADER
-            else:
-                logger.warning("Could not find OSS information for some jar files.")
-
-        return_list, db_loaded_cnt = get_oss_info_from_db(return_list, dburl)
-        return_list = sorted(return_list, key=lambda row: (row.bin_name))
-
-        if return_list:
-            str_files = (x.get_print_binary_only() for x in return_list)
-            success, error = write_txt_file(binary_txt_file,
-                                            "Binary\tsha1sum\ttlsh\n" + '\n'.join(str_files))
-
-            if success:
-                _result_log["FOSSLight binary.txt"] = binary_txt_file
-            else:
-                error_occured(error_msg=error, exit=False)
-
-        sheet_list = {}
-        content_list = [list(item.get_oss_report()) for item in return_list]
-        sheet_list["BIN_FL_Binary"] = content_list
-
-        success_to_write, writing_msg, result_file = write_output_file(result_report, output_extension, sheet_list, extended_header)
-    except Exception as ex:
-        error_occured(error_msg=str(ex), exit=False)
+    if simple_mode:
+        bin_list = [bin.bin_name for bin in return_list]
+    else:
+        try:
+            # Run OWASP Dependency-check
+            if found_jar:
+                logger.info("Run OWASP Dependency-check to analyze .jar file")
+                owasp_items, vulnerability_items, success = analyze_jar_file(path_to_find_bin)
+                if success:
+                    return_list = merge_binary_list(owasp_items, vulnerability_items, return_list)
+                    extended_header = JAR_VUL_HEADER
+                else:
+                    logger.warning("Could not find OSS information for some jar files.")
+
+            return_list, db_loaded_cnt = get_oss_info_from_db(return_list, dburl)
+            return_list = sorted(return_list, key=lambda row: (row.bin_name))
+
+            if return_list:
+                str_files = (x.get_print_binary_only() for x in return_list)
+                success, error = write_txt_file(binary_txt_file,
+                                                "Binary\tsha1sum\ttlsh\n" + '\n'.join(str_files))
+
+                if success:
+                    _result_log["FOSSLight binary.txt"] = binary_txt_file
+                else:
+                    error_occured(error_msg=error, exit=False)
+
+            sheet_list = {}
+            content_list = [list(item.get_oss_report()) for item in return_list]
+            sheet_list["BIN_FL_Binary"] = content_list
+
+            success_to_write, writing_msg, result_file = write_output_file(result_report, output_extension, sheet_list, extended_header)
+        except Exception as ex:
+            error_occured(error_msg=str(ex), exit=False)
 
-    try:
         if success_to_write:
             if result_file:
                 logger.info(f"Output file :{result_file}")
@@ -192,10 +195,11 @@ def find_binaries(path_to_find_bin, output_dir, format, dburl=""):
         else:
             logger.error(f"Fail to generate result file.:{writing_msg}")
 
+    try:
         print_result_log(success=True, result_log=_result_log,
                          file_cnt=str(total_file_cnt),
                          bin_file_cnt=str(total_bin_cnt),
-                         auto_bin_cnt=str(db_loaded_cnt))
+                         auto_bin_cnt=str(db_loaded_cnt), bin_list=bin_list)
     except Exception as ex:
         error_occured(error_msg=f"Print log : {ex}", exit=False)
 
@@ -255,7 +259,7 @@ def error_occured(error_msg, exit=False, result_log={}):
         sys.exit()
 
 
-def print_result_log(success=True, result_log={}, file_cnt="", bin_file_cnt="", auto_bin_cnt=""):
+def print_result_log(success=True, result_log={}, file_cnt="", bin_file_cnt="", auto_bin_cnt="", bin_list=[]):
 
     if "Running time" in result_log:
         start_time = result_log["Running time"]
@@ -270,6 +274,8 @@ def print_result_log(success=True, result_log={}, file_cnt="", bin_file_cnt="",
         result_log["Error Log"] = _error_logs
         if success:
             result_log["Execution result"] += " but it has minor errors"
+    if bin_list:
+        result_log["Binary list"] = bin_list
     try:
         _str_final_result_log = yaml.safe_dump(result_log, allow_unicode=True, sort_keys=True)
         logger.info(_str_final_result_log)

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/src/fosslight_binary/cli.py

@@ -19,10 +19,12 @@ def main():
     output_dir = ""
     format = ""
     db_url = ""
+    simple_mode = False
 
     parser = argparse.ArgumentParser(add_help=False)
     parser.add_argument('-h', '--help', action='store_true', required=False)
     parser.add_argument('-v', '--version', action='store_true', required=False)
+    parser.add_argument('-s', '--simple', action='store_true', required=False)
     parser.add_argument('-p', '--path', type=str, required=False)
     parser.add_argument('-o', '--output', type=str, required=False)
     parser.add_argument('-d', '--dburl', type=str, default='', required=False)
@@ -42,6 +44,9 @@ def main():
         print_package_version(_PKG_NAME, "FOSSLight Binary Scanner Version:")
         sys.exit(0)
 
+    if args.simple:
+        simple_mode = True
+
     if args.path:   # -p option
         path_to_find_bin = args.path
     else:
@@ -73,7 +78,7 @@ def main():
     timer.setDaemon(True)
     timer.start()
 
-    find_binaries(path_to_find_bin, output_dir, format, db_url)
+    find_binaries(path_to_find_bin, output_dir, format, db_url, simple_mode)
 
 
 if __name__ == '__main__':

{fosslight_binary-4.1.20 → fosslight_binary-4.1.22}/src/fosslight_binary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-binary
-Version: 4.1.20
+Version: 4.1.22
 Summary: FOSSLight Binary Scanner
 Home-page: https://github.com/fosslight/fosslight_binary_scanner
 Author: LG Electronics