Merge branch 'main' into p4-install

Author: furlongm

arch/utils.py

@@ -15,7 +15,7 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 from arch.models import PackageArchitecture, MachineArchitecture
-from patchman.signals import info_message
+from util.logging import info_message
 
 
 def clean_package_architectures():
@@ -24,9 +24,9 @@ def clean_package_architectures():
     parches = PackageArchitecture.objects.filter(package__isnull=True)
     plen = parches.count()
     if plen == 0:
-        info_message.send(sender=None, text='No orphaned PackageArchitectures found.')
+        info_message(text='No orphaned PackageArchitectures found.')
     else:
-        info_message.send(sender=None, text=f'Removing {plen} orphaned PackageArchitectures')
+        info_message(text=f'Removing {plen} orphaned PackageArchitectures')
         parches.delete()
 
 
@@ -39,9 +39,9 @@ def clean_machine_architectures():
     )
     mlen = marches.count()
     if mlen == 0:
-        info_message.send(sender=None, text='No orphaned MachineArchitectures found.')
+        info_message(text='No orphaned MachineArchitectures found.')
     else:
-        info_message.send(sender=None, text=f'Removing {mlen} orphaned MachineArchitectures')
+        info_message(text=f'Removing {mlen} orphaned MachineArchitectures')
         marches.delete()
 
 

debian/control

@@ -20,7 +20,7 @@ Depends: ${misc:Depends}, python3 (>= 3.11), python3-django (>= 4.2),
  python3-requests, python3-colorama, python3-magic, python3-humanize,
  python3-yaml, libapache2-mod-wsgi-py3, apache2, sqlite3,
  celery, python3-celery, python3-django-celery-beat, redis-server,
- python3-redis, python3-git, python3-django-taggit
+ python3-redis, python3-git, python3-django-taggit, python3-zstandard
 Suggests: python3-mysqldb, python3-psycopg2, python3-pymemcache, memcached
 Description: Django-based patch status monitoring tool for linux systems.
  .

errata/models.py

@@ -25,7 +25,7 @@
 from errata.managers import ErratumManager
 from security.models import CVE, Reference
 from security.utils import get_or_create_cve, get_or_create_reference
-from patchman.signals import error_message
+from util.logging import error_message
 from util import get_url
 
 
@@ -70,7 +70,7 @@ def scan_for_security_updates(self):
                     try:
                         affected_update.save()
                     except IntegrityError as e:
-                        error_message.send(sender=None, text=e)
+                        error_message(text=e)
                         # a version of this update already exists that is
                         # marked as a security update, so delete this one
                         affected_update.delete()
@@ -84,7 +84,7 @@ def scan_for_security_updates(self):
                     try:
                         affected_update.save()
                     except IntegrityError as e:
-                        error_message.send(sender=None, text=e)
+                        error_message(text=e)
                         # a version of this update already exists that is
                         # marked as a security update, so delete this one
                         affected_update.delete()
@@ -93,7 +93,7 @@ def fetch_osv_dev_data(self):
         osv_dev_url = f'https://api.osv.dev/v1/vulns/{self.name}'
         res = get_url(osv_dev_url)
         if res.status_code == 404:
-            error_message.send(sender=None, text=f'404 - Skipping {self.name} - {osv_dev_url}')
+            error_message(text=f'404 - Skipping {self.name} - {osv_dev_url}')
             return
         data = res.content
         osv_dev_json = json.loads(data)
@@ -102,7 +102,7 @@ def fetch_osv_dev_data(self):
     def parse_osv_dev_data(self, osv_dev_json):
         name = osv_dev_json.get('id')
         if name != self.name:
-            error_message.send(sender=None, text=f'Erratum name mismatch - {self.name} != {name}')
+            error_message(text=f'Erratum name mismatch - {self.name} != {name}')
             return
         related = osv_dev_json.get('related')
         if related:
@@ -155,7 +155,7 @@ def add_cve(self, cve_id):
         """ Add a CVE to an Erratum object
         """
         if not cve_id.startswith('CVE') or not cve_id.split('-')[1].isdigit():
-            error_message.send(sender=None, text=f'Not a CVE ID: {cve_id}')
+            error_message(text=f'Not a CVE ID: {cve_id}')
             return
         self.cves.add(get_or_create_cve(cve_id))
 

errata/sources/distros/arch.py

@@ -20,7 +20,8 @@
 from django.db import connections
 
 from operatingsystems.utils import get_or_create_osrelease
-from patchman.signals import error_message, pbar_start, pbar_update
+from util.logging import error_message
+from patchman.signals import pbar_start, pbar_update
 from packages.models import Package
 from packages.utils import find_evr, get_matching_packages, get_or_create_package
 from util import get_url, fetch_content
@@ -99,7 +100,7 @@ def process_arch_erratum(advisory, osrelease):
         add_arch_erratum_references(e, advisory)
         add_arch_erratum_packages(e, advisory)
     except Exception as exc:
-        error_message.send(sender=None, text=exc)
+        error_message(text=exc)
 
 
 def add_arch_linux_osrelease():

errata/sources/distros/centos.py

@@ -20,7 +20,8 @@
 from operatingsystems.utils import get_or_create_osrelease
 from packages.models import Package
 from packages.utils import parse_package_string, get_or_create_package
-from patchman.signals import error_message, pbar_start, pbar_update
+from util.logging import error_message
+from patchman.signals import pbar_start, pbar_update
 from util import bunzip2, get_url, fetch_content, get_sha1, get_setting_of_type
 
 
@@ -34,7 +35,7 @@ def update_centos_errata():
     if actual_checksum != expected_checksum:
         e = 'CEFS checksum mismatch, skipping CentOS errata parsing\n'
         e += f'{actual_checksum} (actual) != {expected_checksum} (expected)'
