fosslight-dependency 3.15.2__tar.gz → 3.15.4__tar.gz

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/PKG-INFO

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

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/setup.py

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

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/_analyze_dependency.py

@@ -29,6 +29,7 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
                        direct=True):
     ret = True
     package_sheet_list = []
+    cover_comment = ''
 
     if package_manager_name == const.PYPI:
         package_manager = Pypi(input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd)
@@ -82,9 +83,11 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
 
     if ret:
         logger.warning(f"### Complete to analyze: {package_manager_name}")
+        if package_manager.cover_comment:
+            cover_comment = package_manager.cover_comment
     else:
         logger.error(f"### Fail to analyze: {package_manager_name}")
 
     del package_manager
 
-    return ret, package_sheet_list
+    return ret, package_sheet_list, cover_comment

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/_package_manager.py

@@ -50,6 +50,7 @@ class PackageManager:
         self.relation_tree = {}
         self.package_name = ''
         self.purl_dict = {}
+        self.cover_comment = ''
 
         self.platform = platform.system()
         self.license_scanner_bin = check_license_scanner(self.platform)
@@ -256,6 +257,18 @@ class PackageManager:
         except Exception as e:
             logger.warning(f'Fail to parse gradle dependency tree:{e}')
 
+    def change_dep_to_purl(self, sheet_list):
+        for oss_item in sheet_list:
+            try:
+                if len(oss_item) < 10:
+                    break
+                deps_list = oss_item[9]
+                deps_purl = list(filter(None, map(lambda x: self.purl_dict.get(x, ''), deps_list)))
+                oss_item[9] = ','.join(deps_purl)
+            except Exception as e:
+                logger.warning(f'Fail to change depend_on to purl:{e}')
+        return sheet_list
+
 
 def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''):
     purl_prefix = f'pkg:{pkg_manager}'

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Android.py

@@ -74,9 +74,9 @@ class Android(PackageManager):
                     except Exception as e:
                         logger.error(f"Fail to find oss scope in dependency tree: {e}")
                 comment = ','.join(comment_list)
-                deps = ','.join(deps_list)
 
                 sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                                  '', '', comment, deps])
+                                  '', '', comment, deps_list])
+            sheet_list = self.change_dep_to_purl(sheet_list)
 
         return sheet_list

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Cocoapods.py

@@ -92,11 +92,8 @@ class Cocoapods(PackageManager):
                     else:
                         comment_list.append('transitive')
                     if f'{pod_oss_name_origin}({oss_version})' in self.relation_tree:
-                        rel_items = [f'{self.package_manager_name}:{ri}'
-                                     for ri in self.relation_tree[f'{pod_oss_name_origin}({oss_version})']]
-                        deps_list.extend(rel_items)
+                        deps_list.extend(self.relation_tree[f'{pod_oss_name_origin}({oss_version})'])
                 comment = ','.join(comment_list)
-                deps = ','.join(deps_list)
 
                 oss_name_report = f'{self.package_manager_name}:{pod_oss_name_origin}'
                 pod_oss_name = pod_oss_name_origin
@@ -138,10 +135,10 @@ class Cocoapods(PackageManager):
                     logger.warning(f'{pod_oss_name_origin} has different version({pod_oss_version})\
                                    with spec version({oss_version})')
                 sheet_list.append([purl, oss_name_report, pod_oss_version, license_name, dn_loc, homepage,
-                                  '', '', comment, deps])
+                                  '', '', comment, deps_list])
             except Exception as e:
                 logger.warning(f"Fail to get {pod_oss_name_origin}:{e}")
-
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list
 
     def get_oss_in_podspec(self, spec_file_path):

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Go.py

@@ -111,9 +111,7 @@ class Go(PackageManager):
                         comment_list.append('direct')
 
                 if f'{package_path}({oss_version})' in self.relation_tree:
-                    rel_items = [f'{self.package_manager_name}:{ri}'
-                                 for ri in self.relation_tree[f'{package_path}({oss_version})']]
-                    deps_list.extend(rel_items)
+                    deps_list.extend(self.relation_tree[f'{package_path}({oss_version})'])
 
                 homepage_set = []
                 homepage = self.dn_url + package_path
@@ -159,8 +157,7 @@ class Go(PackageManager):
                 continue
 
             comment = ','.join(comment_list)
-            deps = ','.join(deps_list)
             sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                              '', '', comment, deps])
-
+                              '', '', comment, deps_list])
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Gradle.py

@@ -91,11 +91,9 @@ class Gradle(PackageManager):
                 except Exception as e:
                     logger.error(f"Fail to find oss scope in dependency tree: {e}")
             comment = ','.join(comment_list)
-            deps = ','.join(deps_list)
-
             sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                              '', '', comment, deps])
-
+                              '', '', comment, deps_list])
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list
 
 

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Maven.py

