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

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

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

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

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

{fosslight_binary-5.1.3 → fosslight_binary-5.1.5}/src/fosslight_binary/_binary.py

@@ -3,6 +3,7 @@
 # Copyright (c) 2020 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 from fosslight_util.oss_item import FileItem
+import urllib.parse
 
 EXCLUDE_TRUE_VALUE = "Exclude"
 TLSH_CHECKSUM_NULL = "0"
@@ -28,8 +29,9 @@ class BinaryItem(FileItem):
         self.vulnerability_items = []
         self.binary_name_without_path = ""
         self.bin_name_with_path = value
-        self.found_in_owasp = False
         self.is_binary = True
+        self.found_in_owasp = False
+        self.found_in_bin_db = False  # for debugging
 
     def __del__(self):
         pass
@@ -43,8 +45,8 @@ class BinaryItem(FileItem):
         self.oss_items.extend(new_oss_list)
 
     def get_vulnerability_items(self):
-        nvd_url = [vul_item.nvd_url for vul_item in self.vulnerability_items]
-        return ", ".join(nvd_url)
+        nvd_url = [urllib.parse.unquote(vul_item.nvd_url) for vul_item in self.vulnerability_items]
+        return ", ".join(nvd_url).strip()
 
     def get_print_binary_only(self):
         return (self.source_name_or_path + "\t" + self.checksum + "\t" + self.tlsh)

{fosslight_binary-5.1.3 → fosslight_binary-5.1.5}/src/fosslight_binary/_binary_dao.py

@@ -43,11 +43,20 @@ def get_oss_info_from_db(bin_info_list, dburl=""):
                 for idx, row in df_result.iterrows():
                     if not item.found_in_owasp:
                         oss_from_db = OssItem(row['ossname'], row['ossversion'], row['license'])
-                        bin_oss_items.append(oss_from_db)
+
+                        if bin_oss_items:
+                            if not any(oss_item.name == oss_from_db.name
+                                       and oss_item.version == oss_from_db.version
+                                       and oss_item.license == oss_from_db.license
+                                       for oss_item in bin_oss_items):
+                                bin_oss_items.append(oss_from_db)
+                        else:
+                            bin_oss_items.append(oss_from_db)
 
                 if bin_oss_items:
                     item.set_oss_items(bin_oss_items)
                     item.comment = "Binary DB result"
+                    item.found_in_binary = True
 
     disconnect_lge_bin_db()
     return bin_info_list, _cnt_auto_identified

{fosslight_binary-5.1.3 → fosslight_binary-5.1.5}/src/fosslight_binary/binary_analysis.py

@@ -132,7 +132,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 +195,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

{fosslight_binary-5.1.3 → fosslight_binary-5.1.5}/src/fosslight_binary.egg-info/PKG-INFO

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