fosslight-dependency 3.12.5__tar.gz → 3.12.7__tar.gz

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 3.12.5
+Version: 3.12.7
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/setup.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='3.12.5',
+        version='3.12.7',
         package_dir={"": "src"},
         packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency/_analyze_dependency.py

@@ -17,6 +17,7 @@ from fosslight_dependency.package_manager.Swift import Swift
 from fosslight_dependency.package_manager.Carthage import Carthage
 from fosslight_dependency.package_manager.Go import Go
 from fosslight_dependency.package_manager.Nuget import Nuget
+from fosslight_dependency.package_manager.Helm import Helm
 import fosslight_util.constant as constant
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -50,6 +51,8 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
         package_manager = Go(input_dir, output_dir)
     elif package_manager_name == const.NUGET:
         package_manager = Nuget(input_dir, output_dir)
+    elif package_manager_name == const.HELM:
+        package_manager = Helm(input_dir, output_dir)
     else:
         logger.error(f"Not supported package manager name: {package_manager_name}")
         ret = False

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency/_package_manager.py

@@ -82,7 +82,6 @@ class PackageManager:
         pass
 
     def run_gradle_task(self):
-        dependency_tree_fname = 'tmp_dependency_tree.txt'
         if os.path.isfile(const.SUPPORT_PACKAE.get(self.package_manager_name)):
             gradle_backup = f'{const.SUPPORT_PACKAE.get(self.package_manager_name)}_bk'
 
@@ -91,15 +90,20 @@ class PackageManager:
             if not ret:
                 return
 
-            ret = self.exeucte_gradle_task(dependency_tree_fname)
+            if os.path.isfile('gradlew') or os.path.isfile('gradlew.bat'):
+                if self.platform == const.WINDOWS:
+                    cmd_gradle = "gradlew.bat"
+                else:
+                    cmd_gradle = "./gradlew"
+            else:
+                return 1
+            cmd = f"{cmd_gradle} allDeps"
+            ret = subprocess.check_output(cmd, shell=True, encoding='utf-8')
             if ret != 0:
+                self.parse_dependency_tree(ret)
+            else:
                 self.set_direct_dependencies(False)
                 logger.warning("Failed to run allDeps task.")
-            else:
-                self.parse_dependency_tree(dependency_tree_fname)
-
-            if os.path.isfile(dependency_tree_fname):
-                os.remove(dependency_tree_fname)
 
             if os.path.isfile(gradle_backup):
                 os.remove(const.SUPPORT_PACKAE.get(self.package_manager_name))
@@ -128,40 +132,26 @@ class PackageManager:
 
         return ret
 
-    def exeucte_gradle_task(self, dependency_tree_fname):
-        if os.path.isfile('gradlew') or os.path.isfile('gradlew.bat'):
-            if self.platform == const.WINDOWS:
-                cmd_gradle = "gradlew.bat"
-            else:
-                cmd_gradle = "./gradlew"
-        else:
-            return 1
-        cmd = f"{cmd_gradle} allDeps > {dependency_tree_fname}"
-
-        ret = subprocess.call(cmd, shell=True)
-        return ret
-
-    def parse_dependency_tree(self, f_name):
+    def parse_dependency_tree(self, dependency_tree_fname):
         config = android_config if self.package_manager_name == 'android' else gradle_config
-        with open(f_name, 'r', encoding='utf8') as input_fp:
-            packages_in_config = False
-            for i, line in enumerate(input_fp.readlines()):
-                try:
-                    line_bk = copy.deepcopy(line)
-                    if not packages_in_config:
-                        filtered = next(filter(lambda c: re.findall(rf'^{c}\s\-', line), config), None)
-                        if filtered:
-                            packages_in_config = True
-                    else:
-                        if line == '':
-                            packages_in_config = False
-                        re_result = re.findall(r'\-\-\-\s([^\:\s]+\:[^\:\s]+)\:([^\:\s]+)', line)
-                        if re_result:
-                            self.total_dep_list.append(re_result[0][0])
-                            if re.match(r'^[\+|\\]\-\-\-\s([^\:\s]+\:[^\:\s]+)\:([^\:\s]+)', line_bk):
-                                self.direct_dep_list.append(re_result[0][0])
-                except Exception as e:
-                    logger.error(f"Failed to parse dependency tree: {e}")
+        packages_in_config = False
+        for line in dependency_tree_fname.split('\n'):
+            try:
+                line_bk = copy.deepcopy(line)
+                if not packages_in_config:
+                    filtered = next(filter(lambda c: re.findall(rf'^{c}\s\-', line), config), None)
+                    if filtered:
+                        packages_in_config = True
+                else:
+                    if line == '':
+                        packages_in_config = False
+                    re_result = re.findall(r'\-\-\-\s([^\:\s]+\:[^\:\s]+)\:([^\:\s]+)', line)
+                    if re_result:
+                        self.total_dep_list.append(re_result[0][0])
+                        if re.match(r'^[\+|\\]\-\-\-\s([^\:\s]+\:[^\:\s]+)\:([^\:\s]+)', line_bk):
+                            self.direct_dep_list.append(re_result[0][0])
+            except Exception as e:
+                logger.error(f"Failed to parse dependency tree: {e}")
 
 
 def version_refine(oss_version):

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency/constant.py

