patchman 3.0.13__tar.gz → 3.0.14__tar.gz

{patchman-3.0.13 → patchman-3.0.14}/INSTALL.md

@@ -63,8 +63,8 @@ apt -y install gcc libxml2-dev libxslt1-dev virtualenv python3-dev zlib1g-dev  #
 dnf -y install gcc libxml2-devel libxslt-devel python3-virtualenv              # (centos/rocky/alma)
 mkdir /srv/patchman
 cd /srv/patchman
-virtualenv .
-. bin/activate
+python3 -m venv .venv
+. .venv/bin/activate
 pip install --upgrade pip
 pip install patchman gunicorn whitenoise==3.3.1
 patchman-manage migrate

{patchman-3.0.13 → patchman-3.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: patchman
-Version: 3.0.13
+Version: 3.0.14
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong
@@ -21,7 +21,7 @@ Requires-Dist: django-extensions==3.2.1
 Requires-Dist: django-bootstrap3==23.1
 Requires-Dist: progressbar==2.5
 Requires-Dist: python-debian==0.1.49
-Requires-Dist: lxml==4.9.4
+Requires-Dist: lxml==5.2.2
 Requires-Dist: defusedxml==0.7.1
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: chardet==4.0.0
@@ -33,6 +33,16 @@ Requires-Dist: humanize==3.13.1
 Requires-Dist: version-utils==0.3.0
 Requires-Dist: python-magic==0.4.25
 Requires-Dist: pymemcache==4.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 # Patchman
 

patchman-3.0.14/VERSION.txt

@@ -0,0 +1 @@
+3.0.14

{patchman-3.0.13 → patchman-3.0.14}/hosts/serializers.py

@@ -31,10 +31,10 @@ class HostSerializer(serializers.HyperlinkedModelSerializer):
                   'updated_at', 'bugfix_update_count', 'security_update_count')
 
     def get_bugfix_update_count(self, obj):
-        return len([u for u in obj.updates.all() if not u.security])
+        return obj.updates.filter(security=False).count()
 
     def get_security_update_count(self, obj):
-        return len([u for u in obj.updates.all() if u.security])
+        return obj.updates.filter(security=True).count()
 
 
 class HostRepoSerializer(serializers.HyperlinkedModelSerializer):

{patchman-3.0.13 → patchman-3.0.14}/hosts/templates/hosts/host_detail.html

@@ -138,9 +138,7 @@
 
   <div class="tab-pane fade in" id="host_modules">
     <div class="well well-sm">
-        <div class="well">
-          {% gen_table host.modules.all %}
-        </div>
+      {% gen_table host.modules.all %}
     </div>
   </div>
 
@@ -148,7 +146,7 @@
     <div class="well well-sm">
       <button class="btn btn-primary btn-sm" data-toggle="collapse" data-target="#packages">Show/Hide Installed Packages</button>
       <div id="packages" class="collapse">
-        <div class="well">
+        <div class="well well-sm">
           {% for package in host.packages.select_related %}
             <span class="label label-brick {% cycle 'bg-info' 'bg-success' %}">
               <a href="{{ package.name.get_absolute_url }}"> {{ package }} </a>

patchman-3.0.14/modules/utils.py

@@ -0,0 +1,69 @@
+# Copyright 2024 Marcus Furlong <furlongm@gmail.com>
+#
+# This file is part of Patchman.
+#
+# Patchman is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 3 only.
+#
+# Patchman is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
+
+from django.db import IntegrityError, DatabaseError, transaction
+from patchman.signals import error_message
+
+from modules.models import Module
+from arch.models import PackageArchitecture
+
+
+def get_or_create_module(name, stream, version, context, arch, repo):
+    """ Get or create a module object
+        Returns the module and a boolean for created
+    """
+    created = False
+    with transaction.atomic():
+        m_arch, c = PackageArchitecture.objects.get_or_create(name=arch)
+    try:
+        with transaction.atomic():
+            module, created = Module.objects.get_or_create(
+                name=name,
+                stream=stream,
+                version=version,
+                context=context,
+                arch=m_arch,
+                repo=repo,
+            )
+    except IntegrityError as e:
+        error_message.send(sender=None, text=e)
+        module = Module.objects.get(
+            name=name,
+            stream=stream,
+            version=version,
+            context=context,
+            arch=m_arch,
+            repo=repo,
+        )
+    except DatabaseError as e:
+        error_message.send(sender=None, text=e)
+    return module, created
+
+
+def get_matching_modules(name, stream, version, context, arch):
+    """ Return modules that match name, stream, version, context, and arch,
+        regardless of repo
+    """
+    with transaction.atomic():
+        m_arch, c = PackageArchitecture.objects.get_or_create(name=arch)
+    modules = Module.objects.filter(
+        name=name,
+        stream=stream,
+        version=version,
+        context=context,
+        arch=m_arch,
+    )
+    return modules

