From 444a2cfc0d0a1dddccc254506d71b2bfd76889f0 Mon Sep 17 00:00:00 2001 From: Soim Date: Tue, 20 Jan 2026 12:05:58 +0900 Subject: [PATCH 1/2] Replace default exclusion to FL_Util --- requirements.txt | 2 +- src/fosslight_binary/binary_analysis.py | 20 +++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2a84162..bda1214 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ py-tlsh pytz XlsxWriter PyYAML -fosslight_util>=2.1.35 +fosslight_util>=2.1.37 diff --git a/src/fosslight_binary/binary_analysis.py b/src/fosslight_binary/binary_analysis.py index 11733b4..5f399d4 100755 --- a/src/fosslight_binary/binary_analysis.py +++ b/src/fosslight_binary/binary_analysis.py @@ -31,16 +31,10 @@ PKG_NAME = "fosslight_binary" logger = logging.getLogger(constant.LOGGER_NAME) -_REMOVE_FILE_EXTENSION = ['qm', 'xlsx', 'pdf', 'pptx', 'jfif', 'docx', 'doc', 'whl', - 'xls', 'xlsm', 'ppt', 'mp4', 'pyc', 'plist', 'dat', 'json', 'js'] _REMOVE_FILE_COMMAND_RESULT = [ 'data', 'timezone data', 'apple binary property list'] INCLUDE_FILE_COMMAND_RESULT = ['current ar archive'] -_EXCLUDE_FILE_EXTENSION = ['class'] -_EXCLUDE_FILE = ['fosslight_bin', 'fosslight_bin.exe'] -_EXCLUDE_DIR = ['intermediates'] -_EXCLUDE_DIR = [os.path.sep + dir_name + os.path.sep for dir_name in _EXCLUDE_DIR] -_EXCLUDE_DIR.append("/.") + _error_logs = [] _root_path = "" start_time = "" @@ -173,14 +167,6 @@ def get_file_list(path_to_find, abs_path_to_exclude): bin_list.append(bin_item) continue - if any(dir_name in dir_path for dir_name in _EXCLUDE_DIR): - bin_item.exclude = True - elif file.lower() in _EXCLUDE_FILE: - 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 @@ -214,7 +200,7 @@ def find_binaries(path_to_find_bin, output_dir, formats, dburl="", simple_mode=F scan_item = ScannerItem(PKG_NAME, "") excluded_path_with_default_exclusion, excluded_path_without_dot, excluded_files, cnt_file_except_skipped \ - = get_excluded_paths(path_to_find_bin, path_to_exclude + _EXCLUDE_DIR, _EXCLUDE_FILE_EXTENSION + _REMOVE_FILE_EXTENSION) + = get_excluded_paths(path_to_find_bin, path_to_exclude) abs_path_to_exclude = [os.path.abspath(os.path.join(path_to_find_bin, path)) for path in excluded_files] @@ -327,7 +313,7 @@ def check_binary(file_with_path): is_bin_confirmed = False file = os.path.basename(file_with_path) extension = os.path.splitext(file)[1][1:] - if not os.path.islink(file_with_path) and extension.lower() not in _REMOVE_FILE_EXTENSION: + if not os.path.islink(file_with_path): if stat.S_ISFIFO(os.stat(file_with_path).st_mode): return False file_command_result = "" From 67d4a87b06115beb787dc54f381d2454a727e112 Mon Sep 17 00:00:00 2001 From: Soim Date: Tue, 20 Jan 2026 13:46:11 +0900 Subject: [PATCH 2/2] Remain json and js --- src/fosslight_binary/binary_analysis.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fosslight_binary/binary_analysis.py b/src/fosslight_binary/binary_analysis.py index 5f399d4..ceb45e6 100755 --- a/src/fosslight_binary/binary_analysis.py +++ b/src/fosslight_binary/binary_analysis.py @@ -31,6 +31,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'] INCLUDE_FILE_COMMAND_RESULT = ['current ar archive'] @@ -313,7 +314,7 @@ def check_binary(file_with_path): is_bin_confirmed = False file = os.path.basename(file_with_path) extension = os.path.splitext(file)[1][1:] - if not os.path.islink(file_with_path): + if not os.path.islink(file_with_path) and extension.lower() not in _REMOVE_FILE_EXTENSION: if stat.S_ISFIFO(os.stat(file_with_path).st_mode): return False file_command_result = ""