-        error_message.send(sender=None, text=e)
+        error_message(text=e)
     else:
         if data:
             parse_centos_errata(bunzip2(data))

errata/sources/distros/debian.py

@@ -27,7 +27,8 @@
 from operatingsystems.utils import get_or_create_osrelease
 from packages.models import Package
 from packages.utils import get_or_create_package, find_evr
-from patchman.signals import error_message, pbar_start, pbar_update, warning_message
+from util.logging import error_message, warning_message
+from patchman.signals import pbar_start, pbar_update
 from util import get_url, fetch_content, get_setting_of_type, extract
 
 DSCs = {}
@@ -217,7 +218,7 @@ def process_debian_erratum(erratum, accepted_codenames):
             for package in packages:
                 process_debian_erratum_fixed_packages(e, package)
     except Exception as exc:
-        error_message.send(sender=None, text=exc)
+        error_message(text=exc)
 
 
 def parse_debian_erratum_package(line, accepted_codenames):
@@ -249,7 +250,7 @@ def fetch_debian_dsc_package_list(package, version):
     """ Fetch the package list from a DSC file for a given source package/version
     """
     if not DSCs.get(package) or not DSCs[package].get(version):
-        warning_message.send(sender=None, text=f'No DSC found for {package} {version}')
+        warning_message(text=f'No DSC found for {package} {version}')
         return
     source_url = DSCs[package][version]['url']
     res = get_url(source_url)

errata/sources/distros/rocky.py

@@ -25,7 +25,8 @@
 from packages.models import Package
 from packages.utils import parse_package_string, get_or_create_package
 from patchman.signals import pbar_start, pbar_update
-from util import get_url, fetch_content, info_message, error_message
+from util import get_url, fetch_content
+from util.logging import info_message, error_message
 
 
 def update_rocky_errata(concurrent_processing=True):
@@ -50,16 +51,16 @@ def check_rocky_errata_endpoint_health(rocky_errata_api_host):
         health = json.loads(data)
         if health.get('status') == 'ok':
             s = f'Rocky Errata API healthcheck OK: {rocky_errata_healthcheck_url}'
-            info_message.send(sender=None, text=s)
+            info_message(text=s)
             return True
         else:
             s = f'Rocky Errata API healthcheck FAILED: {rocky_errata_healthcheck_url}'
-            error_message.send(sender=None, text=s)
+            error_message(text=s)
             return False
     except Exception as e:
         s = f'Rocky Errata API healthcheck exception occured: {rocky_errata_healthcheck_url}\n'
         s += str(e)
-        error_message.send(sender=None, text=s)
+        error_message(text=s)
         return False
 
 
@@ -194,7 +195,7 @@ def process_rocky_erratum(advisory):
         add_rocky_erratum_oses(e, advisory)
         add_rocky_erratum_packages(e, advisory)
     except Exception as exc:
-        error_message.send(sender=None, text=exc)
+        error_message(text=exc)
 
 
 def add_rocky_erratum_references(e, advisory):

errata/sources/distros/ubuntu.py

@@ -28,7 +28,8 @@
 from packages.models import Package
 from packages.utils import get_or_create_package, parse_package_string, find_evr, get_matching_packages
 from util import get_url, fetch_content, get_sha256, bunzip2, get_setting_of_type
-from patchman.signals import error_message, pbar_start, pbar_update
+from util.logging import error_message
+from patchman.signals import pbar_start, pbar_update
 
 
 def update_ubuntu_errata(concurrent_processing=False):
@@ -45,7 +46,7 @@ def update_ubuntu_errata(concurrent_processing=False):
         else:
             e = 'Ubuntu USN DB checksum mismatch, skipping Ubuntu errata parsing\n'
             e += f'{actual_checksum} (actual) != {expected_checksum} (expected)'
-            error_message.send(sender=None, text=e)
+            error_message(text=e)
 
 
 def fetch_ubuntu_usn_db():
@@ -126,7 +127,7 @@ def process_usn(usn_id, advisory, accepted_releases):
         add_ubuntu_erratum_references(e, usn_id, advisory)
         add_ubuntu_erratum_packages(e, advisory)
     except Exception as exc:
-        error_message.send(sender=None, text=exc)
+        error_message(text=exc)
 
 
 def add_ubuntu_erratum_osreleases(e, affected_releases, accepted_releases):

errata/sources/repos/yum.py

@@ -23,7 +23,8 @@
 from operatingsystems.utils import get_or_create_osrelease
 from packages.models import Package
 from packages.utils import get_or_create_package
-from patchman.signals import pbar_start, pbar_update, error_message
+from util.logging import error_message
+from patchman.signals import pbar_start, pbar_update
 from security.models import Reference
 from util import extract, get_url
 
@@ -38,7 +39,7 @@ def extract_updateinfo(data, url, concurrent_processing=True):
         elen = root.__len__()
         updates = root.findall('update')
     except ElementTree.ParseError as e:
-        error_message.send(sender=None, text=f'Error parsing updateinfo file from {url} : {e}')
+        error_message(text=f'Error parsing updateinfo file from {url} : {e}')
     if concurrent_processing:
         extract_updateinfo_concurrently(updates, elen)
     else:

errata/tasks.py

@@ -22,7 +22,7 @@
 from errata.sources.distros.centos import update_centos_errata
 from errata.sources.distros.rocky import update_rocky_errata
 from errata.sources.distros.ubuntu import update_ubuntu_errata
-from patchman.signals import error_message
+from util.logging import error_message
 from repos.models import Repository
 from security.tasks import update_cves, update_cwes
 from util import get_setting_of_type