{patchman-3.0.13 → patchman-3.0.14}/patchman.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: patchman
-Version: 3.0.13
+Version: 3.0.14
 Summary: Django based patch status monitoring tool for linux systems
 Home-page: http://patchman.openbytes.ie/
 Author: Marcus Furlong
@@ -21,7 +21,7 @@ Requires-Dist: django-extensions==3.2.1
 Requires-Dist: django-bootstrap3==23.1
 Requires-Dist: progressbar==2.5
 Requires-Dist: python-debian==0.1.49
-Requires-Dist: lxml==4.9.4
+Requires-Dist: lxml==5.2.2
 Requires-Dist: defusedxml==0.7.1
 Requires-Dist: PyYAML==6.0.1
 Requires-Dist: chardet==4.0.0
@@ -33,6 +33,16 @@ Requires-Dist: humanize==3.13.1
 Requires-Dist: version-utils==0.3.0
 Requires-Dist: python-magic==0.4.25
 Requires-Dist: pymemcache==4.0.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 # Patchman
 

{patchman-3.0.13 → patchman-3.0.14}/patchman.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ modules/managers.py
 modules/models.py
 modules/serializers.py
 modules/urls.py
+modules/utils.py
 modules/views.py
 modules/migrations/0001_initial.py
 modules/migrations/0002_auto_20240204_2214.py

{patchman-3.0.13 → patchman-3.0.14}/patchman.egg-info/requires.txt

@@ -4,7 +4,7 @@ django-extensions==3.2.1
 django-bootstrap3==23.1
 progressbar==2.5
 python-debian==0.1.49
-lxml==4.9.4
+lxml==5.2.2
 defusedxml==0.7.1
 PyYAML==6.0.1
 chardet==4.0.0

{patchman-3.0.13 → patchman-3.0.14}/repos/models.py

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
+from django.conf import settings
 from django.db import models
 from django.urls import reverse
 
@@ -154,15 +155,25 @@ class Mirror(models.Model):
 
     def fail(self):
         """ Records that the mirror has failed
-            Disables refresh on a mirror if it fails more than 28 times
+            Disables refresh on a mirror if it fails more than MAX_MIRROR_FAILURES times
+            Set MAX_MIRROR_FAILURES to -1 to disable marking mirrors as failures
+            Default is 28
         """
         text = f'No usable mirror found at {self.url!s}'
         error_message.send(sender=None, text=text)
+        default_max_mirror_failures = 28
+        if hasattr(settings, 'MAX_MIRROR_FAILURES') and \
+                isinstance(settings.MAX_MIRROR_FAILURES, int):
+            max_mirror_failures = settings.MAX_MIRROR_FAILURES
+        else:
+            max_mirror_failures = default_max_mirror_failures
         self.fail_count = self.fail_count + 1
-        if self.fail_count > 28:
+        if max_mirror_failures == -1:
+            text = f'Mirror has failed {self.fail_count} times, but MAX_MIRROR_FAILURES=-1, not disabling refresh'
+        elif self.fail_count > max_mirror_failures:
             self.refresh = False
