fosslight-binary 5.1.0__tar.gz → 5.1.2__tar.gz

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/PKG-INFO

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

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/requirements.txt

@@ -2,11 +2,11 @@ binaryornot
 numpy
 pandas
 parmap
-psycopg2-binary
+psycopg2-binary==2.9.9
 python-dateutil
 py-tlsh
 pytz
 XlsxWriter
 PyYAML
-fosslight_util>=2.1.0
+fosslight_util>=2.1.6
 dependency-check

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/setup.py

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

fosslight_binary-5.1.2/src/fosslight_binary/_simple_mode.py

@@ -0,0 +1,118 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# FOSSLight Binary analysis script
+# Copyright (c) 2024 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+import os
+import re
+import logging
+import zipfile
+import tarfile
+import fosslight_util.constant as constant
+from fosslight_util.write_txt import write_txt_file
+from fosslight_util.set_log import init_log
+
+REMOVE_FILE_EXTENSION_SIMPLE = ['ttf', 'otf', 'png', 'gif', 'jpg', 'bmp', 'jpeg']
+logger = logging.getLogger(constant.LOGGER_NAME)
+
+
+def is_compressed_file(filename):
+    if filename.lower().endswith('.jar'):
+        return False
+    return zipfile.is_zipfile(filename) or tarfile.is_tarfile(filename)
+
+
+def exclude_bin_for_simple_mode(binary_list):
+    bin_list = []
+    compressed_list = []
+
+    for bin in binary_list:
+        file_lower_case = bin.bin_name_with_path.lower()
+        extension = os.path.splitext(file_lower_case)[1][1:].strip()
+
+        if is_compressed_file(bin.bin_name_with_path):
+            compressed_list.append(bin.bin_name_with_path)
+            continue
+
+        remove_file_ext_list = REMOVE_FILE_EXTENSION_SIMPLE
+        if any(extension == remove_ext for remove_ext in remove_file_ext_list):
+            continue
+        if re.search(r".*sources\.jar", bin.bin_name_with_path.lower()) or bin.exclude:
+            continue
+
+        bin_list.append(bin.bin_name_with_path)
+    return compressed_list, bin_list
+
+
+def convert_list_to_str(input_list):
+    output_text = '\n'.join(map(str, input_list))
+    return output_text
+
+
+def check_output_path(output, start_time):
+    compressed_list_txt = ""
+    simple_bin_list_txt = ""
+    output_path = ""
+
+    if output != "":
+        if not os.path.isdir(output) and output.endswith('.txt'):
+            output_path = os.path.dirname(output)
+            basename = os.path.basename(output)
+            basename_file, _ = os.path.splitext(basename)
+            compressed_list_txt = f"{basename_file}_compressed_list.txt"
+            simple_bin_list_txt = f"{basename_file}.txt"
+        else:
+            output_path = output
+            compressed_list_txt = f"compressed_list_{start_time}.txt"
+            simple_bin_list_txt = f"binary_list_{start_time}.txt"
+    else:
+        compressed_list_txt = f"compressed_list_{start_time}.txt"
+        simple_bin_list_txt = f"binary_list_{start_time}.txt"
+
+    if output_path == "":
+        output_path = os.getcwd()
+    else:
+        output_path = os.path.abspath(output_path)
+
+    compressed_list_txt = os.path.join(output_path, compressed_list_txt)
+    simple_bin_list_txt = os.path.join(output_path, simple_bin_list_txt)
+
+    return output_path, compressed_list_txt, simple_bin_list_txt
+
+
+def init_simple(output_file_name, pkg_name, start_time):
+    global logger, _result_log
+
+    output_path, compressed_list_txt, simple_bin_list_txt = check_output_path(output_file_name, start_time)
+
+    log_file = os.path.join(output_path, f"fosslight_log_bin_{start_time}.txt")
+    logger, _result_log = init_log(log_file, False, logging.INFO, logging.DEBUG, pkg_name)
+
+    return _result_log, compressed_list_txt, simple_bin_list_txt
+
+
+def print_simple_mode(compressed_list_txt, simple_bin_list_txt, compressed_list, bin_list):
+    results = []
+    success = True
+    msg = ""
+    output_file = ""
+    if compressed_list:
+        success, error = write_txt_file(compressed_list_txt, convert_list_to_str(compressed_list))
+        if success:
+            output_file = compressed_list_txt
+        else:
+            msg = f"Error to write compressed list file for simple mode : {error}"
+        results.append(tuple([success, msg, output_file]))
+    if bin_list:
+        success, error = write_txt_file(simple_bin_list_txt, convert_list_to_str(bin_list))
+        if success:
+            output_file = simple_bin_list_txt
+        else:
+            msg = f"Error to write binary list file for simple mode : {error}"
+        results.append(tuple([success, msg, output_file]))
+    return results
+
+
+def filter_binary(bin_list):
+    compressed_list, bin_list = exclude_bin_for_simple_mode(bin_list)
+    return compressed_list, bin_list

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/src/fosslight_binary/binary_analysis.py