@@ -253,9 +253,7 @@ class Maven(PackageManager):
                 except Exception as e:
                     logger.error(f"Fail to find oss scope in dependency tree: {e}")
             comment = ','.join(comment_list)
-            deps = ','.join(deps_list)
-
             sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                              '', '', comment, deps])
-
+                              '', '', comment, deps_list])
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Npm.py

@@ -197,24 +197,21 @@ class Npm(PackageManager):
                     comment_list.append('transitive')
 
                 if f'{oss_init_name}({oss_version})' in self.relation_tree:
-                    rel_items = [f'npm:{ri}' for ri in self.relation_tree[f'{oss_init_name}({oss_version})']]
-                    deps_list.extend(rel_items)
+                    deps_list.extend(self.relation_tree[f'{oss_init_name}({oss_version})'])
 
             manifest_file_path = os.path.join(package_path, const.SUPPORT_PACKAE.get(self.package_manager_name))
             multi_license, license_comment, multi_flag = check_multi_license(license_name, manifest_file_path)
 
             comment = ','.join(comment_list)
-            deps = ','.join(deps_list)
             if multi_flag:
                 comment = f'{comment}, {license_comment}'
-                sheet_list.append([purl, oss_name, oss_version, multi_license, dn_loc, homepage,
-                                  '', '', comment, deps])
+                license_name = multi_license
             else:
                 license_name = license_name.replace(",", "")
                 license_name = check_unknown_license(license_name, manifest_file_path)
-                sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                                  '', '', comment, deps])
-
+            sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
+                              '', '', comment, deps_list])
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list
 
 

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Nuget.py

@@ -109,17 +109,14 @@ class Nuget(PackageManager):
                         comment_list.append('transitive')
 
                     if f'{oss_origin_name}({oss_version})' in self.relation_tree:
-                        rel_items = [f'{self.package_manager_name}:{ri}'
-                                     for ri in self.relation_tree[f'{oss_origin_name}({oss_version})']]
-                        deps_list.extend(rel_items)
+                        deps_list.extend(self.relation_tree[f'{oss_origin_name}({oss_version})'])
 
                 comment = ','.join(comment_list)
-                deps = ','.join(deps_list)
-                sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage, '', '', comment, deps])
+                sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage, '', '', comment, deps_list])
 
             except Exception as e:
                 logger.warning(f"Failed to parse oss information: {e}")
-
+        sheet_list = self.change_dep_to_purl(sheet_list)
         if os.path.isfile(tmp_license_txt_file_name):
             os.remove(tmp_license_txt_file_name)
 

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Pub.py

@@ -155,15 +155,13 @@ class Pub(PackageManager):
                             comment_list.append('transitive')
 
                     if f'{oss_origin_name}({oss_version})' in self.relation_tree:
-                        rel_items = [f'{self.package_manager_name}:{ri}'
-                                     for ri in self.relation_tree[f'{oss_origin_name}({oss_version})']]
-                        deps_list.extend(rel_items)
+                        deps_list.extend(self.relation_tree[f'{oss_origin_name}({oss_version})'])
                 comment = ','.join(comment_list)
-                deps = ','.join(deps_list)
                 sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                                  '', '', comment, deps])
+                                  '', '', comment, deps_list])
         except Exception as e:
             logger.error(f"Fail to parse pub oss information: {e}")
+        sheet_list = self.change_dep_to_purl(sheet_list)
 
         if os.path.isfile(tmp_license_txt_file_name):
             os.remove(tmp_license_txt_file_name)
@@ -181,17 +179,35 @@ class Pub(PackageManager):
         self.direct_dep = True
         tmp_pub_deps_file = 'tmp_deps.json'
         tmp_no_dev_deps_file = 'tmp_no_dev_deps.txt'
-
+        encoding_list = ['utf8', 'utf16']
         if os.path.exists(tmp_pub_deps_file) and os.path.exists(tmp_no_dev_deps_file):
