ossa-scanner 0.1.29__py3-none-any.whl → 0.1.31__py3-none-any.whl

ossa_scanner/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.29"
+__version__ = "0.1.31"

ossa_scanner/scanner.py

@@ -25,7 +25,7 @@ class Scanner:
     def process_package(self, package):
         try:
             print(f"Processing package: {package}")
-            package_info = get_package_info(self.pm_type, package)
+            package_info = get_package_info(self.pm_type, package, self.temp_dir)
             source_files = download_source(self.pm_type, package, self.temp_dir)
             self.save_package_report(package, package_info, source_files)
         except Exception as e:

ossa_scanner/utils/package_manager.py

@@ -46,7 +46,7 @@ def list_packages(package_manager):
     return package_list
 
 
-def get_package_info(package_manager, package_name):
+def get_package_info(package_manager, package_name, output_dir):
     if package_manager == 'apt':
         cmd = ['apt-cache', 'show', package_name]
     elif package_manager in ['yum', 'dnf']:
@@ -65,7 +65,7 @@ def get_package_info(package_manager, package_name):
             elif package_manager in ['yum', 'dnf']:
                 return parse_yum_info(output)
             elif package_manager == 'apt':
-                return parse_apt_info(output, package_name)
+                return parse_apt_info(output, package_name, output_dir)
     except subprocess.CalledProcessError as e:
         print(f"Command failed: {e}")
         return None
@@ -129,7 +129,7 @@ def parse_yum_info(output):
             info["summary"] = line.split(":", 1)[1].strip()
     return info
 
-def parse_apt_info(output, package_name):
+def parse_apt_info(output, package_name, output_dir):
     info = {}
     lines = output.splitlines()
     for line in lines:
@@ -141,19 +141,12 @@ def parse_apt_info(output, package_name):
             info["licenses"] = line.split(":", 1)[1].strip()
 
     if "licenses" not in info:
-        print(package_name, 'not found licenses')
-        info["licenses"] = apt_get_license_from_source(package_name)
+        info["licenses"] = apt_get_license_from_source(package_name, output_dir)
+    if info["licenses"]:
+        info["licenses"] = extract_spdx_ids(info["licenses"])
+        severity = license_classificaton(info["licenses"])
     else:
-        print(package_name, 'license found as', info["licenses"])
-
-    # if info["licenses"]:
-    #    info["licenses"] = extract_spdx_ids(info["licenses"])
-    #    severity = license_classificaton(info["licenses"])
-    # else:
-        
-    severity = "Informational"
-
-    print(package_name, info)
+        severity = "Informational"
 
     # Ensure all keys are present even if data is missing
     return {
@@ -163,10 +156,10 @@ def parse_apt_info(output, package_name):
         "severity": severity,
     }
 
-def apt_get_license_from_source(package_name):
+def apt_get_license_from_source(package_name, output_dir):
     try:
-        subprocess.run(["apt-get", "source", package_name], check=True, capture_output=True, text=True)
-        source_dirs = [d for d in os.listdir() if d.startswith(package_name) and os.path.isdir(d)]
+        subprocess.run(["apt-get", "source", package_name, '-d', output_dir], check=True, capture_output=True, text=True)
+        source_dirs = [d for d in os.listdir(output_dir) if d.startswith(package_name) and os.path.isdir(d)]
         if not source_dirs:
             return "NOASSERTION"
         package_dir = source_dirs[0]
@@ -177,7 +170,7 @@ def apt_get_license_from_source(package_name):
                 for line in f:
                     if re.search(r"(?i)license:", line):
                         licenses.append(line.split(":", 1)[1].strip())
-        shutil.rmtree(package_dir, ignore_errors=True)
+        shutil.rmtree(output_dir, ignore_errors=True)
         return ", ".join(set(licenses)) if licenses else "NOASSERTION"
     except subprocess.CalledProcessError as e:
         print(f"Error fetching source package: {e}")

