fosslight-scanner 2.1.8__py3-none-any.whl → 2.1.10__py3-none-any.whl

fosslight_scanner/_help.py

@@ -40,13 +40,14 @@ _HELP_MESSAGE_SCANNER = """
             --no_correction\t    Enter if you don't want to correct OSS information with sbom-info.yaml
                                      * Correction mode only supported xlsx format.
             --correct_fpath <path>  Path to the sbom-info.yaml file
-            --ui\t\t\t  Generate UI mode result file
+            --ui\t\t    Generate UI mode result file
+            --recursive_dep\t    Recursively analyze dependencies
 
         Options for only 'all' or 'bin' mode
             -u <db_url>\t\t    DB Connection(format :'postgresql://username:password@host:port/database_name')
 
         Options for only 'all' or 'dependency' mode
-            -d <dependency_argument>\t    Additional arguments for running dependency analysis"""
+            -d <dependency_arg>\t    Additional arguments for running dependency analysis"""
 
 
 def print_help_msg():

fosslight_scanner/_parse_setting.py

@@ -25,12 +25,13 @@ def parse_setting_json(data):
     source_print_matched_text = data.get('source_print_matched_text', False)
     source_time_out = data.get('source_time_out', 120)
     binary_simple = data.get('binary_simple', False)
+    recursive_dep = data.get('recursive_dep', False)
     str_lists = [mode, path, exclude_path]
     strings = [
         dep_argument, output, format, db_url,
         correct_fpath, link, selected_source_scanner
     ]
-    booleans = [timer, raw, no_correction, ui, source_write_json_file, source_print_matched_text, binary_simple]
+    booleans = [timer, raw, no_correction, ui, source_write_json_file, source_print_matched_text, binary_simple, recursive_dep]
 
     is_incorrect = False
 
@@ -65,4 +66,4 @@ def parse_setting_json(data):
     return mode, path, dep_argument, output, format, link, db_url, timer, \
         raw, core, no_correction, correct_fpath, ui, exclude_path, \
         selected_source_scanner, source_write_json_file, source_print_matched_text, source_time_out, \
-        binary_simple
+        binary_simple, recursive_dep

fosslight_scanner/cli.py

@@ -15,7 +15,8 @@ from fosslight_util.help import print_package_version
 
 
 def set_args(mode, path, dep_argument, output, format, link, db_url, timer,
-             raw, core, no_correction, correct_fpath, ui, setting, exclude_path):
+             raw, core, no_correction, correct_fpath, ui, setting, exclude_path,
+             recursive_dep):
 
     selected_source_scanner = "all"
     source_write_json_file = False
@@ -30,7 +31,7 @@ def set_args(mode, path, dep_argument, output, format, link, db_url, timer,
             s_mode, s_path, s_dep_argument, s_output, s_format, s_link, s_db_url, s_timer, s_raw, s_core, \
                 s_no_correction, s_correct_fpath, s_ui, s_exclude_path, \
                 s_selected_source_scanner, s_source_write_json_file, s_source_print_matched_text, \
-                s_source_time_out, s_binary_simple = parse_setting_json(data)
+                s_source_time_out, s_binary_simple, s_recursive_dep = parse_setting_json(data)
 
             # direct cli arguments have higher priority than setting file
             mode = mode or s_mode
@@ -47,6 +48,7 @@ def set_args(mode, path, dep_argument, output, format, link, db_url, timer,
             correct_fpath = correct_fpath or s_correct_fpath
             ui = ui or s_ui
             exclude_path = exclude_path or s_exclude_path
+            recursive_dep = recursive_dep or s_recursive_dep
 
             # These options are only set from the setting file, not from CLI arguments
             selected_source_scanner = s_selected_source_scanner or selected_source_scanner
@@ -60,7 +62,7 @@ def set_args(mode, path, dep_argument, output, format, link, db_url, timer,
     return mode, path, dep_argument, output, format, link, db_url, timer, \
         raw, core, no_correction, correct_fpath, ui, exclude_path, \
         selected_source_scanner, source_write_json_file, source_print_matched_text, source_time_out, \
-        binary_simple
+        binary_simple, recursive_dep
 
 
 def main():
@@ -79,7 +81,7 @@ def main():
                         type=str, dest='format',nargs='*', default=[])
     parser.add_argument('--output', '-o', help='Output directory or file',
                         type=str, dest='output', default="")
-    parser.add_argument('--dependency', '-d', help='Dependency arguments',
+    parser.add_argument('--dependency', '-d', help='Dependency arguments (e.g. -d "-m pip" )',
                         type=str, dest='dep_argument', default="")
     parser.add_argument('--url', '-u', help="DB Url",
                         type=str, dest='db_url', default="")
@@ -105,6 +107,8 @@ def main():
                         type=str, required=False, default='')
     parser.add_argument('--ui', help='Generate UI mode result file',
                         action='store_true', required=False, default=False)
+    parser.add_argument('--recursive_dep', '-rd', help='Recursively analyze dependencies',
+                        action='store_true', dest='recursive_dep', default=False)
 
     try:
         args = parser.parse_args()
@@ -118,16 +122,16 @@ def main():
     else:
         mode, path, dep_argument, output, format, link, db_url, timer, raw, core, no_correction, correct_fpath, \
             ui, exclude_path, selected_source_scanner, source_write_json_file, source_print_matched_text, \
-            source_time_out, binary_simple, = set_args(
+            source_time_out, binary_simple, recursive_dep = set_args(
                 args.mode, args.path, args.dep_argument, args.output,
                 args.format, args.link, args.db_url, args.timer, args.raw,
                 args.core, args.no_correction, args.correct_fpath, args.ui,
-                args.setting, args.exclude_path)
+                args.setting, args.exclude_path, args.recursive_dep)
 
         run_main(mode, path, dep_argument, output, format, link, db_url, timer,
                  raw, core, not no_correction, correct_fpath, ui, exclude_path,
                  selected_source_scanner, source_write_json_file, source_print_matched_text,
-                 source_time_out, binary_simple)
+                 source_time_out, binary_simple, recursive_dep)
 
 
 if __name__ == "__main__":

fosslight_scanner/common.py

@@ -168,10 +168,12 @@ def correct_scanner_result(all_scan_item):
         try:
             remove_src_idx_list = []
             for idx_src, src_fileitem in enumerate(src_fileitems):
-                src_fileitem.exclude = check_exclude_dir(src_fileitem.source_name_or_path, src_fileitem.exclude)
+                if check_package_dir(src_fileitem.source_name_or_path):
+                    continue
                 dup_flag = False
                 for bin_fileitem in bin_fileitems:
-                    bin_fileitem.exclude = check_exclude_dir(bin_fileitem.source_name_or_path, bin_fileitem.exclude)
+                    if check_package_dir(bin_fileitem.source_name_or_path):
+                        continue
                     if src_fileitem.source_name_or_path == bin_fileitem.source_name_or_path:
                         dup_flag = True
                         src_all_licenses_non_empty = all(oss_item.license for oss_item in src_fileitem.oss_items)
@@ -202,14 +204,12 @@ def correct_scanner_result(all_scan_item):
     return all_scan_item
 
 
-def check_exclude_dir(source_name_or_path, file_item_exclude):
-    if file_item_exclude:
-        return True
-    _exclude_dirs = ["venv", "node_modules", "Pods", "Carthage"]
-    exclude = False
+def check_package_dir(source_name_or_path):
+    _package_dirs = ["venv", "node_modules", "Pods", "Carthage"]
+    is_pkg = False
 
-    for exclude_dir in _exclude_dirs:
-        if exclude_dir in source_name_or_path.split(os.path.sep):
-            exclude = True
+    for package_dir in _package_dirs:
+        if package_dir in source_name_or_path.split(os.path.sep):
+            is_pkg = True
             break
-    return exclude
+    return is_pkg

fosslight_scanner/fosslight_scanner.py

@@ -25,7 +25,6 @@ from fosslight_util.set_log import init_log
 from fosslight_util.timer_thread import TimerThread
 import fosslight_util.constant as constant
 from fosslight_util.output_format import check_output_formats_v2
-from fosslight_prechecker._precheck import run_lint as prechecker_lint
 from fosslight_util.cover import CoverItem
 from fosslight_util.oss_item import ScannerItem
 from fosslight_util.output_format import write_output_file
@@ -58,7 +57,8 @@ SCANNER_MODE = [
 ]
 
 
-def run_dependency(path_to_analyze, output_file_with_path, params="", path_to_exclude=[], formats=[]):
+def run_dependency(path_to_analyze, output_file_with_path, params="", path_to_exclude=[], formats=[],
+                   recursive_dep=False):
     result = []
 
     package_manager = ""
@@ -101,7 +101,9 @@ def run_dependency(path_to_analyze, output_file_with_path, params="", path_to_ex
             output_file_with_path,
             pip_activate_cmd, pip_deactivate_cmd,
             output_custom_dir, app_name,
-            github_token, formats, True, path_to_exclude=path_to_exclude
+            github_token, formats, True, path_to_exclude=path_to_exclude,
+            graph_path="", graph_size=(600,600),
+            recursive=recursive_dep
         )
         if success:
             result = scan_item
@@ -132,7 +134,7 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
                 default_oss_name="", default_oss_version="", url="",
                 correct_mode=True, correct_fpath="", ui_mode=False, path_to_exclude=[],
                 selected_source_scanner="all", source_write_json_file=False, source_print_matched_text=False,
-                source_time_out=120, binary_simple=False, formats=[]):
+                source_time_out=120, binary_simple=False, formats=[], recursive_dep=False):
     final_excel_dir = output_path
     success = True
     all_cover_items = []
@@ -233,7 +235,8 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
 
             if run_dep:
                 dep_scanitem = run_dependency(src_path, _output_dir,
-                                              dep_arguments, path_to_exclude, formats)
+                                              dep_arguments, path_to_exclude, formats,
+                                              recursive_dep)
                 all_scan_item.file_items.update(dep_scanitem.file_items)
                 all_cover_items.append(dep_scanitem.cover)
         else:
@@ -360,7 +363,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
              db_url, hide_progressbar=False, keep_raw_data=False, num_cores=-1,
              correct_mode=True, correct_fpath="", ui_mode=False, path_to_exclude=[],
              selected_source_scanner="all", source_write_json_file=False, source_print_matched_text=False,
-             source_time_out=120, binary_simple=False):
+             source_time_out=120, binary_simple=False, recursive_dep=False):
     global _executed_path, _start_time
 
     output_files = []
@@ -471,7 +474,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                                 default_oss_name, default_oss_version, url_to_analyze,
                                 correct_mode, correct_fpath, ui_mode, path_to_exclude,
                                 selected_source_scanner, source_write_json_file, source_print_matched_text, source_time_out,
-                                binary_simple, formats)
+                                binary_simple, formats, recursive_dep)
 
                 if extract_folder:
                     shutil.rmtree(extract_folder)

{fosslight_scanner-2.1.8.dist-info → fosslight_scanner-2.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: fosslight-scanner
-Version: 2.1.8
+Metadata-Version: 2.4
+Name: fosslight_scanner
+Version: 2.1.10
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Download-URL: https://github.com/fosslight/fosslight_scanner
@@ -20,11 +20,22 @@ Requires-Dist: openpyxl
 Requires-Dist: progress
 Requires-Dist: pyyaml
 Requires-Dist: beautifulsoup4
-Requires-Dist: fosslight-util<3.0.0,>=2.1.12
-Requires-Dist: fosslight-source<3.0.0,>=2.1.4
-Requires-Dist: fosslight-dependency<5.0.0,>=4.1.3
-Requires-Dist: fosslight-binary<6.0.0,>=5.1.2
-Requires-Dist: fosslight-prechecker<5.0.0,>=4.0.0
+Requires-Dist: fosslight_util<3.0.0,>=2.1.12
+Requires-Dist: fosslight_source<3.0.0,>=2.1.12
+Requires-Dist: fosslight_dependency<5.0.0,>=4.1.3
+Requires-Dist: fosslight_binary<6.0.0,>=5.1.9
+Requires-Dist: fosslight_prechecker<5.0.0,>=4.0.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 Copyright (c) 2021 LG Electronics

fosslight_scanner-2.1.10.dist-info/RECORD

@@ -0,0 +1,15 @@
+fosslight_scanner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fosslight_scanner/_get_input.py,sha256=f78M57QU7Lhw1VfZJKvYXbGsUiYMViPz1---UDIbV9I,1396
+fosslight_scanner/_help.py,sha256=dq_fJoTzujChKV_RlgGlg080ZodwDZcXloYv-mwV-W0,3145
+fosslight_scanner/_parse_setting.py,sha256=htxNNvhizZ2ZT18Aw6ihKuBpOMAyptkbMS5Z0_Xh5mQ,2551
+fosslight_scanner/_run_compare.py,sha256=zmzX-FIvWCSkwPvEA3iHfVpyg6QDGUCpw3tJuGLdPWM,10657
+fosslight_scanner/cli.py,sha256=vz_oGevbejqo3tHa4z6d-Ft0xu-gP9Pg-VmXb9IhO_s,6910
+fosslight_scanner/common.py,sha256=FyEoqVsIZ4pRIlHRXZES8PYaYfy3PEmUaOn02YSuuYU,8377
+fosslight_scanner/fosslight_scanner.py,sha256=wOSSnJZuUCvom9rvdwOUy7B2f-CUzDdecI2hm52dyFg,21174
+fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
+fosslight_scanner-2.1.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_scanner-2.1.10.dist-info/METADATA,sha256=1YXdus_RPXOrScGAT1b6e9rOYzxdaP2gq9dZzX0_HuQ,8059
+fosslight_scanner-2.1.10.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fosslight_scanner-2.1.10.dist-info/entry_points.txt,sha256=dl7AA0_Jqnq0NHuCEaxcJFgstLw3sod_-FGtcgZuJbs,104
+fosslight_scanner-2.1.10.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
+fosslight_scanner-2.1.10.dist-info/RECORD,,

{fosslight_scanner-2.1.8.dist-info → fosslight_scanner-2.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.1)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fosslight_scanner-2.1.8.dist-info/RECORD

@@ -1,15 +0,0 @@
-fosslight_scanner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_scanner/_get_input.py,sha256=f78M57QU7Lhw1VfZJKvYXbGsUiYMViPz1---UDIbV9I,1396
-fosslight_scanner/_help.py,sha256=-Dqgn1inH26614GjrIe8I5cdEziuAxTtwrUdtTkrpjQ,3084
-fosslight_scanner/_parse_setting.py,sha256=SoIEoPGlFXAp6__eEFEMIPYPoKLvmqxXF5X_C_uFiVI,2468
-fosslight_scanner/_run_compare.py,sha256=zmzX-FIvWCSkwPvEA3iHfVpyg6QDGUCpw3tJuGLdPWM,10657
-fosslight_scanner/cli.py,sha256=C4YNPVJJ-Ezj_6xe8k9QbIrf5V44GXbHWCGzR2FMcV8,6547
-fosslight_scanner/common.py,sha256=0LgXlGOJVB0kDeZ-1VeHEErArh7TgXkwEAmYAL9q93I,8465
-fosslight_scanner/fosslight_scanner.py,sha256=MIjKJ_HHyKKlh3HhuTtuezxTmX9guDWYDgjdXZP3IPU,21001
-fosslight_scanner/resources/bom_compare.html,sha256=VocJ9bDmQQOwfGyvXatPZ4W-QddO-IlsAvKdO0nZ7pA,2240
-fosslight_scanner-2.1.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_scanner-2.1.8.dist-info/METADATA,sha256=Ee5RYpuVUGR4ra07tmUcq8_6U14jF0AL1FuJWJFwJJ0,7821
-fosslight_scanner-2.1.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_scanner-2.1.8.dist-info/entry_points.txt,sha256=dl7AA0_Jqnq0NHuCEaxcJFgstLw3sod_-FGtcgZuJbs,104
-fosslight_scanner-2.1.8.dist-info/top_level.txt,sha256=43_xLb5KYpy8wOU1H2Wd2fEsWBY7Dg6ZEJJXkfT64Ak,18
-fosslight_scanner-2.1.8.dist-info/RECORD,,