fosslight-binary 5.1.5__tar.gz → 5.1.7__tar.gz

{fosslight_binary-5.1.5 → fosslight_binary-5.1.7}/PKG-INFO

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

{fosslight_binary-5.1.5 → fosslight_binary-5.1.7}/requirements.txt

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

{fosslight_binary-5.1.5 → fosslight_binary-5.1.7}/setup.py

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

{fosslight_binary-5.1.5 → fosslight_binary-5.1.7}/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:
@@ -44,9 +49,13 @@ class BinaryItem(FileItem):
         # Append New input OSS
         self.oss_items.extend(new_oss_list)
 
-    def get_vulnerability_items(self):
-        nvd_url = [urllib.parse.unquote(vul_item.nvd_url) for vul_item in self.vulnerability_items]
-        return ", ".join(nvd_url).strip()
+    def get_vulnerability_items(self, oss):
+        nvd_url = set([urllib.parse.unquote(vul_item.nvd_url) for vul_item in self.vulnerability_items])
+        nvd_url = ", ".join(nvd_url).strip()
+
+        if nvd_url and len(nvd_url) > MAX_EXCEL_URL_LENGTH:
+            oss.comment += f"\nExceeded the maximum vulnerability URL length of {MAX_EXCEL_URL_LENGTH} characters."
+        return nvd_url
 
     def get_print_binary_only(self):
         return (self.source_name_or_path + "\t" + self.checksum + "\t" + self.tlsh)
@@ -57,7 +66,7 @@ class BinaryItem(FileItem):
             for oss in self.oss_items:
                 lic = ",".join(oss.license)
                 exclude = EXCLUDE_TRUE_VALUE if (self.exclude or oss.exclude) else ""
-                nvd_url = self.get_vulnerability_items()
+                nvd_url = self.get_vulnerability_items(oss)
                 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.5 → fosslight_binary-5.1.7}/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
@@ -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.5 → fosslight_binary-5.1.7}/src/fosslight_binary.egg-info/PKG-INFO

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

{fosslight_binary-5.1.5 → fosslight_binary-5.1.7}/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.13
 dependency-check
 
 [:"darwin" in sys_platform]