fosslight-dependency 4.1.6__tar.gz → 4.1.7__tar.gz

{fosslight_dependency-4.1.6 → fosslight_dependency-4.1.7}/PKG-INFO

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

{fosslight_dependency-4.1.6 → fosslight_dependency-4.1.7}/setup.py

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

{fosslight_dependency-4.1.6 → fosslight_dependency-4.1.7}/src/fosslight_dependency/_package_manager.py

@@ -11,6 +11,7 @@ import re
 import base64
 import subprocess
 import shutil
+import stat
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from packageurl.contrib import url2purl
@@ -116,6 +117,7 @@ class PackageManager:
                 if ret_plugin:
                     logger.warning('Also it cannot run android-dependency-scanning plugin.')
             if ret_task:
+                current_mode = change_file_mode(cmd_gradle)
                 if ret_alldeps:
                     cmd = f"{cmd_gradle} allDeps"
                     try:
@@ -145,6 +147,7 @@ class PackageManager:
                     except Exception as e:
                         logger.error(f'Fail to run {cmd}: {e}')
                         ret_task = False
+                change_file_mode(cmd_gradle, current_mode)
 
             if os.path.isfile(gradle_backup):
                 os.remove(const.SUPPORT_PACKAE.get(self.package_manager_name))
@@ -422,3 +425,18 @@ def check_and_run_license_scanner(platform, license_scanner_bin, file_dir):
         license_name = ""
 
     return license_name
+
+
+def change_file_mode(filepath, mode=''):
+    current_mode = os.stat(filepath).st_mode
+
+    if not os.path.exists(filepath):
+        logger.debug(f"The file{filepath} does not exist.")
+    else:
+        if not mode:
+            new_mode = current_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
+        else:
+            new_mode = mode
+        os.chmod(filepath, new_mode)
+        logger.debug(f"File mode of {filepath} has been changed to {oct(new_mode)}.")
+    return current_mode

{fosslight_dependency-4.1.6 → fosslight_dependency-4.1.7}/src/fosslight_dependency/package_manager/Maven.py

@@ -13,7 +13,7 @@ import re
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
-from fosslight_dependency._package_manager import version_refine, get_url_to_purl
+from fosslight_dependency._package_manager import version_refine, get_url_to_purl, change_file_mode
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
 from fosslight_util.oss_item import OssItem
 
@@ -142,7 +142,7 @@ class Maven(PackageManager):
         else:
             cmd_mvn = "mvn"
         cmd = f"{cmd_mvn} license:aggregate-download-licenses"
-
+        current_mode = change_file_mode(cmd_mvn)
         ret = subprocess.call(cmd, shell=True)
         if ret != 0:
             logger.error(f"Failed to run maven plugin: {cmd}")
@@ -159,6 +159,7 @@ class Maven(PackageManager):
         except Exception as e:
             logger.error(f"Failed to run '{cmd}': {e}")
             self.set_direct_dependencies(False)
+        change_file_mode(cmd_mvn, current_mode)
 
     def create_dep_stack(self, dep_line):
         dep_stack = []

{fosslight_dependency-4.1.6 → fosslight_dependency-4.1.7}/src/fosslight_dependency/package_manager/Unity.py

@@ -7,6 +7,7 @@ import os
 import logging
 import re
 import yaml
+import requests
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
@@ -76,11 +77,14 @@ class Unity(PackageManager):
                 if oss_item.homepage and oss_item.homepage.startswith('git@'):
                     oss_item.homepage = oss_item.homepage.replace('git@', 'https://')
                 if oss_item.homepage is None or oss_item.homepage.startswith(self.unity_internal_url):
-                    if license_name != proprietary_license:
+                    if (license_name != proprietary_license) and license_name != '':
                         oss_item.homepage = f'{self.mirror_url}{oss_item.name}'
                 if oss_item.homepage is None:
                     oss_item.homepage = ''
-
+                else:
+                    if not check_url_alive(oss_item.homepage):
+                        minor_version = '.'.join(oss_item.version.split('.')[0:2])
+                        oss_item.homepage = f'https://docs.unity3d.com/Packages/{oss_item.name}@{minor_version}'
                 oss_item.download_location = oss_item.homepage
                 dep_item.purl = get_url_to_purl(oss_item.download_location, self.package_manager_name)
                 if dep_item.purl == 'None':
@@ -102,3 +106,16 @@ class Unity(PackageManager):
             logger.error(f"Fail to parse unity oss information: {e}")
 
         return
+
+
+def check_url_alive(url):
+    alive = False
+    try:
+        response = requests.get(url)
+        if response.status_code == 200:
+            alive = True
+        else:
+            logger.debug(f"{url} returned status code {response.status_code}")
+    except requests.exceptions.RequestException as e:
+        logger.debug(f"Check if url({url})is alive err: {e}")
+    return alive

{fosslight_dependency-4.1.6 → fosslight_dependency-4.1.7}/src/fosslight_dependency.egg-info/PKG-INFO

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