@@ -18,6 +18,7 @@ from fosslight_util.output_format import check_output_formats_v2, write_output_f
 from ._binary_dao import get_oss_info_from_db
 from ._binary import BinaryItem, TLSH_CHECKSUM_NULL
 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
 import hashlib
@@ -41,7 +42,7 @@ _REMOVE_DIR = ['.git']
 _REMOVE_DIR = [os.path.sep + dir_name + os.path.sep for dir_name in _REMOVE_DIR]
 _error_logs = []
 _root_path = ""
-_start_time = ""
+start_time = ""
 windows = False
 BYTES = 2048
 BIN_EXT_HEADER = {'BIN_FL_Binary': ['ID', 'Binary Path', 'OSS Name',
@@ -72,18 +73,9 @@ def get_checksum_and_tlsh(bin_with_path):
 
 
 def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
-    global _root_path, logger, _start_time
+    global logger, _result_log
 
     _json_ext = ".json"
-    _start_time = datetime.now().strftime('%y%m%d_%H%M')
-    _result_log = {
-        "Tool Info": PKG_NAME
-    }
-
-    _root_path = path_to_find_bin
-    if not path_to_find_bin.endswith(os.path.sep):
-        _root_path += os.path.sep
-
     success, msg, output_path, output_files, output_extensions, formats = check_output_formats_v2(output_file_name, formats)
 
     if success:
@@ -98,22 +90,25 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
         for i, output_extension in enumerate(output_extensions):
             if output_files[i] is None or output_files[i] == "":
                 if formats:
-                    if formats[i].startswith('spdx'):
-                        if platform.system() != 'Windows':
-                            output_files[i] = f"fosslight_spdx_bin_{_start_time}"
-                        else:
-                            logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
+                    if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
+                        if platform.system() == 'Windows':
+                            logger.warning(f'{formats[i]} is not supported on Windows. Please remove {formats[i]} from format.')
                             to_remove.append(i)
+                        else:
+                            if formats[i].startswith('spdx'):
+                                output_files[i] = f"fosslight_spdx_bin_{start_time}"
+                            elif formats[i].startswith('cyclonedx'):
+                                output_files[i] = f'fosslight_cyclonedx_bin_{start_time}'
                     else:
                         if output_extension == _json_ext:
-                            output_files[i] = f"fosslight_opossum_bin_{_start_time}"
+                            output_files[i] = f"fosslight_opossum_bin_{start_time}"
                         else:
-                            output_files[i] = f"fosslight_report_bin_{_start_time}"
+                            output_files[i] = f"fosslight_report_bin_{start_time}"
                 else:
                     if output_extension == _json_ext:
-                        output_files[i] = f"fosslight_opossum_bin_{_start_time}"
+                        output_files[i] = f"fosslight_opossum_bin_{start_time}"
                     else:
-                        output_files[i] = f"fosslight_report_bin_{_start_time}"
+                        output_files[i] = f"fosslight_report_bin_{start_time}"
         for index in sorted(to_remove, reverse=True):
             # remove elements of spdx format on windows
             del output_files[index]
@@ -127,7 +122,7 @@ def init(path_to_find_bin, output_file_name, formats, path_to_exclude=[]):
         logger.error(f"Format error - {msg}")
         sys.exit(1)
 
-    log_file = os.path.join(output_path, f"fosslight_log_bin_{_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, path_to_exclude)
 
@@ -176,6 +171,8 @@ def get_file_list(path_to_find, abs_path_to_exclude):
                 bin_item.exclude = True
             elif extension in _EXCLUDE_FILE_EXTENSION:
                 bin_item.exclude = True
+            elif file.startswith('.'):
+                bin_item.exclude = True
             bin_list.append(bin_item)
             file_cnt += 1
     return file_cnt, bin_list, found_jar
@@ -183,9 +180,21 @@ def get_file_list(path_to_find, abs_path_to_exclude):
 
 def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=False,
                   correct_mode=True, correct_filepath="", path_to_exclude=[]):
+    global start_time, _root_path, _result_log
 
-    _result_log, result_reports, output_extensions = init(
-        path_to_find_bin, output_dir, formats, path_to_exclude)
+    mode = "Normal Mode"
+    start_time = datetime.now().strftime('%y%m%d_%H%M')
+
+    _root_path = path_to_find_bin
+    if not path_to_find_bin.endswith(os.path.sep):
+        _root_path += os.path.sep
+
+    if simple_mode:
+        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(
+            path_to_find_bin, output_dir, formats, path_to_exclude)
 
     total_bin_cnt = 0
     total_file_cnt = 0
@@ -194,14 +203,14 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F
     writing_msg = ""
     results = []
     bin_list = []
-    base_dir_name = os.path.basename(path_to_find_bin)
     scan_item = ScannerItem(PKG_NAME, "")
-    abs_path_to_exclude = [os.path.abspath(os.path.join(base_dir_name, path)) for path in path_to_exclude if path.strip() != ""]
+    abs_path_to_exclude = [os.path.abspath(path) for path in path_to_exclude if path.strip() != ""]
 
     if not os.path.isdir(path_to_find_bin):
-        error_occured(error_msg=f"Can't find the directory : {path_to_find_bin}",
+        error_occured(error_msg=f"(-p option) Can't find the directory: {path_to_find_bin}",
                       result_log=_result_log,
-                      exit=True)
+                      exit=True,
+                      mode=mode)
     if not correct_filepath:
         correct_filepath = path_to_find_bin
     try:
@@ -210,12 +219,21 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F
     except Exception as ex:
         error_occured(error_msg=f"Failed to check whether it is binary or not : {ex}",
                       result_log=_result_log,
-                      exit=True)
-    total_bin_cnt = len(return_list)
+                      exit=True,
+                      mode=mode)
     if simple_mode:
-        bin_list = [bin.bin_name_with_path for bin in return_list]
+        try:
+            compressed_list, filtered_bin_list = filter_binary(return_list)
+            results = print_simple_mode(compressed_list_txt, simple_bin_list_txt, compressed_list, filtered_bin_list)
+            total_bin_cnt = len(filtered_bin_list)
+        except Exception as ex:
+            error_occured(error_msg=f"Failed to run simple mode: {ex}",
+                          result_log=_result_log,
+                          exit=True,
+                          mode="Simple mode")
     else:
-        scan_item = ScannerItem(PKG_NAME, _start_time)
+        total_bin_cnt = len(return_list)
+        scan_item = ScannerItem(PKG_NAME, start_time)
         scan_item.set_cover_pathinfo(path_to_find_bin, path_to_exclude)
         try:
             # Run OWASP Dependency-check
@@ -262,7 +280,7 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F
                 logger.error(f"Fail to generate result file.:{writing_msg}")
 
     try:
-        print_result_log(success=True, result_log=_result_log,
+        print_result_log(mode=mode, 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), bin_list=bin_list)
@@ -279,7 +297,7 @@ 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(error_msg=error_msg, exit=False)
+                        error_occured(modeerror_msg=error_msg, exit=False)
                 yield file_item
         except Exception as ex:
             logger.debug(f"Exception in get_file_list: {ex}")
@@ -317,21 +335,22 @@ def check_binary(file_with_path):
     return is_bin_confirmed
 
 
-def error_occured(error_msg, exit=False, result_log={}):
+def error_occured(error_msg, exit=False, result_log={}, mode="Normal mode"):
     global _error_logs
     _error_logs.append(error_msg)
     if exit:
-        print_result_log(success=False, result_log=result_log)
+        print_result_log(mode, success=False, result_log=result_log)
         sys.exit()
 
 
-def print_result_log(success=True, result_log={}, file_cnt="", bin_file_cnt="", auto_bin_cnt="", bin_list=[]):
+def print_result_log(mode="Normal Mode", 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"]
+        starttime = result_log["Running time"]
     else:
-        start_time = _start_time
-    result_log["Running time"] = start_time + " ~ " + \
+        starttime = start_time
+    result_log["Mode"] = mode
+    result_log["Running time"] = starttime + " ~ " + \
         datetime.now().strftime('%Y%m%d_%H%M%S')
     result_log["Execution result"] = 'Success' if success else 'Error occurred'
     result_log["Binaries / Scanned files"] = f"{bin_file_cnt}/{file_cnt}"

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/src/fosslight_binary/cli.py

@@ -5,6 +5,7 @@
 import argparse
 import sys
 import os
+import shutil
 from fosslight_util.help import print_package_version
 from fosslight_binary._help import print_help_msg
 from fosslight_binary.binary_analysis import find_binaries
@@ -13,6 +14,23 @@ from fosslight_util.timer_thread import TimerThread
 _PKG_NAME = "fosslight_binary"
 
 
+def get_terminal_size():
+    size = shutil.get_terminal_size()
+    return size.lines
+
+
+def paginate_file(file_path):
+    lines_per_page = get_terminal_size() - 1
+    with open(file_path, 'r', encoding='utf8') as file:
+        lines = file.readlines()
+
+    for i in range(0, len(lines), lines_per_page):
+        os.system('clear' if os.name == 'posix' else 'cls')
+        print(''.join(lines[i: i + lines_per_page]))
+        if i + lines_per_page < len(lines):
+            input("Press Enter to see the next page...")
+
+
 def main():
     global windows
     path_to_find_bin = ""
@@ -49,7 +67,7 @@ def main():
         print_package_version(_PKG_NAME, "FOSSLight Binary Scanner Version:")
         sys.exit(0)
 
-    if args.simple:
+    if args.simple:  # -s option
         simple_mode = True
 
     if args.path:   # -p option
@@ -85,8 +103,10 @@ def main():
         data_path = os.path.join(base_path, 'LICENSES')
         print(f"*** {_PKG_NAME} open source license notice ***")
         for ff in os.listdir(data_path):
-            f = open(os.path.join(data_path, ff), 'r', encoding='utf8')
-            print(f.read())
+            source_file = os.path.join(data_path, ff)
+            destination_file = os.path.join(base_path, ff)
+            paginate_file(source_file)
+            shutil.copyfile(source_file, destination_file)
         sys.exit(0)
 
     timer = TimerThread()

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/src/fosslight_binary.egg-info/PKG-INFO

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

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/src/fosslight_binary.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/fosslight_binary/_binary.py
 src/fosslight_binary/_binary_dao.py
 src/fosslight_binary/_help.py
 src/fosslight_binary/_jar_analysis.py
+src/fosslight_binary/_simple_mode.py
 src/fosslight_binary/binary_analysis.py
 src/fosslight_binary/cli.py
 src/fosslight_binary.egg-info/PKG-INFO

{fosslight_binary-5.1.0 → fosslight_binary-5.1.2}/src/fosslight_binary.egg-info/requires.txt

@@ -2,13 +2,13 @@ binaryornot
 numpy
 pandas
 parmap
-psycopg2-binary
+psycopg2-binary==2.9.9
 python-dateutil
 py-tlsh
 pytz
 XlsxWriter
 PyYAML
-fosslight_util>=2.1.0
+fosslight_util>=2.1.6
 dependency-check
 
 [:"darwin" in sys_platform]