fosslight-binary 5.1.23__tar.gz → 5.1.24__tar.gz

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_binary
-Version: 5.1.23
+Version: 5.1.24
 Summary: FOSSLight Binary Scanner
 Author: LG Electronics
 License-Expression: Apache-2.0
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSES/Apache-2.0.txt
 License-File: LICENSES/LicenseRef-3rd_party_licenses.txt
-Requires-Dist: binaryornot
+Requires-Dist: binaryornot==0.4.4
 Requires-Dist: chardet<5.0.0
 Requires-Dist: numpy
 Requires-Dist: pandas

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fosslight_binary"
-version = "5.1.23"
+version = "5.1.24"
 description = "FOSSLight Binary Scanner"
 readme = "README.md"
 license = "Apache-2.0"
@@ -25,7 +25,7 @@ classifiers = [
 ]
 requires-python = ">=3.10,<3.15"
 dependencies = [
-    "binaryornot",
+    "binaryornot==0.4.4",
     "chardet<5.0.0",
     "numpy",
     "pandas",

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/src/fosslight_binary/_help.py

@@ -8,7 +8,7 @@ from fosslight_util.output_format import SUPPORT_FORMAT
 _HELP_MESSAGE_BINARY = f"""
     📖 Usage
     ────────────────────────────────────────────────────────────────────
-    fosslight_bin [options] <arguments>
+    fosslight_binary [options] <arguments>
 
     📝 Description
     ────────────────────────────────────────────────────────────────────
@@ -26,13 +26,12 @@ _HELP_MESSAGE_BINARY = f"""
                            (multiple formats can be specified, separated by space)
     -e <pattern>           Exclude paths from analysis (files and directories)
                            ⚠️  IMPORTANT: Always wrap in quotes to avoid shell expansion
-                           Example: fosslight_bin -e "test/" "*.jar"
+                           Example: fosslight_binary -e "test/" "*.jar"
     -h                     Show this help message
     -v                     Show version information
 
     🔍 Scanner-Specific Options
     ────────────────────────────────────────────────────────────────────
-    -s                     Extract only the binary list in simple mode
     -d <db_url>            DB Connection (format: 'postgresql://user:pass@host:port/db')
     --notice               Print the open source license notice text
     --no_correction        Skip OSS information correction with sbom-info.yaml
@@ -41,19 +40,16 @@ _HELP_MESSAGE_BINARY = f"""
     💡 Examples
     ────────────────────────────────────────────────────────────────────
     # Scan current directory
-    fosslight_bin
+    fosslight_binary
 
     # Scan specific path with exclusions
-    fosslight_bin -p /path/to/binaries -e "test/" "*.so"
+    fosslight_binary -p /path/to/binaries -e "test/" "*.so"
 
     # Generate output in specific format
-    fosslight_bin -f excel -o results/
-
-    # Simple mode (extract binary list only)
-    fosslight_bin -s -o binary_list.txt
+    fosslight_binary -f excel -o results/
 
     # Connect to Binary DB for OSS information
-    fosslight_bin -d "postgresql://user:pass@localhost:5432/exampledb"
+    fosslight_binary -d "postgresql://user:pass@localhost:5432/exampledb"
 """
 
 

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/src/fosslight_binary/binary_analysis.py

@@ -33,8 +33,7 @@ PKG_NAME = "fosslight_binary"
 logger = logging.getLogger(constant.LOGGER_NAME)
 
 _REMOVE_FILE_EXTENSION = ['json', 'js']
-_REMOVE_FILE_COMMAND_RESULT = [
-    'data', 'timezone data', 'apple binary property list']
+_REMOVE_FILE_COMMAND_RESULT = ['timezone data', 'apple binary property list']
 INCLUDE_FILE_COMMAND_RESULT = ['current ar archive']
 
 _error_logs = []
@@ -128,6 +127,8 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
     logger, _result_log = init_log(log_file, True, logging.INFO, logging.DEBUG,
                                    PKG_NAME, path_to_find_bin, path_to_exclude)
 
+    logger.info(f"Tool Info : {_result_log['Tool Info']}")
+
     if not success:
         error_occured(error_msg=msg,
                       result_log=_result_log,
@@ -308,10 +309,10 @@ def return_bin_only(file_list, need_checksum_tlsh=True):
                 if need_checksum_tlsh:
                     file_item.checksum, file_item.tlsh, error_msg = get_checksum_and_tlsh(file_item.bin_name_with_path)
                     if error_msg:
-                        error_occured(modeerror_msg=error_msg, exit=False)
+                        error_occured(error_msg=error_msg, exit=False)
                 yield file_item
         except Exception as ex:
-            logger.debug(f"Exception in get_file_list: {ex}")
+            logger.debug(f"Exception in check_binary: {ex}")
             file_item.comment = "Exclude or delete if it is not binary."
             yield file_item
 
@@ -320,7 +321,7 @@ def check_binary(file_with_path, skip_remove_file_command_result: bool = False):
     """
     :param file_with_path: Path to the file to classify.
     :param skip_remove_file_command_result: If True, do not treat
-        _REMOVE_FILE_COMMAND_RESULT magic prefixes (e.g. 'data') as non-binary.
+        _REMOVE_FILE_COMMAND_RESULT magic prefixes as non-binary.
     """
     is_bin_confirmed = False
     file = os.path.basename(file_with_path)
@@ -336,7 +337,7 @@ def check_binary(file_with_path, skip_remove_file_command_result: bool = False):
             file_command_failed = True
         if file_command_failed:
             try:
-                file_command_result = magic.from_buffer(open(file_with_path).read(BYTES))
+                file_command_result = magic.from_buffer(open(file_with_path, 'rb').read(BYTES))
             except Exception as ex:
                 logger.debug(f"Failed to check file type:{file_with_path}, {ex}")
 
@@ -429,6 +430,6 @@ def print_result_log(mode="Normal Mode", success=True, result_log={}, file_cnt="
         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)
+        logger.info(_str_final_result_log.strip())
     except Exception as ex:
         logger.warning(f"Error to print final log: {ex}")

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/src/fosslight_binary/cli.py

@@ -43,7 +43,7 @@ def main():
     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('-s', '--simple', action='store_true', required=False, help=argparse.SUPPRESS)
     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)

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/src/fosslight_binary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_binary
-Version: 5.1.23
+Version: 5.1.24
 Summary: FOSSLight Binary Scanner
 Author: LG Electronics
 License-Expression: Apache-2.0
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSES/Apache-2.0.txt
 License-File: LICENSES/LicenseRef-3rd_party_licenses.txt
-Requires-Dist: binaryornot
+Requires-Dist: binaryornot==0.4.4
 Requires-Dist: chardet<5.0.0
 Requires-Dist: numpy
 Requires-Dist: pandas

{fosslight_binary-5.1.23 → fosslight_binary-5.1.24}/src/fosslight_binary.egg-info/requires.txt

@@ -1,4 +1,4 @@
-binaryornot
+binaryornot==0.4.4
 chardet<5.0.0
 numpy
 pandas