-            try:
-                with open(tmp_pub_deps_file, 'r', encoding='utf8') as deps_f:
-                    deps_l = json.load(deps_f)
-                    self.parse_pub_deps_file(deps_l)
-                with open(tmp_no_dev_deps_file, 'r', encoding='utf8') as no_dev_f:
-                    self.parse_no_dev_command_file(no_dev_f.read())
-                logger.info('Parse tmp pub deps file.')
-            except Exception as e:
-                logger.error(f'Fail to parse tmp pub deps result file: {e}')
+            for encode in encoding_list:
+                try:
+                    logger.info(f'Try to encode with {encode}.')
+                    with open(tmp_pub_deps_file, 'r+', encoding=encode) as deps_f:
+                        lines = deps_f.readlines()
+                        deps_f.seek(0)
+                        deps_f.truncate()
+                        for num, line in enumerate(lines):
+                            if line.startswith('{'):
+                                first_line = num
+                                break
+                        deps_f.writelines(lines[first_line:])
+                        deps_f.seek(0)
+                        deps_l = json.load(deps_f)
+                        self.parse_pub_deps_file(deps_l)
+                    with open(tmp_no_dev_deps_file, 'r', encoding=encode) as no_dev_f:
+                        self.parse_no_dev_command_file(no_dev_f.read())
+                    logger.info('Parse tmp pub deps file.')
+                except UnicodeDecodeError as e1:
+                    logger.info(f'Fail to encode with {encode}: {e1}')
+                    pass
+                except Exception as e:
+                    logger.error(f'Fail to parse tmp pub deps result file: {e}')
+                    return False
+                else:
+                    logger.info(f'Success to encode with {encode}.')
+                    break
         else:
             try:
                 cmd = "flutter pub get"

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Pypi.py

@@ -56,6 +56,17 @@ class Pypi(PackageManager):
     def run_plugin(self):
         ret = True
 
+        req_f = 'requirements.txt'
+        if os.path.exists(req_f):
+            with open(req_f, encoding='utf8') as rf:
+                for rf_line in rf.readlines():
+                    ret_find = rf_line.find('--extra-index-url ')
+                    if ret_find == -1:
+                        ret_find = rf_line.find('--index-url ')
+                    if ret_find == -1:
+                        continue
+                    self.cover_comment += rf_line
+
         if not self.pip_activate_cmd and not self.pip_deactivate_cmd:
             ret = self.create_virtualenv()
 
@@ -305,17 +316,14 @@ class Pypi(PackageManager):
                     else:
                         comment_list.append('transitive')
                     if f'{oss_init_name}({oss_version})' in self.relation_tree:
-                        rel_items = [f'{self.package_manager_name}:{ri}'
-                                     for ri in self.relation_tree[f'{oss_init_name}({oss_version})']]
-                        deps_list.extend(rel_items)
+                        deps_list.extend(self.relation_tree[f'{oss_init_name}({oss_version})'])
                 comment = ','.join(comment_list)
-                deps = ','.join(deps_list)
                 sheet_list.append([purl, oss_name, oss_version,
-                                   license_name, dn_loc, homepage, '', '', comment, deps])
+                                   license_name, dn_loc, homepage, '', '', comment, deps_list])
 
         except Exception as ex:
             logger.warning(f"Fail to parse oss information: {oss_init_name}({ex})")
-
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list
 
     def get_dependencies(self, dependencies, package):

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/package_manager/Swift.py

@@ -147,12 +147,9 @@ class Swift(PackageManager):
                     comment_list.append('transitive')
 
                 if f'{oss_origin_name}({oss_version})' in self.relation_tree:
-                    rel_items = [f'{self.package_manager_name}:{ri}'
-                                 for ri in self.relation_tree[f'{oss_origin_name}({oss_version})']]
-                    deps_list.extend(rel_items)
+                    deps_list.extend(self.relation_tree[f'{oss_origin_name}({oss_version})'])
             comment = ','.join(comment_list)
-            deps = ','.join(deps_list)
             sheet_list.append([purl, oss_name, oss_version, license_name, dn_loc, homepage,
-                              '', '', comment, deps])
-
+                              '', '', comment, deps_list])
+        sheet_list = self.change_dep_to_purl(sheet_list)
         return sheet_list

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency/run_dependency_scanner.py

@@ -175,11 +175,14 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
     pass_key = 'PASS'
     success_pm = []
     fail_pm = []
+    cover_comment = ''
     for pm, manifest_file_name in found_package_manager.items():
         if manifest_file_name == pass_key:
             continue
-        ret, package_sheet_list = analyze_dependency(pm, input_dir, output_path, pip_activate_cmd, pip_deactivate_cmd,
-                                                     output_custom_dir, app_name, github_token, manifest_file_name, direct)
+        ret, package_sheet_list, cover_comment = analyze_dependency(pm, input_dir, output_path,
+                                                                    pip_activate_cmd, pip_deactivate_cmd,
+                                                                    output_custom_dir, app_name, github_token,
+                                                                    manifest_file_name, direct)
         if ret:
             success_pm.append(f"{pm} ({', '.join(manifest_file_name)})")
             sheet_list[_sheet_name].extend(package_sheet_list)
@@ -210,6 +213,8 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         cover_comment_arr.append("No Package manager detected.")
 
     cover.comment = ' / '.join(cover_comment_arr)
+    if cover_comment:
+        cover.comment += f', {cover_comment}'
 
     output_file_without_ext = os.path.join(output_path, output_file)
     if format.startswith('spdx'):

{fosslight_dependency-3.15.2 → fosslight_dependency-3.15.4}/src/fosslight_dependency.egg-info/PKG-INFO

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