fosslight-binary 5.1.4__tar.gz → 5.1.6__tar.gz

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/PKG-INFO

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

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/requirements.txt

@@ -8,5 +8,5 @@ py-tlsh
 pytz
 XlsxWriter
 PyYAML
-fosslight_util>=2.1.6
+fosslight_util>=2.1.10
 dependency-check

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/setup.py

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

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/src/fosslight_binary/_binary.py

@@ -4,9 +4,14 @@
 # SPDX-License-Identifier: Apache-2.0
 from fosslight_util.oss_item import FileItem
 import urllib.parse
+import logging
+import fosslight_util.constant as constant
 
 EXCLUDE_TRUE_VALUE = "Exclude"
 TLSH_CHECKSUM_NULL = "0"
+MAX_EXCEL_URL_LENGTH = 255
+
+logger = logging.getLogger(constant.LOGGER_NAME)
 
 
 class VulnerabilityItem:
@@ -58,6 +63,11 @@ class BinaryItem(FileItem):
                 lic = ",".join(oss.license)
                 exclude = EXCLUDE_TRUE_VALUE if (self.exclude or oss.exclude) else ""
                 nvd_url = self.get_vulnerability_items()
+                if nvd_url and len(nvd_url) > MAX_EXCEL_URL_LENGTH:
+                    logger.info(f"self.source_name_or_path: {self.source_name_or_path}")
+                    logger.info(f"oss name: {oss.name}")
+                    logger.info(f"length_url:{len(nvd_url)}, nvd_url: {nvd_url}")
+                    nvd_url = nvd_url[:242] + '...(truncated)'
                 items.append([self.source_name_or_path, oss.name, oss.version,
                               lic, oss.download_location, oss.homepage,
                               oss.copyright, exclude, oss.comment,

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/src/fosslight_binary/binary_analysis.py

@@ -21,6 +21,7 @@ from ._jar_analysis import analyze_jar_file, merge_binary_list
 from ._simple_mode import print_simple_mode, filter_binary, init_simple
 from fosslight_util.correct import correct_with_yaml
 from fosslight_util.oss_item import ScannerItem
+from fosslight_util.exclude import excluding_files
 import hashlib
 import tlsh
 from io import open
@@ -132,7 +133,7 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
         error_occured(error_msg=msg,
                       result_log=_result_log,
                       exit=True)
-    return _result_log, combined_paths_and_files, output_extensions
+    return _result_log, combined_paths_and_files, output_extensions, formats
 
 
 def get_file_list(path_to_find, abs_path_to_exclude):
@@ -195,7 +196,7 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F
         mode = "Simple Mode"
         _result_log, compressed_list_txt, simple_bin_list_txt = init_simple(output_dir, PKG_NAME, start_time)
     else:
-        _result_log, result_reports, output_extensions = init(
+        _result_log, result_reports, output_extensions, formats = init(
             path_to_find_bin, output_dir, formats, path_to_exclude)
 
     total_bin_cnt = 0
@@ -206,7 +207,8 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F
     results = []
     bin_list = []
     scan_item = ScannerItem(PKG_NAME, "")
-    abs_path_to_exclude = [os.path.abspath(path) for path in path_to_exclude if path.strip() != ""]
+    exclude_path = excluding_files(path_to_exclude, path_to_find_bin)
+    abs_path_to_exclude = [os.path.abspath(path) for path in exclude_path]
 
     if not os.path.isdir(path_to_find_bin):
         error_occured(error_msg=f"(-p option) Can't find the directory: {path_to_find_bin}",

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/src/fosslight_binary.egg-info/PKG-INFO

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

{fosslight_binary-5.1.4 → fosslight_binary-5.1.6}/src/fosslight_binary.egg-info/requires.txt

@@ -8,7 +8,7 @@ py-tlsh
 pytz
 XlsxWriter
 PyYAML
-fosslight_util>=2.1.6
+fosslight_util>=2.1.10
 dependency-check
 
 [:"darwin" in sys_platform]