{ossa_scanner-0.1.29.dist-info → ossa_scanner-0.1.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.29
+Version: 0.1.31
 Summary: Open Source Software Advisory generator for Core and Base Linux Packages.
 Home-page: https://github.com/oscarvalenzuelab/ossa_scanner
 Author: Oscar Valenzuela

{ossa_scanner-0.1.29.dist-info → ossa_scanner-0.1.31.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ossa_scanner/__init__.py,sha256=A-lFHZ4YpCrWZ6nw3tlt_yurFJ00mInm3gR6hz51Eww,23
+ossa_scanner/__init__.py,sha256=i-fDEsQ0iAiPKXFaj9eERDqcxl3BqNnavaCEqpNxmVI,23
 ossa_scanner/cli.py,sha256=sgr8NFpf_Ut84KYFQjOKRxv8CfAMaTPhMo7DbR53lT4,2311
-ossa_scanner/scanner.py,sha256=Zmk-Qr8jDoPdCXLkospp2NUgYl7Sdhx_Rhraltxd2u8,4787
+ossa_scanner/scanner.py,sha256=P_pouAPLMWUq_tjiwDyBYvs6cnXDs5VHB8305ui2VHI,4802
 ossa_scanner/uploader.py,sha256=dPbhSLlQcDyHP-6Ugn6BzYGn_VQ1Ik6TWt2138k3REo,1837
 ossa_scanner/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ossa_scanner/utils/downloader.py,sha256=AGRhJU9YducTe6mY5-7mZ4fRTFg2tcfz1DS0Nee-wM0,5693
 ossa_scanner/utils/hash_calculator.py,sha256=LrDKngWOPbizYJWab2sDJDLB4pD_RrI51L0cZt3VjJY,960
 ossa_scanner/utils/os_detection.py,sha256=35VbUbFklzd7aojgltKf2PxbnVFcpREA7Tri2YI5nfY,417
-ossa_scanner/utils/package_manager.py,sha256=3MypwpwmE94nd1d72yQkwAeF8WLB8z9wTCYoX4PPzl0,8561
+ossa_scanner/utils/package_manager.py,sha256=E3MmVIieBUHdt4wm_2w1DDvj1-UoHDft9WMpjd4HSBI,8479
 ossa_scanner/utils/swhid_calculator.py,sha256=7-bO4RglJr-kt5SjUfnlcPZD0k0-s_dveHEjRo-zEMc,1317
-ossa_scanner-0.1.29.dist-info/LICENSE,sha256=9slQ_XNiEkio28l90NwihP7a90fCL2GQ6YhcVXTBls4,1064
-ossa_scanner-0.1.29.dist-info/METADATA,sha256=eyyLV2tjnS32xBRH3_Gfp_Jdx1WiDZuDcGh3OrsXy-o,1938
-ossa_scanner-0.1.29.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ossa_scanner-0.1.29.dist-info/entry_points.txt,sha256=UVoAo-wTPxT82g3cfqTs2CmQnazd57TAwhd9VwEKD1c,55
-ossa_scanner-0.1.29.dist-info/top_level.txt,sha256=uUp5CvhZfJLapXn9DyUXvgH7QK3uzF2ibH943lWN5Bs,13
-ossa_scanner-0.1.29.dist-info/RECORD,,
+ossa_scanner-0.1.31.dist-info/LICENSE,sha256=9slQ_XNiEkio28l90NwihP7a90fCL2GQ6YhcVXTBls4,1064
+ossa_scanner-0.1.31.dist-info/METADATA,sha256=j8ISVXSb5G-ZmooWsBN6jRuD0bUXhFsEDeGBNt7Ti5M,1938
+ossa_scanner-0.1.31.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ossa_scanner-0.1.31.dist-info/entry_points.txt,sha256=UVoAo-wTPxT82g3cfqTs2CmQnazd57TAwhd9VwEKD1c,55
+ossa_scanner-0.1.31.dist-info/top_level.txt,sha256=uUp5CvhZfJLapXn9DyUXvgH7QK3uzF2ibH943lWN5Bs,13
+ossa_scanner-0.1.31.dist-info/RECORD,,