- {% if allversions %}
-
+ {% if table.rows %}
+ {% render_table table %}
{% else %}
No versions of this Package exist.
{% endif %}
diff --git a/packages/templates/packages/package_update_list.html b/packages/templates/packages/package_update_list.html
new file mode 100644
index 00000000..62c2557d
--- /dev/null
+++ b/packages/templates/packages/package_update_list.html
@@ -0,0 +1,7 @@
+{% extends "objectlist.html" %}
+
+{% block page_title %}Package Updates{% endblock %}
+
+{% block breadcrumbs %} {{ block.super }}
Package Updates{% endblock %}
+
+{% block content_title %} Package Updates {% endblock %}
diff --git a/packages/tests/test_views.py b/packages/tests/test_views.py
new file mode 100644
index 00000000..9fc86abd
--- /dev/null
+++ b/packages/tests/test_views.py
@@ -0,0 +1,72 @@
+from django.contrib.auth.models import User
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from arch.models import PackageArchitecture
+from packages.models import Package, PackageName, PackageUpdate
+
+
+@override_settings(
+ CELERY_TASK_ALWAYS_EAGER=True,
+ CACHES={'default': {'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'}}
+)
+class PackageUpdateViewTests(TestCase):
+
+ def setUp(self):
+ self.user = User.objects.create_user(
+ username='testuser', password='testpass'
+ )
+ self.client.login(username='testuser', password='testpass')
+ self.arch = PackageArchitecture.objects.create(name='x86_64')
+ self.name = PackageName.objects.create(name='openssl')
+ self.old = Package.objects.create(
+ name=self.name, arch=self.arch, epoch='',
+ version='1.1.1', release='1', packagetype='R',
+ )
+ self.new = Package.objects.create(
+ name=self.name, arch=self.arch, epoch='',
+ version='1.1.2', release='1', packagetype='R',
+ )
+ self.sec_update = PackageUpdate.objects.create(
+ oldpackage=self.old, newpackage=self.new, security=True,
+ )
+ self.bug_update = PackageUpdate.objects.create(
+ oldpackage=self.old, newpackage=self.new, security=False,
+ )
+
+ def test_update_list(self):
+ resp = self.client.get(reverse('packages:package_update_list'))
+ self.assertEqual(resp.status_code, 200)
+ self.assertContains(resp, 'openssl')
+
+ def test_update_list_filter_security(self):
+ resp = self.client.get(
+ reverse('packages:package_update_list'), {'security': 'true'}
+ )
+ self.assertEqual(resp.status_code, 200)
+ self.assertContains(resp, 'Security')
+
+ def test_update_list_filter_bugfix(self):
+ resp = self.client.get(
+ reverse('packages:package_update_list'), {'security': 'false'}
+ )
+ self.assertEqual(resp.status_code, 200)
+ self.assertContains(resp, 'Bugfix')
+
+ def test_update_list_search(self):
+ resp = self.client.get(
+ reverse('packages:package_update_list'), {'search': 'openssl'}
+ )
+ self.assertEqual(resp.status_code, 200)
+ self.assertContains(resp, 'openssl')
+
+ def test_update_list_search_no_results(self):
+ resp = self.client.get(
+ reverse('packages:package_update_list'), {'search': 'nonexistent'}
+ )
+ self.assertEqual(resp.status_code, 200)
+
+ def test_update_list_requires_login(self):
+ self.client.logout()
+ resp = self.client.get(reverse('packages:package_update_list'))
+ self.assertEqual(resp.status_code, 302)
diff --git a/packages/urls.py b/packages/urls.py
index bc027807..75273450 100644
--- a/packages/urls.py
+++ b/packages/urls.py
@@ -27,4 +27,5 @@
path('name/
/', views.package_name_detail, name='package_name_detail'),
path('id/', views.package_list, name='package_list'),
path('id//', views.package_detail, name='package_detail'),
+ path('updates/', views.package_update_list, name='package_update_list'),
]
diff --git a/packages/utils.py b/packages/utils.py
index c7f86b4c..54d56273 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -277,6 +277,22 @@ def get_matching_packages(name, epoch, version, release, p_type, arch=None):
return packages
+def get_matching_packages_q(name, q, p_type, arch=None):
+ """ Get packages matching a compound Q filter for batch version lookups.
+ Returns the matching packages or an empty queryset.
+ """
+ try:
+ package_name = PackageName.objects.get(name=name)
+ except PackageName.DoesNotExist:
+ return Package.objects.none()
+ base_filter = {'name': package_name, 'packagetype': p_type}
+ if arch:
+ if not isinstance(arch, PackageArchitecture):
+ arch, _ = PackageArchitecture.objects.get_or_create(name=arch)
+ base_filter['arch'] = arch
+ return Package.objects.filter(q, **base_filter)
+
+
def clean_packageupdates():
""" Removes PackageUpdate objects that are no longer linked to any hosts
"""
diff --git a/packages/views.py b/packages/views.py
index 9f75b415..0f2aaecb 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -16,7 +16,7 @@
# along with Patchman. If not, see
from django.contrib.auth.decorators import login_required
-from django.db.models import Q
+from django.db.models import Count, Q
from django.shortcuts import get_object_or_404, render
from django_tables2 import RequestConfig
from rest_framework import viewsets
@@ -26,7 +26,7 @@
from packages.serializers import (
PackageNameSerializer, PackageSerializer, PackageUpdateSerializer,
)
-from packages.tables import PackageNameTable, PackageTable
+from packages.tables import PackageNameTable, PackageTable, PackageUpdateTable
from util.filterspecs import Filter, FilterBar
@@ -109,6 +109,13 @@ def package_list(request):
filter_list.append(Filter(request, 'Architecture', 'arch_id', PackageArchitecture.objects.all()))
filter_bar = FilterBar(request, filter_list)
+ packages = packages.annotate(
+ host_count=Count('host', distinct=True),
+ repo_count=Count('mirror__repo', distinct=True),
+ affected_count=Count('affected_by_erratum', distinct=True),
+ fixed_count=Count('provides_fix_in_erratum', distinct=True),
+ )
+
table = PackageTable(packages)
RequestConfig(request, paginate={'per_page': 50}).configure(table)
@@ -144,6 +151,8 @@ def package_name_list(request):
filter_list.append(Filter(request, 'Architecture', 'arch_id', PackageArchitecture.objects.all()))
filter_bar = FilterBar(request, filter_list)
+ packages = packages.annotate(host_count=Count('package__host', distinct=True))
+
table = PackageNameTable(packages)
RequestConfig(request, paginate={'per_page': 50}).configure(table)
@@ -165,11 +174,62 @@ def package_detail(request, package_id):
@login_required
def package_name_detail(request, packagename):
package = get_object_or_404(PackageName, name=packagename)
- allversions = Package.objects.select_related('name', 'arch').filter(name=package.id)
+ allversions = Package.objects.select_related(
+ 'name', 'arch',
+ ).filter(name=package.id).annotate(
+ host_count=Count('host', distinct=True),
+ repo_count=Count('mirror__repo', distinct=True),
+ affected_count=Count('affected_by_erratum', distinct=True),
+ fixed_count=Count('provides_fix_in_erratum', distinct=True),
+ )
+ table = PackageTable(allversions)
+ RequestConfig(request, paginate={'per_page': 50}).configure(table)
return render(request,
'packages/package_name_detail.html',
{'package': package,
- 'allversions': allversions})
+ 'table': table})
+
+
+@login_required
+def package_update_list(request):
+ updates = PackageUpdate.objects.select_related(
+ 'oldpackage__name', 'oldpackage__arch',
+ 'newpackage__name', 'newpackage__arch',
+ ).annotate(
+ host_count=Count('host', distinct=True),
+ affected_count=Count('oldpackage__affected_by_erratum', distinct=True),
+ fixed_count=Count('newpackage__provides_fix_in_erratum', distinct=True),
+ )
+
+ if 'security' in request.GET:
+ security = request.GET['security'] == 'true'
+ updates = updates.filter(security=security)
+ if 'host_id' in request.GET:
+ updates = updates.filter(host=request.GET['host_id'])
+ if 'search' in request.GET:
+ terms = request.GET['search'].lower()
+ query = Q()
+ for term in terms.split(' '):
+ q = (Q(oldpackage__name__name__icontains=term) |
+ Q(newpackage__name__name__icontains=term))
+ query = query & q
+ updates = updates.filter(query)
+ else:
+ terms = ''
+
+ filter_list = []
+ filter_list.append(Filter(request, 'Type', 'security',
+ {'true': 'Security', 'false': 'Bugfix'}))
+ filter_bar = FilterBar(request, filter_list)
+
+ table = PackageUpdateTable(updates.distinct())
+ RequestConfig(request, paginate={'per_page': 50}).configure(table)
+
+ return render(request,
+ 'packages/package_update_list.html',
+ {'table': table,
+ 'filter_bar': filter_bar,
+ 'terms': terms})
class PackageNameViewSet(viewsets.ModelViewSet):
diff --git a/patchman/celery.py b/patchman/celery.py
index c47f994d..95c0c4fe 100644
--- a/patchman/celery.py
+++ b/patchman/celery.py
@@ -17,10 +17,24 @@
import os
from celery import Celery
+from celery.signals import task_prerun
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'patchman.settings') # noqa
+from django import db # noqa
from django.conf import settings # noqa
app = Celery('patchman')
app.config_from_object('django.conf:settings', namespace='CELERY')
app.autodiscover_tasks()
+
+
+@task_prerun.connect
+def close_stale_connections(**kwargs):
+ """Close stale DB connections before each task.
+
+ Django does this automatically for HTTP requests but not for Celery
+ tasks. Without this, long-lived workers hit 'server has gone away'
+ (MySQL) or 'server closed the connection unexpectedly' (PostgreSQL)
+ when the DB server drops idle connections.
+ """
+ db.close_old_connections()
diff --git a/patchman/receivers.py b/patchman/receivers.py
index 9393d891..99a544c9 100644
--- a/patchman/receivers.py
+++ b/patchman/receivers.py
@@ -15,9 +15,12 @@
# You should have received a copy of the GNU General Public License
# along with Patchman. If not, see
+import sys
+
from colorama import Fore, Style, init
from django.conf import settings
from django.dispatch import receiver
+from tqdm import tqdm
from tqdm.contrib.logging import logging_redirect_tqdm
from patchman.signals import (
@@ -54,9 +57,7 @@ def print_info_message(**kwargs):
"""
text = str(kwargs.get('text'))
if not get_quiet_mode():
- with logging_redirect_tqdm(loggers=[logger]):
- for line in text.splitlines():
- logger.info(Style.RESET_ALL + Fore.RESET + line)
+ tqdm.write(text, file=sys.stdout)
@receiver(warning_message_s)
diff --git a/patchman/sqlite3/base.py b/patchman/sqlite3/base.py
index c7ba0c6f..8e1ea030 100644
--- a/patchman/sqlite3/base.py
+++ b/patchman/sqlite3/base.py
@@ -20,6 +20,11 @@
class DatabaseWrapper(base.DatabaseWrapper):
+ def get_new_connection(self, conn_params):
+ conn = super().get_new_connection(conn_params)
+ conn.execute('PRAGMA journal_mode=WAL')
+ return conn
+
def _start_transaction_under_autocommit(self):
# Acquire a write lock immediately for transactions
self.cursor().execute('BEGIN IMMEDIATE')
diff --git a/reports/models.py b/reports/models.py
index a0f2bbef..578e2c46 100644
--- a/reports/models.py
+++ b/reports/models.py
@@ -46,7 +46,7 @@ class Report(models.Model):
reboot = models.TextField(null=True, blank=True)
class Meta:
- verbose_name_plural = 'Report'
+ verbose_name = 'Report'
verbose_name_plural = 'Reports'
ordering = ['-created']
diff --git a/reports/tests/test_utils.py b/reports/tests/test_utils.py
index b139669b..0f99c83a 100644
--- a/reports/tests/test_utils.py
+++ b/reports/tests/test_utils.py
@@ -227,6 +227,35 @@ def test_process_repo_json_rpm(self):
# RPM priority is negated
self.assertEqual(priority, -99)
+ def test_process_repo_no_rename_on_existing_mirror(self):
+ """Repo found by mirror URL should keep its original name.
+
+ Repo names are set at creation and should not be overwritten by
+ client reports — the admin may have renamed the repo in the UI.
+ """
+ repo, _ = process_repo(
+ r_type=Repository.RPM,
+ r_name='Zabbix Official Repository - x86_64 x86_64',
+ r_id='zabbix',
+ r_priority=-99,
+ urls=['https://repo.zabbix.com/zabbix/6.0/rhel/9/x86_64'],
+ arch='x86_64',
+ )
+ self.assertEqual(repo.name, 'Zabbix Official Repository - x86_64 x86_64')
+
+ # updated client reports same URL with corrected name
+ repo2, _ = process_repo(
+ r_type=Repository.RPM,
+ r_name='Zabbix Official Repository - x86_64',
+ r_id='zabbix',
+ r_priority=-99,
+ urls=['https://repo.zabbix.com/zabbix/6.0/rhel/9/x86_64'],
+ arch='x86_64',
+ )
+ # should return the same repo, name unchanged
+ self.assertEqual(repo2.id, repo.id)
+ self.assertEqual(repo2.name, 'Zabbix Official Repository - x86_64 x86_64')
+
@override_settings(
CELERY_TASK_ALWAYS_EAGER=True,
diff --git a/reports/utils.py b/reports/utils.py
index 9b2a4196..4fea67d3 100644
--- a/reports/utils.py
+++ b/reports/utils.py
@@ -258,9 +258,6 @@ def process_repo(r_type, r_name, r_id, r_priority, urls, arch):
if r_id and repository.repo_id != r_id:
repository.repo_id = r_id
- if r_name and repository.name != r_name:
- repository.name = r_name
-
for url in unknown:
Mirror.objects.create(repo=repository, url=url.rstrip('/'))
diff --git a/reports/views.py b/reports/views.py
index e5d1d438..2aab3e54 100644
--- a/reports/views.py
+++ b/reports/views.py
@@ -220,7 +220,7 @@ def report_bulk_action(request):
action = request.POST.get('action', '')
select_all_filtered = request.POST.get('select_all_filtered') == '1'
- filter_params = request.POST.get('filter_params', '')
+ filter_params = sanitize_filter_params(request.POST.get('filter_params', ''))
if not action:
messages.warning(request, 'Please select an action')
diff --git a/repos/repo_types/yum.py b/repos/repo_types/yum.py
index 1e96db39..24584fe9 100644
--- a/repos/repo_types/yum.py
+++ b/repos/repo_types/yum.py
@@ -68,6 +68,7 @@ def extract_module_metadata(data, url, repo):
modules_yaml = yaml.safe_load_all(extracted)
except yaml.YAMLError as e:
error_message(text=f'Error parsing modules.yaml: {e}')
+ return modules
mlen = len(re.findall(r'---', yaml.dump(extracted.decode())))
pbar_start.send(sender=None, ptext=f'Extracting {mlen} Modules ', plen=mlen)
diff --git a/repos/views.py b/repos/views.py
index 1a796c11..7a804a19 100644
--- a/repos/views.py
+++ b/repos/views.py
@@ -452,7 +452,7 @@ def repo_bulk_action(request):
action = request.POST.get('action', '')
select_all_filtered = request.POST.get('select_all_filtered') == '1'
- filter_params = request.POST.get('filter_params', '')
+ filter_params = sanitize_filter_params(request.POST.get('filter_params', ''))
if not action:
messages.warning(request, 'Please select an action')
@@ -531,7 +531,7 @@ def mirror_bulk_action(request):
action = request.POST.get('action', '')
select_all_filtered = request.POST.get('select_all_filtered') == '1'
- filter_params = request.POST.get('filter_params', '')
+ filter_params = sanitize_filter_params(request.POST.get('filter_params', ''))
if not action:
messages.warning(request, 'Please select an action')
diff --git a/requirements.txt b/requirements.txt
index 3f358230..62441847 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
-Django==4.2.29
+Django==4.2.30
django-taggit==4.0.0
django-extensions==3.2.3
django-bootstrap3==23.1
python-debian==1.0.1
defusedxml==0.7.1
PyYAML==6.0.2
-requests==2.32.4
+requests==2.33.0
colorama==0.4.6
djangorestframework==3.15.2
djangorestframework-api-key==3.0.0
diff --git a/security/models.py b/security/models.py
index 4a19f9ca..aab22882 100644
--- a/security/models.py
+++ b/security/models.py
@@ -179,8 +179,10 @@ def parse_osv_dev_cve_data(self, cve_json):
references = cve_json.get('references')
if references:
for reference in references:
- ref_type = reference.get('type').capitalize()
url = reference.get('url')
+ if not url:
+ continue
+ ref_type = reference.get('type').capitalize()
get_or_create_reference(ref_type, url)
scores = cve_json.get('severity')
if scores:
diff --git a/security/utils.py b/security/utils.py
index 745cf1f8..4033fc68 100644
--- a/security/utils.py
+++ b/security/utils.py
@@ -95,15 +95,19 @@ def fixup_reference(ref):
""" Fix up a Security Reference object to normalize the URL and type
"""
url = urlparse(ref.get('url'))
+ if not url.hostname:
+ return ref
ref_type = ref.get('ref_type')
- if 'lists' in url.hostname or 'lists' in url.path:
+ hostname = url.hostname
+ if 'lists' in hostname or 'lists' in url.path:
ref_type = 'Mailing List'
- if ref_type == 'bugzilla' or 'bug' in url.hostname or 'bugs' in url.path:
+ if ref_type == 'bugzilla' or 'bug' in hostname or 'bugs' in url.path:
ref_type = 'Bug Tracker'
url = fixup_ubuntu_usn_url(url)
- if url.hostname == 'ubuntu.com' and url.path.startswith('/security/notices/USN'):
+ hostname = url.hostname
+ if hostname == 'ubuntu.com' and url.path.startswith('/security/notices/USN'):
ref_type = 'USN'
- if 'launchpad.net' in url.hostname:
+ if 'launchpad.net' in hostname:
ref_type = 'Bug Tracker'
netloc = url.netloc.replace('bugs.', '')
bug = url.path.split('/')[-1]
diff --git a/util/templates/navbar.html b/util/templates/navbar.html
index 263be6a4..d07c40d5 100644
--- a/util/templates/navbar.html
+++ b/util/templates/navbar.html
@@ -12,7 +12,13 @@
Mirrors
- Packages
+
Errata