pulp-ansible 0.28.3__tar.gz → 0.28.4__tar.gz

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/CHANGES.md

@@ -8,6 +8,14 @@
 
 [//]: # (towncrier release notes start)
 
+## 0.28.4 (2026-02-06) {: #0.28.4 }
+
+#### Bugfixes {: #0.28.4-bugfix }
+
+- Fixed a 500 error when attempting to download a collection with and invalid name.
+
+---
+
 ## 0.28.3 (2026-01-27) {: #0.28.3 }
 
 #### Bugfixes {: #0.28.3-bugfix }

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.28.3
+Version: 0.28.4
 Summary: Pulp plugin to manage Ansible content, e.g. roles
 Author-email: Pulp Ansible Plugin Project Developers <pulp-dev@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/pulp_ansible/app/__init__.py

@@ -8,6 +8,6 @@ class PulpAnsiblePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_ansible.app"
     label = "ansible"
-    version = "0.28.3"
+    version = "0.28.4"
     python_package_name = "pulp-ansible"
     domain_compatible = True

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/pulp_ansible/app/galaxy/v3/views.py

@@ -2,6 +2,7 @@ from datetime import datetime
 from gettext import gettext as _
 import semantic_version
 import base64
+import re
 
 from django.db import DatabaseError, IntegrityError
 from django.db.models import F, OuterRef, Exists, Subquery, Prefetch
@@ -633,7 +634,7 @@ class CollectionArtifactDownloadView(GalaxyAuthMixin, views.APIView, AnsibleDist
     DEFAULT_ACCESS_POLICY = _PERMISSIVE_ACCESS_POLICY
 
     @staticmethod
-    def log_download(request, filename, distro_base_path):
+    def log_download(request, namespace, name, version, distro_base_path):
         """Log the download of the collection version."""
 
         def _get_org_id(request):
@@ -651,7 +652,7 @@ class CollectionArtifactDownloadView(GalaxyAuthMixin, views.APIView, AnsibleDist
 
             return identity["internal"]["org_id"]
 
-        # Gettung user IP
+        # Get user IP
         x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
         ip = x_forwarded_for.split(",")[0] if x_forwarded_for else request.META.get("REMOTE_ADDR")
 
@@ -662,13 +663,9 @@ class CollectionArtifactDownloadView(GalaxyAuthMixin, views.APIView, AnsibleDist
             distribution.repository_version or distribution.repository.latest_version()
         )
 
-        # Getting collection version
-        ns, name, version = filename.split("-", maxsplit=2)
-        # Get off the ending .tar.gz
-        version = ".".join(version.split(".")[:3])
         collection_version = get_object_or_404(
             CollectionVersion.objects.filter(pk__in=repository_version.content),
-            namespace=ns,
+            namespace=namespace,
             name=name,
             version=version,
         )
@@ -693,11 +690,10 @@ class CollectionArtifactDownloadView(GalaxyAuthMixin, views.APIView, AnsibleDist
                 return
             raise
 
-    def count_download(filename):
-        ns, name, _ = filename.split("-", maxsplit=2)
+    def count_download(namespace, name):
         try:
             collection, created = CollectionDownloadCount.objects.get_or_create(
-                namespace=ns, name=name, defaults={"download_count": 1}
+                namespace=namespace, name=name, defaults={"download_count": 1}
             )
             if not created:
                 collection.download_count = F("download_count") + 1
@@ -728,13 +724,23 @@ class CollectionArtifactDownloadView(GalaxyAuthMixin, views.APIView, AnsibleDist
             filename=self.kwargs["filename"],
         )
 
+        match = re.fullmatch(
+            r"(?P<namespace>\w+)-(?P<name>\w+)-(?P<version>[\w.-]+)\.tar\.gz",
+            self.kwargs["filename"],
+        )
+        if not match:
+            raise NotFound()
+        namespace = match.group("namespace")
+        name = match.group("name")
+        version = match.group("version")
+
         if settings.ANSIBLE_COLLECT_DOWNLOAD_LOG:
             CollectionArtifactDownloadView.log_download(
-                request, self.kwargs["filename"], distro_base_path
+                request, namespace, name, version, distro_base_path
             )
 
         if settings.ANSIBLE_COLLECT_DOWNLOAD_COUNT:
-            CollectionArtifactDownloadView.count_download(self.kwargs["filename"])
+            CollectionArtifactDownloadView.count_download(namespace, name)
 
         if (
             distribution.content_guard

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/pulp_ansible/tests/functional/api/collection/v3/test_collection.py

@@ -125,6 +125,13 @@ def collection_detail(http_session, collection_upload, pulp_dist, collection_art
     return response.json()
 
 
+@pytest.fixture(scope="class")
+def collection_highest_version(http_session, collection_detail):
+    response = http_session.get(collection_detail["highest_version"]["href"])
+    response.raise_for_status()
+    return response.json()
+
+
 @pytest.fixture(scope="class")
 def pulp_dist(ansible_repository_factory, ansible_distribution_factory):
     """Create an Ansible Distribution to simulate the automation hub environment for testing."""
@@ -298,34 +305,52 @@ class TestCollection:
         #     #             'repository': 'http://github.example.com/orionuser1/skeleton',
         #     #             'tags': ['collectiontest']},
 
-    def test_collection_download(
+    def test_collection_download_metadata_unauthorized_fails(
         self,
         http_session,
         collection_detail,
-        collection_artifact,
     ):
-        """Test collection download URL.
-
-        Should require authentication and redirect to a download location.
-        """
         response = http_session.get(collection_detail["highest_version"]["href"], auth=NullAuth())
         assert response.status_code == 401
-        response = http_session.get(collection_detail["highest_version"]["href"])
-        response.raise_for_status()
-        version = response.json()
 
+    def test_collection_download_redirects(
+        self,
+        http_session,
+        collection_highest_version,
+        collection_artifact,
+    ):
         # Artifact Download Endoint
-        url = version["download_url"]
+        url = collection_highest_version["download_url"]
 
         with open(collection_artifact.filename, "rb") as fp:
             tarball = fp.read()
 
-        response = http_session.get(url, auth=NullAuth())
-        assert response.status_code == 401
         response = http_session.get(url)
         assert response.status_code == 200, (url, response.request.headers)
         assert response.content == tarball
 
+    def test_collection_download_redirect_fails_unauthorized(
+        self,
+        http_session,
+        collection_highest_version,
+    ):
+        # Artifact Download Endoint
+        url = collection_highest_version["download_url"]
+
+        response = http_session.get(url, auth=NullAuth())
+        assert response.status_code == 401
+
+    def test_downloading_collection_with_bad_name_returns_not_found(
+        self,
+        http_session,
+        collection_highest_version,
+    ):
+        # Artifact Download Endoint, but we mess up the address.
+        url = collection_highest_version["download_url"].replace("-", "_")
+
+        response = http_session.get(url)
+        assert response.status_code == 404
+
     def test_collection_upload_repeat(
         self, http_session, ansible_collection_factory, pulp_dist, collection_upload
     ):

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/pulp_ansible.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.28.3
+Version: 0.28.4
 Summary: Pulp plugin to manage Ansible content, e.g. roles
 Author-email: Pulp Ansible Plugin Project Developers <pulp-dev@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_ansible-0.28.3 → pulp_ansible-0.28.4}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-ansible"
-version = "0.28.3"
+version = "0.28.4"
 description = "Pulp plugin to manage Ansible content, e.g. roles"
 readme = "README.rst"
 authors = [
@@ -99,7 +99,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "0.28.3"
+current_version = "0.28.4"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"