@@ -21,6 +21,7 @@ SWIFT = 'swift'
 CARTHAGE = 'carthage'
 GO = 'go'
 NUGET = 'nuget'
+HELM = 'helm'
 
 # Supported package name and manifest file
 SUPPORT_PACKAE = {
@@ -34,7 +35,8 @@ SUPPORT_PACKAE = {
     SWIFT: 'Package.resolved',
     CARTHAGE: 'Cartfile.resolved',
     GO: 'go.mod',
-    NUGET: ['packages.config', os.path.join('obj', 'project.assets.json')]
+    NUGET: ['packages.config', os.path.join('obj', 'project.assets.json')],
+    HELM: 'Chart.yaml'
 }
 
 # default android app name

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency/package_manager/Cocoapods.py

@@ -8,7 +8,6 @@ import logging
 import json
 import yaml
 import re
-import traceback
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
@@ -99,8 +98,8 @@ class Cocoapods(PackageManager):
                     command = f"pod spec which --regex ^{search_oss_name}$"
                     spec_which = os.popen(command).readline()
                     if spec_which.startswith('[!]'):
-                        logger.error(f"This command({command}) returns an error")
-                        return ''
+                        logger.warning(f"This command({command}) returns an error")
+                        continue
 
                     file_path = spec_which.rstrip().split(os.path.sep)
                     if file_path[0] == '':
@@ -110,38 +109,49 @@ class Cocoapods(PackageManager):
                     spec_file_path = os.path.join(file_path_without_version, pod_oss[1], file_path[-1])
 
                 oss_name, oss_version, license_name, dn_loc, homepage = self.get_oss_in_podspec(spec_file_path)
+                if oss_name == '':
+                    continue
 
                 sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
                                   oss_name, oss_version, license_name, dn_loc, homepage, '', '', comment])
             except Exception as e:
-                logger.warning(f"It failed to get {pod_oss[0]}:{e}")
-                logger.warning(traceback.format_exc())
+                logger.warning(f"Fail to get {pod_oss[0]}:{e}")
 
         return sheet_list
 
     def get_oss_in_podspec(self, spec_file_path):
-        with open(spec_file_path, 'r', encoding='utf8') as json_file:
-            json_data = json.load(json_file)
-
-            oss_origin_name = json_data['name']
-            oss_name = f"{self.package_manager_name}:{oss_origin_name}"
-            oss_version = json_data['version']
-            homepage = f"{self.dn_url}pods/{oss_origin_name}"
-
-            if not isinstance(json_data['license'], str):
-                if 'type' in json_data['license']:
-                    license_name = json_data['license']['type']
-            else:
-                license_name = json_data['license']
-
-            license_name = license_name.replace(",", "")
-
-            source_keys = [key for key in json_data['source']]
-            for src_type_i in _source_type:
-                if src_type_i in source_keys:
-                    dn_loc = json_data['source'][src_type_i]
-                    if dn_loc.endswith('.git'):
-                        dn_loc = dn_loc[:-4]
+        oss_name = ''
+        oss_version = ''
+        license_name = ''
+        dn_loc = ''
+        homepage = ''
+        try:
+            with open(spec_file_path, 'r', encoding='utf8') as json_file:
+                json_data = json.load(json_file)
+
+                oss_origin_name = json_data['name']
+                oss_name = f"{self.package_manager_name}:{oss_origin_name}"
+                oss_version = json_data['version']
+                homepage = f"{self.dn_url}pods/{oss_origin_name}"
+
+                if 'license' in json_data:
+                    if not isinstance(json_data['license'], str):
+                        if 'type' in json_data['license']:
+                            license_name = json_data['license']['type']
+                    else:
+                        license_name = json_data['license']
+                else:
+                    license_name = ''
+                license_name = license_name.replace(",", "")
+
+                source_keys = [key for key in json_data['source']]
+                for src_type_i in _source_type:
+                    if src_type_i in source_keys:
+                        dn_loc = json_data['source'][src_type_i]
+                        if dn_loc.endswith('.git'):
+                            dn_loc = dn_loc[:-4]
+        except Exception as e:
+            logger.warning(f"Fail to get oss info in podspec:{e}")
 
         return oss_name, oss_version, license_name, dn_loc, homepage
 

