ossa-scanner 0.1.29__tar.gz → 0.1.31__tar.gz

{ossa_scanner-0.1.29 → ossa_scanner-0.1.31}/PKG-INFO

@@ -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.31/ossa_scanner/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.31"

{ossa_scanner-0.1.29 → ossa_scanner-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-0.1.29 → ossa_scanner-0.1.31}/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 → ossa_scanner-0.1.31}/ossa_scanner.egg-info/PKG-INFO

@@ -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/ossa_scanner/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.29"