-            text = 'Mirror has failed more than 28 times, disabling refresh'
-            error_message.send(sender=None, text=text)
+            text = f'Mirror has failed {self.fail_count} times (max={max_mirror_failures}), disabling refresh'
+        error_message.send(sender=None, text=text)
 
     def update_packages(self, packages):
         """ Update the packages associated with a mirror

{patchman-3.0.13 → patchman-3.0.14}/repos/templates/repos/repo_detail.html

@@ -68,9 +68,7 @@
 
   <div class="tab-pane fade in" id="repo_modules">
     <div class="well well-sm">
-        <div class="well">
-          {% gen_table repo.module_set.all %}
-        </div>
+      {% gen_table repo.module_set.all %}
     </div>
   </div>
 </div>

{patchman-3.0.13 → patchman-3.0.14}/repos/utils.py

@@ -311,10 +311,6 @@ def extract_module_metadata(data, url, repo):
             raw_packages = modulemd.get('artifacts', {}).get('rpms', '')
             # raw_profiles = list(modulemd.get('profiles', {}).keys())
 
-            package_arches = PackageArchitecture.objects.all()
-            with transaction.atomic():
-                m_arch, c = package_arches.get_or_create(name=arch)
-
             packages = set()
             p_type = Package.RPM
             for pkg_str in raw_packages:
@@ -322,26 +318,8 @@ def extract_module_metadata(data, url, repo):
                 package = get_or_create_package(p_name, p_epoch, p_ver, p_rel, p_arch, p_type)
                 packages.add(package)
 
-            from modules.models import Module
-            all_modules = Module.objects.all()
-            try:
-                with transaction.atomic():
-                    module, c = all_modules.get_or_create(name=m_name,
-                                                          stream=m_stream,
-                                                          version=m_version,
-                                                          context=m_context,
-                                                          arch=m_arch,
-                                                          repo=repo)
-            except IntegrityError as e:
-                error_message.send(sender=None, text=e)
-                module = all_modules.get(name=m_name,
-                                         stream=m_stream,
-                                         version=m_version,
-                                         context=m_context,
-                                         arch=m_arch,
-                                         repo=repo)
-            except DatabaseError as e:
-                error_message.send(sender=None, text=e)
+            from modules.utils import get_or_create_module
+            module, created = get_or_create_module(m_name, m_stream, m_version, m_context, arch, repo)
 
             package_ids = []
             for package in packages:

{patchman-3.0.13 → patchman-3.0.14}/requirements.txt

@@ -4,7 +4,7 @@ django-extensions==3.2.1
 django-bootstrap3==23.1
 progressbar==2.5
 python-debian==0.1.49
-lxml==4.9.4
+lxml==5.2.2
 defusedxml==0.7.1
 PyYAML==6.0.1
 chardet==4.0.0

{patchman-3.0.13 → patchman-3.0.14}/setup.cfg

@@ -25,6 +25,7 @@ requires = /usr/bin/python3
 	python3-importlib-metadata
 	policycoreutils-python-utils
 	httpd
+	python3-dnf-plugin-post-transaction-actions
 
 [install]
 optimize = 1

{patchman-3.0.13 → patchman-3.0.14}/util/__init__.py

@@ -25,7 +25,7 @@ from colorama import Fore, Style
 from enum import Enum
 from hashlib import md5, sha1, sha256, sha512
 from progressbar import Bar, ETA, Percentage, ProgressBar
-from patchman.signals import error_message
+from patchman.signals import error_message, info_message
 
 
 if ProgressBar.__dict__.get('maxval'):
@@ -52,12 +52,12 @@ def set_verbosity(value):
     verbose = value
 
 
-def create_pbar(ptext, plength, **kwargs):
+def create_pbar(ptext, plength, ljust=35, **kwargs):
     """ Create a global progress bar if global verbose is True
     """
     global pbar, verbose
     if verbose and plength > 0:
-        jtext = str(ptext).ljust(35)
+        jtext = str(ptext).ljust(ljust)
         if pbar2:
             pbar = ProgressBar(widgets=[Style.RESET_ALL + Fore.YELLOW + jtext,
                                         Percentage(), Bar(), ETA()],
@@ -79,34 +79,37 @@ def update_pbar(index, **kwargs):
             pmax = pbar.max_value
         else:
             pmax = pbar.maxval
-        if index == pmax:
+        if index >= pmax:
             pbar.finish()
             print_nocr(Fore.RESET)
             pbar = None
 
 
-def download_url(res, text=''):
+def download_url(res, text='', ljust=35):
     """ Display a progress bar to download the request content if verbose is
         True. Otherwise, just return the request content
     """
     global verbose
-    if verbose and 'content-length' in res.headers:
-        clen = int(res.headers['content-length'])
-        create_pbar(text, clen)
-        chunk_size = 16384
-        i = 0
-        data = b''
-        for chunk in res.iter_content(chunk_size=chunk_size,
-                                      decode_unicode=False):
-            i += len(chunk)
-            if i > clen:
-                update_pbar(clen)
-            else:
-                update_pbar(i)
-            data += chunk
-        return data
-    else:
-        return res.content
+    if verbose:
+        content_length = res.headers.get('content-length')
+        if content_length:
+            clen = int(content_length)
+            create_pbar(text, clen, ljust)
+            chunk_size = 16384
+            i = 0
+            data = b''
+            for chunk in res.iter_content(chunk_size=chunk_size,
+                                          decode_unicode=False):
+                i += len(chunk)
+                if i > clen:
+                    update_pbar(clen)
+                else:
+                    update_pbar(i)
+                data += chunk
+            return data
+        else:
+            info_message.send(sender=None, text=text)
+    return res.content
 
 
 def print_nocr(text):
@@ -116,12 +119,12 @@ def print_nocr(text):
     sys.stdout.softspace = False
 
 
-def get_url(url):
+def get_url(url, headers={}, params={}):
     """ Perform a http GET on a URL. Return None on error.
     """
     res = None
     try:
-        res = requests.get(url, stream=True)
+        res = requests.get(url, headers=headers, params=params, stream=True)
     except requests.exceptions.Timeout:
         error_message.send(sender=None, text=f'Timeout - {url!s}')
     except requests.exceptions.TooManyRedirects:

{patchman-3.0.13 → patchman-3.0.14}/util/templates/objectlist.html

@@ -6,7 +6,7 @@
 
 <div class="row">
   <div class="col-sm-10">
-    {% searchform %}
+    {% searchform terms %}
     {% gen_table page.object_list %}
     <div class="centered">
       {% object_count page %}

{patchman-3.0.13 → patchman-3.0.14}/util/templates/searchbar.html

@@ -2,7 +2,7 @@
 <div>
   <form method="get">
     <div class="input-group">
-      <input type="text" class="form-control input-sm" placeholder="Search" name="search" value="{{ terms }}" id="search">
+      <input type="text" class="form-control input-sm" placeholder="Search" name="search" id="search" value="{{ terms }}">
       <div class="input-group-btn">
         <button class="btn btn-primary btn-sm" type="submit">{% bootstrap_icon "search" %}</button>
       </div>

{patchman-3.0.13 → patchman-3.0.14}/util/templatetags/common.py

@@ -18,6 +18,7 @@
 
 from humanize import naturaltime
 from datetime import datetime, timedelta
+from urllib.parse import urlencode
 
 from django.conf import settings
 from django.template import Library
@@ -26,11 +27,6 @@ from django.utils.html import format_html
 from django.templatetags.static import static
 from django.core.paginator import Paginator
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
-
 register = Library()
 
 
@@ -67,7 +63,7 @@ def no_yes_img(boolean, alt_yes='Not Required', alt_no='Required'):
 
 @register.simple_tag
 def gen_table(object_list, template_name=None):
-    if object_list == '':
+    if not object_list:
         return ''
     if not template_name:
         app_label = object_list.model._meta.app_label
@@ -97,9 +93,9 @@ def get_querystring(request):
 
 
 @register.simple_tag
-def searchform():
+def searchform(terms):
     template = get_template('searchbar.html')
-    html = template.render({'post_url': '.'})
+    html = template.render({'post_url': '.', 'terms': terms})
     return html
 
 

patchman-3.0.13/VERSION.txt

@@ -1 +0,0 @@
-3.0.13