ossa-scanner 0.1.35__py3-none-any.whl → 0.1.37__py3-none-any.whl

ossa_scanner/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.35"
+__version__ = "0.1.37"

ossa_scanner/scanner.py

@@ -26,6 +26,7 @@ class Scanner:
         try:
             print(f"Processing package: {package}")
             package_info = get_package_info(self.pm_type, package, self.temp_dir)
+            exit()
             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

@@ -2,7 +2,7 @@ import subprocess
 import re
 import os
 import shutil
-
+import glob
 
 def list_packages(package_manager):
     if package_manager == 'apt':
@@ -158,37 +158,25 @@ def parse_apt_info(output, package_name, output_dir):
     }
 
 def apt_get_license_from_source(package_name, output_dir):
-    """Fetches source package and extracts license from debian/copyright."""
     p_hash = hash(package_name) % 10000
+    print('p_hash:', p_hash)
     output_dir = os.path.join(output_dir, str(p_hash))
     try:
-        # Ensure output directory exists
-        os.makedirs(output_dir, exist_ok=True)
-
-        # Run apt-get source inside output_dir
-        subprocess.run(["apt-get", "source", package_name], check=True, capture_output=True, text=True, cwd=output_dir)
-
-        # Find the extracted source directory (since apt-get source doesn't always use package_name directly)
-        source_dirs = glob.glob(os.path.join(output_dir, f"{package_name}-*"))  # Wildcard match for versioned package dirs
+        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"
-
+        print(package_name, source_dirs)
         package_dir = source_dirs[0]
         copyright_file = os.path.join(package_dir, "debian", "copyright")
-
-        # Extract license information
         licenses = []
         if os.path.exists(copyright_file):
             with open(copyright_file, "r", encoding="utf-8") as f:
                 for line in f:
                     if re.search(r"(?i)license:", line):
                         licenses.append(line.split(":", 1)[1].strip())
-
-        # Cleanup
         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}")
         return "NOASSERTION"

{ossa_scanner-0.1.35.dist-info → ossa_scanner-0.1.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.35
+Version: 0.1.37
 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.35.dist-info → ossa_scanner-0.1.37.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ossa_scanner/__init__.py,sha256=ABqgofsnbWf7823vTBbZNQ81eKQbWwrVToAU6T3z-6s,23
+ossa_scanner/__init__.py,sha256=fZtrhA5kKp_n3T2sxpEh-YEt3P1ZAtGrg_Xuu1JX3ZQ,23
 ossa_scanner/cli.py,sha256=sgr8NFpf_Ut84KYFQjOKRxv8CfAMaTPhMo7DbR53lT4,2311
-ossa_scanner/scanner.py,sha256=P_pouAPLMWUq_tjiwDyBYvs6cnXDs5VHB8305ui2VHI,4802
+ossa_scanner/scanner.py,sha256=4VfkM2h-Y1zFQnqdBxpav5OhRoTdjdmFbF5VOXKKoXU,4821
 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=yLeflIDHfM3prLLXDm7oA7GGpy5uV0XPBVsfKRFdEBE,9053
+ossa_scanner/utils/package_manager.py,sha256=0oV5g5e0v6GBn-phEzjtDK8lYr1Y_F-O1ohnMY8WlFE,8736
 ossa_scanner/utils/swhid_calculator.py,sha256=7-bO4RglJr-kt5SjUfnlcPZD0k0-s_dveHEjRo-zEMc,1317
-ossa_scanner-0.1.35.dist-info/LICENSE,sha256=9slQ_XNiEkio28l90NwihP7a90fCL2GQ6YhcVXTBls4,1064
-ossa_scanner-0.1.35.dist-info/METADATA,sha256=Gs9hHYLoQbCO-MMloS8dxCzmsNEx563wtZ4T4OgNRKM,1938
-ossa_scanner-0.1.35.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ossa_scanner-0.1.35.dist-info/entry_points.txt,sha256=UVoAo-wTPxT82g3cfqTs2CmQnazd57TAwhd9VwEKD1c,55
-ossa_scanner-0.1.35.dist-info/top_level.txt,sha256=uUp5CvhZfJLapXn9DyUXvgH7QK3uzF2ibH943lWN5Bs,13
-ossa_scanner-0.1.35.dist-info/RECORD,,
+ossa_scanner-0.1.37.dist-info/LICENSE,sha256=9slQ_XNiEkio28l90NwihP7a90fCL2GQ6YhcVXTBls4,1064
+ossa_scanner-0.1.37.dist-info/METADATA,sha256=1ArwCv6tEGhpbb_pY0_6pRM3Pkh7YMqxZgcyfHX04TI,1938
+ossa_scanner-0.1.37.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ossa_scanner-0.1.37.dist-info/entry_points.txt,sha256=UVoAo-wTPxT82g3cfqTs2CmQnazd57TAwhd9VwEKD1c,55
+ossa_scanner-0.1.37.dist-info/top_level.txt,sha256=uUp5CvhZfJLapXn9DyUXvgH7QK3uzF2ibH943lWN5Bs,13
+ossa_scanner-0.1.37.dist-info/RECORD,,