pulp-ansible 0.28.2__py3-none-any.whl → 0.28.4__py3-none-any.whl

pulp_ansible/app/__init__.py

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

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/app/serializers.py

@@ -665,6 +665,22 @@ class CollectionVersionSerializer(ContentChecksumSerializer, CollectionVersionUp
 
     creating = True
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        try:
+            request = self.context["request"]
+            if request.method != "GET":
+                return
+        except (AttributeError, TypeError, KeyError):
+            # The serializer was not initialized with request context.
+            return
+        query_params = request.query_params
+        if self.include_arg_name in query_params or self.exclude_arg_name in query_params:
+            return
+        for fieldname in ["files", "manifest", "docs_blob", "contents"]:
+            # Redact these fields by default as they have no size limit.
+            self.fields.pop(fieldname)
+
     def validate(self, data):
         """Run super() validate if creating, else return data."""
         # This validation is for creating CollectionVersions

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.2.dist-info → pulp_ansible-0.28.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.28.2
+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.2.dist-info → pulp_ansible-0.28.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_ansible/__init__.py,sha256=WXL3JyOZzh4tALN4OBNgqj412O2LXVr8iYSn14Av0_o,67
 pulp_ansible/pytest_plugin.py,sha256=hi9crI7QGghXCItNx27pW6KoXMzZqhAqAUstpJrsmlA,9105
-pulp_ansible/app/__init__.py,sha256=ACi_3Kos2rCKIQ3FaqkfO5_Cu6w5zqIf7xpNyTChCWg,308
+pulp_ansible/app/__init__.py,sha256=K5wFSReWtPOzzbQaGKoXIOm8lWK1XYqJZcyKm1KEg2Y,308
 pulp_ansible/app/constants.py,sha256=cRrWMbJU-v1nCY2CjmGTOFGzz5aggn4ZKIs4-zeYADQ,78
 pulp_ansible/app/downloaders.py,sha256=0xrAXzhTMJ6ywvs6XyYNAKvRzYb_UZR6A5_WgaHvuiE,8331
 pulp_ansible/app/fields.py,sha256=yV3FL-47K-nxbiBxgzWi1hk3tfLsRdgic59LiwT2Fvs,624
@@ -8,7 +8,7 @@ pulp_ansible/app/global_access_conditions.py,sha256=ayV_LbQIa4ReuDYQycdDY7WysfGk
 pulp_ansible/app/logutils.py,sha256=My4XivZMYLKeJqPHFwk3pIZSGlspALhI93vZxwWzlSY,846
 pulp_ansible/app/modelresource.py,sha256=fJ_njrSWdftFQpA54e6mdoIWG_zqBjpp2TkkyU8Y7D4,7181
 pulp_ansible/app/models.py,sha256=CrEcVxQUlb6V_d9l7_as7_Gi6TrBuJ_xJLhFCR_5jew,22709
-pulp_ansible/app/serializers.py,sha256=5_NM1tpMLrZ2QsNCWanaHhscGCS_QDLubXCTh5xwm8E,35981
+pulp_ansible/app/serializers.py,sha256=28lwMvLa3D-i4cekaIx50ffHUU78OfoDBlwdcTSTWyI,36670
 pulp_ansible/app/settings.py,sha256=ArDsI7VezOpKM9iFqxXb6VmEDOtRUS5lfB_oklkcxds,1244
 pulp_ansible/app/urls.py,sha256=gpMqsYPgHfc_6-EySR9ezUnI1F5yklzOVlSz9nlppmY,8697
 pulp_ansible/app/utils.py,sha256=ClI_WvVy73kOZQB2mS8Gftf80Vye7pOxrbodTmPQgmk,1686
@@ -22,7 +22,7 @@ pulp_ansible/app/galaxy/v3/exceptions.py,sha256=uKTj_LteLusc9Wu0iSYO-U8Gq9UK1eVR
 pulp_ansible/app/galaxy/v3/filters.py,sha256=XW39dC4N531Rlkhof5a-MDqxU2gFAkKWG3eeuIe02FY,8047
 pulp_ansible/app/galaxy/v3/pagination.py,sha256=FhFKtPfljjmKrnB_EWz7FxAhKPX9gkuvbOx-2KU9V4Y,4042
 pulp_ansible/app/galaxy/v3/serializers.py,sha256=VV2p-gLHKy0EnRBsblPga2Lcn9fLp5qp_7rhlaAlDmY,13364
-pulp_ansible/app/galaxy/v3/views.py,sha256=PJyK85cqLPRXVXY8B-shKGIh93mpnWONH1PplAD6MWM,47750
+pulp_ansible/app/galaxy/v3/views.py,sha256=-ogkpNIZaZkubIJSqEAsg1dppVdJ6WDtFn5C4hsNqWk,47876
 pulp_ansible/app/galaxy/v3/viewsets.py,sha256=6mLK81oUZvvVmrEJ2BzIUzFvPoHeEBHOnwqROkPcNTs,3918
 pulp_ansible/app/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/app/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -128,7 +128,7 @@ pulp_ansible/tests/functional/api/collection/test_signatures.py,sha256=Oos2kyUMz
 pulp_ansible/tests/functional/api/collection/test_sync.py,sha256=ITeATktxSpXbV4emJ8xXl4EGuebBRmrBdDRarVmSgJ8,14818
 pulp_ansible/tests/functional/api/collection/v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/tests/functional/api/collection/v3/test_client_configuration.py,sha256=Tk8PdvG2Y1mZs5pUm2z91Tlpxaw0_8TvhshNbioMkKg,648
-pulp_ansible/tests/functional/api/collection/v3/test_collection.py,sha256=zO9CzNko3Cl0X0m5bf3cWQj6xu7iOkLLoZVBxAclwgA,12983
+pulp_ansible/tests/functional/api/collection/v3/test_collection.py,sha256=B9Nczrsr7AB_dT3IAVs4pJvCTcbQSxpoviCJUBMsRok,13717
 pulp_ansible/tests/functional/api/collection/v3/test_collection_naming_edgecases.py,sha256=qPYFf-lWg2-i8xRvRGMKmGHbg00Cyd0EqGjzXF4ET-8,5492
 pulp_ansible/tests/functional/api/collection/v3/test_collection_version_search.py,sha256=uQGWs5ny0R-dP9YjZcspFRPDQTA-_OSuy6Dm4TLPrT8,48422
 pulp_ansible/tests/functional/api/collection/v3/test_content_guard.py,sha256=lid_TY4ANaU1fmoDAn6xuApOcP8UnrBuXlYfaqGXyvA,3311
@@ -167,9 +167,9 @@ pulp_ansible/tests/unit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 pulp_ansible/tests/unit/migrations/conftest.py,sha256=61n56aJuwEuAcUS27xnmnEDx6Ie7M5zxh851doWm7Ok,438
 pulp_ansible/tests/unit/migrations/test_0057_collection_version_sha256_migrate.py,sha256=NmU-frZNO1qHvhdxfw-bwPTEkqN4Wdc3dEs9dWME47o,2174
 pulp_ansible/tests/unit/migrations/test_x_repo_search_migration.py,sha256=IrC_V_Gss4nqhkdL-60upcEzGcz8IsiI2d-MfUtFY-g,657
-pulp_ansible-0.28.2.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_ansible-0.28.2.dist-info/METADATA,sha256=px7YGxFFEZea1rBPvo_mIkOvt7pHhLqIqJ08U13EapY,3125
-pulp_ansible-0.28.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pulp_ansible-0.28.2.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
-pulp_ansible-0.28.2.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
-pulp_ansible-0.28.2.dist-info/RECORD,,
+pulp_ansible-0.28.4.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_ansible-0.28.4.dist-info/METADATA,sha256=wTh94QDoJmLY0tSk95LM6vh8VGv15Lb70fePPsDdNz8,3125
+pulp_ansible-0.28.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pulp_ansible-0.28.4.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
+pulp_ansible-0.28.4.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
+pulp_ansible-0.28.4.dist-info/RECORD,,