fosslight_dependency-3.12.7/src/fosslight_dependency/package_manager/Helm.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2023 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+import logging
+import subprocess
+import yaml
+import shutil
+import fosslight_util.constant as constant
+import fosslight_dependency.constant as const
+from fosslight_dependency._package_manager import PackageManager
+from fosslight_util.download import extract_compressed_dir
+
+logger = logging.getLogger(constant.LOGGER_NAME)
+
+
+class Helm(PackageManager):
+    package_manager_name = const.HELM
+    tmp_charts_dir = 'tmp_charts'
+
+    input_file_name = const.SUPPORT_PACKAE.get(package_manager_name)
+
+    def __init__(self, input_dir, output_dir):
+        super().__init__(self.package_manager_name, '', input_dir, output_dir)
+        self.append_input_package_list_file(self.input_file_name)
+
+    def __del__(self):
+        if os.path.exists(self.tmp_charts_dir):
+            shutil.rmtree(self.tmp_charts_dir, ignore_errors=True)
+
+    def run_plugin(self):
+        ret = True
+        charts_dir = 'charts'
+        if os.path.isdir(charts_dir):
+            shutil.copytree(charts_dir, self.tmp_charts_dir)
+        else:
+            logger.info("Execute 'helm dependency build' to obtain package info.")
+            cmd = "helm dependency build"
+
+            ret_cmd = subprocess.call(cmd, shell=True)
+            if ret_cmd != 0:
+                logger.error(f"Failed to build helm dependency: {cmd}")
+                ret = False
+            else:
+                shutil.copytree(charts_dir, self.tmp_charts_dir)
+                shutil.rmtree(charts_dir, ignore_errors=True)
+
+        ret = extract_compressed_dir(self.tmp_charts_dir, self.tmp_charts_dir, False)
+        if not ret:
+            logger.error(f'Fail to extract compressed dir: {self.tmp_charts_dir}')
+        else:
+            logger.warning('Success to extract compressed dir')
+
+        return ret
+
+    def parse_oss_information(self, f_name):
+        dep_item_list = []
+        sheet_list = []
+
+        with open(f_name, 'r', encoding='utf8') as yaml_fp:
+            yaml_f = yaml.safe_load(yaml_fp)
+            for dep in yaml_f['dependencies']:
+                dep_item_list.append(dep['name'])
+        for dep in dep_item_list:
+            try:
+                f_path = os.path.join(self.tmp_charts_dir, dep, f_name)
+                with open(f_path, 'r', encoding='utf8') as yaml_fp:
+                    yaml_f = yaml.safe_load(yaml_fp)
+                    oss_name = f'{self.package_manager_name}:{yaml_f["name"]}'
+                    oss_version = yaml_f.get('version', '')
+                    if oss_version.startswith('v'):
+                        oss_version = oss_version[1:]
+
+                    homepage = yaml_f.get('home', '')
+                    dn_loc = ''
+                    if yaml_f.get('sources', '') != '':
+                        dn_loc = yaml_f.get('sources', '')[0]
+
+                    license_name = ''
+                    if yaml_f.get('annotations', '') != '':
+                        license_name = yaml_f['annotations'].get('licenses', '')
+
+                    if self.direct_dep:
+                        comment = 'direct'
+
+            except Exception as e:
+                logging.warning(f"Fail to parse chart info {dep}: {e}")
+                continue
+
+            sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
+                              oss_name, oss_version, license_name, dn_loc, homepage, '', '', comment])
+
+        return sheet_list

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency/run_dependency_scanner.py

@@ -83,14 +83,14 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
 
         if output_file == "":
             if output_extension == _json_ext:
-                output_file = f"fosslight_opossum_{_start_time}"
+                output_file = f"fosslight_opossum_dep_{_start_time}"
             else:
-                output_file = f"fosslight_report_{_start_time}"
+                output_file = f"fosslight_report_dep_{_start_time}"
     else:
         logger.error(msg)
         sys.exit(1)
 
-    logger, _result_log = init_log(os.path.join(output_path, "fosslight_log_" + _start_time + ".txt"),
+    logger, _result_log = init_log(os.path.join(output_path, "fosslight_log_dep_" + _start_time + ".txt"),
                                    True, logging.INFO, logging.DEBUG, _PKG_NAME)
 
     logger.info(f"Tool Info : {_result_log['Tool Info']}")

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 3.12.5
+Version: 3.12.7
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-3.12.5 → fosslight_dependency-3.12.7}/src/fosslight_dependency.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ src/fosslight_dependency/package_manager/Carthage.py
 src/fosslight_dependency/package_manager/Cocoapods.py
 src/fosslight_dependency/package_manager/Go.py
 src/fosslight_dependency/package_manager/Gradle.py
+src/fosslight_dependency/package_manager/Helm.py
 src/fosslight_dependency/package_manager/Maven.py
 src/fosslight_dependency/package_manager/Npm.py
 src/fosslight_dependency/package_manager/Nuget.py