pulp-container 2.28.0__tar.gz → 2.28.1__tar.gz

{pulp_container-2.28.0 → pulp_container-2.28.1}/CHANGES.md

@@ -8,6 +8,15 @@
 
 [//]: # (towncrier release notes start)
 
+## 2.28.1 (2026-07-22) {: #2.28.1 }
+
+#### Bugfixes {: #2.28.1-bugfix }
+
+- Add transparent repair code during Manifest sync to redownload the raw data in case it was lost during an upgrade.
+- Added OCI manifest as an allowed media type in the Docker manifest list schema.
+
+---
+
 ## 2.28.0 (2026-05-29) {: #2.28.0 }
 
 #### Features {: #2.28.0-feature }

{pulp_container-2.28.0 → pulp_container-2.28.1}/MANIFEST.in

@@ -9,3 +9,4 @@ include test_requirements.txt
 include unittest_requirements.txt
 exclude CONTRIBUTING.md
 exclude releasing.md
+include pulp_container/tests/unit/fixtures/*

{pulp_container-2.28.0 → pulp_container-2.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-container
-Version: 2.28.0
+Version: 2.28.1
 Summary: Container plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -18,7 +18,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jsonschema<4.27,>=4.4
-Requires-Dist: pulpcore<3.115,>=3.111.0
+Requires-Dist: pulpcore<3.130,>=3.111.0
 Requires-Dist: pyjwt[crypto]<2.14,>=2.4
 Requires-Dist: pysequoia<0.2.0,>=0.1.33
 Dynamic: license-file

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/app/__init__.py

@@ -24,7 +24,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_container.app"
     label = "container"
-    version = "2.28.0"
+    version = "2.28.1"
     python_package_name = "pulp-container"
     domain_compatible = True
 

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/app/authorization.py

@@ -24,7 +24,7 @@ from pulp_container.app.models import (
     ContainerPullThroughDistribution,
 )
 
-TOKEN_EXPIRATION_TIME = settings.get("TOKEN_EXPIRATION_TIME", 300)
+TOKEN_EXPIRATION_TIME = getattr(settings, "TOKEN_EXPIRATION_TIME", 300)
 
 FakeView = namedtuple("FakeView", "action, get_object, get_serializer")
 

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/app/json_schemas.py

@@ -124,6 +124,7 @@ DOCKER_MANIFEST_LIST_V2_SCHEMA = {
                         "enum": [
                             MEDIA_TYPE.MANIFEST_V2,
                             MEDIA_TYPE.MANIFEST_V1,
+                            MEDIA_TYPE.MANIFEST_OCI,
                         ],
                     },
                     "size": {"type": "number"},

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/app/registry_api.py

@@ -279,7 +279,7 @@ class ContainerRegistryApiMixin:
         This allows deployments to use custom authentication backends (e.g. remote
         header-based auth) alongside standard Basic auth for container registry operations.
         """
-        if settings.get("TOKEN_AUTH_DISABLED", False):
+        if getattr(settings, "TOKEN_AUTH_DISABLED", False):
             return [RegistryAuthentication, *api_settings.DEFAULT_AUTHENTICATION_CLASSES]
         return [TokenAuthentication]
 
@@ -288,7 +288,7 @@ class ContainerRegistryApiMixin:
         """
         List of permission classes to check for this view.
         """
-        if settings.get("TOKEN_AUTH_DISABLED", False):
+        if getattr(settings, "TOKEN_AUTH_DISABLED", False):
             return [RegistryPermission]
         return [TokenPermission]
 
@@ -517,7 +517,7 @@ class VersionView(ContainerRegistryApiMixin, APIView):
         """
         List of permission classes to check for this view.
         """
-        if settings.get("TOKEN_AUTH_DISABLED", False):
+        if getattr(settings, "TOKEN_AUTH_DISABLED", False):
             return [IsAuthenticated]
         return [TokenPermission]
 
@@ -609,7 +609,7 @@ class CatalogView(ContainerRegistryApiMixin, ListAPIView):
         distribution_permission = "container.pull_containerdistribution"
         namespace_permission = "container.namespace_pull_containerdistribution"
 
-        if settings.get("TOKEN_AUTH_DISABLED", False):
+        if getattr(settings, "TOKEN_AUTH_DISABLED", False):
             return queryset
 
         public_repositories = queryset.filter(private=False)

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/app/tasks/sync_stages.py

@@ -98,7 +98,15 @@ class ContainerFirstStage(Stage):
             digest=digest, pulp_domain=get_domain()
         ).afirst():
             raw_text_data = manifest.data
-            content_data = json.loads(raw_text_data)
+            if raw_text_data is None:
+                # This situation allegedly happens on some upgrade paths.
+                # A migration should mark the field not Null eventually. At that point this
+                # workaround can be removed.
+                content_data, raw_text_data, _ = await self._download_manifest_data(response.url)
+                manifest.data = raw_text_data
+                await manifest.asave()
+            else:
+                content_data = json.loads(raw_text_data)
         else:
             if not original_reference.startswith("sha256:") and digest:
                 # Fetch the tag with its digest
@@ -522,6 +530,8 @@ class ContainerFirstStage(Stage):
 
         """
         digest = manifest_data["digest"]
+        # in oci-index spec, platform is an optional field
+        platform = manifest_data.get("platform", None)
         relative_url = "/v2/{name}/manifests/{digest}".format(
             name=self.remote.namespaced_upstream_name, digest=digest
         )
@@ -530,15 +540,30 @@ class ContainerFirstStage(Stage):
         if manifest := await Manifest.objects.filter(
             digest=digest, pulp_domain=get_domain()
         ).afirst():
-            content_data = json.loads(manifest.data)
-
-        content_data, manifest = await self._download_and_instantiate_manifest(manifest_url, digest)
-
-        # in oci-index spec, platform is an optional field
-        platform = manifest_data.get("platform", None)
-        if platform:
-            manifest.os = platform["os"]
-            manifest.architecture = platform["architecture"]
+            raw_text_data = manifest.data
+            if raw_text_data is None:
+                # This situation allegedly happens on some upgrade paths.
+                # A migration should mark the field not Null eventually. At that point this
+                # workaround can be removed.
+                content_data, raw_text_data, response = await self._download_manifest_data(
+                    manifest_url
+                )
+                media_type = determine_media_type(content_data, response)
+                validate_manifest(content_data, media_type, digest)
+                manifest.data = raw_text_data
+                if platform:
+                    manifest.os = platform["os"]
+                    manifest.architecture = platform["architecture"]
+                await manifest.asave()
+            else:
+                content_data = json.loads(raw_text_data)
+        else:
+            content_data, manifest = await self._download_and_instantiate_manifest(
+                manifest_url, digest
+            )
+            if platform:
+                manifest.os = platform["os"]
+                manifest.architecture = platform["architecture"]
         man_dc = DeclarativeContent(content=manifest)
         return {"manifest_dc": man_dc, "platform": platform, "content_data": content_data}
 

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/tests/functional/api/test_content_cache.py

@@ -76,7 +76,7 @@ def test_content_cache(
     monitor_task,
 ):
     """A test case that verifies the functionality of the Redis caching machinery."""
-    if not pulp_settings.get("CACHE_ENABLED"):
+    if not getattr(pulp_settings, "CACHE_ENABLED", False):
         pytest.skip("The caching machinery was not enabled")
 
     repo = container_repository_factory()

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/tests/functional/api/test_domains.py

@@ -366,7 +366,10 @@ def test_domain_content_replication(
         pulpcore_bindings.UpstreamPulpsApi, upstream_pulp_body, pulp_domain=replica_domain.name
     )
     # Run the replicate task and assert that all tasks successfully complete.
-    response = pulpcore_bindings.UpstreamPulpsApi.replicate(upstream_pulp.pulp_href)
+    response = pulpcore_bindings.UpstreamPulpsApi.replicate(
+        upstream_pulp.pulp_href,
+        upstream_pulp_replicate=pulpcore_bindings.module.UpstreamPulpReplicate(),
+    )
     monitor_task_group(response.task_group)
 
     counts = {}

pulp_container-2.28.1/pulp_container/tests/unit/fixtures/ryuk_0.13.0_manifest_list.json

@@ -0,0 +1,154 @@
+{
+   "schemaVersion": 2,
+   "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
+   "manifests": [
+      {
+         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+         "size": 1157,
+         "digest": "sha256:dbf39a38239100ad20536e75f0066163bdf989c8b6a07116c8814f991878756f",
+         "platform": {
+            "architecture": "amd64",
+            "os": "windows",
+            "os.version": "10.0.17763.7678"
+         }
+      },
+      {
+         "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+         "size": 1157,
+         "digest": "sha256:92ae77da69814eadc33ece22a9a1f564b508fd3bc0ab6c27f53ffb3b4e2f7ff0",
+         "platform": {
+            "architecture": "amd64",
+            "os": "windows",
+            "os.version": "10.0.20348.4052"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:1c4aaca7ec29ab100a805a90718619dba7a542f7fadc6198c8f47b1c6fc058c5",
+         "platform": {
+            "architecture": "ppc64le",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:1f965b7a234671c706b444540c86033bbe667b3d6df3453b88a16bb897328bea",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:286b5e78baf03adff94af82199af6b936c701957d94dd001cae375af41519fd3",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:2a5038e0424aee30b8e1ecaf3889eb18b1496baca035b5cbdfeb79faa06e867a",
+         "platform": {
+            "architecture": "arm64",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:2ff824f3c5b87343601f88b944039949004c4b25d5c95b95b8d513d9592abfd9",
+         "platform": {
+            "architecture": "arm",
+            "os": "linux",
+            "variant": "v7"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:31c852ef4caf457d598a67ef9a19626a99e0080186903e15f9cacac70eaeb08f",
+         "platform": {
+            "architecture": "arm",
+            "os": "linux",
+            "variant": "v6"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:46d7dcf2110fc9e7eb1e8bc589d7507fb4db20b36a7ae401d0f7daa5457986cd",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:5af5b45d5d54da802b42c1754577d9b3b91b61bb20ca301b1de08e47b5027fb1",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:6312fce3d003e5b1973f64ff61d7465c0d8a3f6216123264fd8688caace685ce",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:725de179c309cd78dc85aa0e315f7a2c6230efe166d8a972113ecf47feb122d7",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:9f74979cb9d95b5dd3f695e567cd5cd1806a006895d80fa9002a9e68f607f495",
+         "platform": {
+            "architecture": "amd64",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:d5fcc1e6aaa51949c7d11e8ac9cf407efb9d52dd9f871542cfaf750c9b1ccc2b",
+         "platform": {
+            "architecture": "386",
+            "os": "linux"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 567,
+         "digest": "sha256:f5aa3faf94fb7c630ecb8bc6d4ba506cfdbd90ff8c882710b07fb953b4cf09ae",
+         "platform": {
+            "architecture": "unknown",
+            "os": "unknown"
+         }
+      },
+      {
+         "mediaType": "application/vnd.oci.image.manifest.v1+json",
+         "size": 662,
+         "digest": "sha256:fa81566cb9a09b2cd72a703e17160c6cf6906a22d4eeae716ce7f0f42053efdb",
+         "platform": {
+            "architecture": "s390x",
+            "os": "linux"
+         }
+      }
+   ]
+}

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container/tests/unit/test_json_schemas.py

@@ -1,4 +1,5 @@
 import json
+from pathlib import Path
 
 from django.test import TestCase
 from jsonschema import Draft7Validator
@@ -197,3 +198,31 @@ class TestOCISchema(TestCase):
             validate_manifest(manifest, MEDIA_TYPE.MANIFEST_OCI, "")
         except ManifestInvalid:
             self.fail()
+
+
+class TestDockerManifestListSchema(TestCase):
+    """A test case for validating Docker manifest list JSON schema."""
+
+    def test_ryuk_manifest_list_with_oci_entries(self):
+        """
+        Validate a real Docker manifest list that references OCI image manifests.
+
+        testcontainers/ryuk:0.13.0 on Docker Hub publishes a Docker manifest list
+        containing both Docker v2 and OCI image manifest entries.
+        """
+        fixture_path = Path(__file__).parent / "fixtures" / "ryuk_0.13.0_manifest_list.json"
+        manifest = json.loads(fixture_path.read_text())
+        entry_media_types = {entry["mediaType"] for entry in manifest["manifests"]}
+
+        self.assertEqual(manifest["mediaType"], MEDIA_TYPE.MANIFEST_LIST)
+        self.assertIn(MEDIA_TYPE.MANIFEST_V2, entry_media_types)
+        self.assertIn(MEDIA_TYPE.MANIFEST_OCI, entry_media_types)
+
+        try:
+            validate_manifest(
+                manifest,
+                MEDIA_TYPE.MANIFEST_LIST,
+                "sha256:31b31269d06603366cbfd0284708dcd2e281e8a4188e53fce3d3304439d0df3d",
+            )
+        except ManifestInvalid:
+            self.fail()

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-container
-Version: 2.28.0
+Version: 2.28.1
 Summary: Container plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -18,7 +18,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jsonschema<4.27,>=4.4
-Requires-Dist: pulpcore<3.115,>=3.111.0
+Requires-Dist: pulpcore<3.130,>=3.111.0
 Requires-Dist: pyjwt[crypto]<2.14,>=2.4
 Requires-Dist: pysequoia<0.2.0,>=0.1.33
 Dynamic: license-file

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container.egg-info/SOURCES.txt

@@ -143,4 +143,5 @@ pulp_container/tests/unit/__init__.py
 pulp_container/tests/unit/test_json_schemas.py
 pulp_container/tests/unit/test_models.py
 pulp_container/tests/unit/test_serializers.py
-pulp_container/tests/unit/test_sync_stages.py
+pulp_container/tests/unit/test_sync_stages.py
+pulp_container/tests/unit/fixtures/ryuk_0.13.0_manifest_list.json

{pulp_container-2.28.0 → pulp_container-2.28.1}/pulp_container.egg-info/requires.txt

@@ -1,4 +1,4 @@
 jsonschema<4.27,>=4.4
-pulpcore<3.115,>=3.111.0
+pulpcore<3.130,>=3.111.0
 pyjwt[crypto]<2.14,>=2.4
 pysequoia<0.2.0,>=0.1.33

{pulp_container-2.28.0 → pulp_container-2.28.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulp-container"
-version = "2.28.0"
+version = "2.28.1"
 description = "Container plugin for the Pulp Project"
 readme = "README.md"
 authors = [
@@ -24,7 +24,7 @@ classifiers=[
 requires-python = ">=3.11"
 dependencies = [
   "jsonschema>=4.4,<4.27",
-  "pulpcore>=3.111.0,<3.115",
+  "pulpcore>=3.111.0,<3.130",
   "pyjwt[crypto]>=2.4,<2.14",
   "pysequoia>=0.1.33,<0.2.0"
 ]
@@ -89,7 +89,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "2.28.0"
+current_version = "2.28.1"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
@@ -135,7 +135,6 @@ filename = "./pyproject.toml"
 search = "version = \"{current_version}\""
 replace = "version = \"{new_version}\""
 
-
 [tool.ruff]
 # This section is managed by the plugin template. Do not edit manually.
 line-length = 100
@@ -156,6 +155,7 @@ extend-select = [
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 # This section is managed by the plugin template. Do not edit manually.
 "distutils".msg = "The 'distutils' module has been deprecated since Python 3.9."
+"pulpcore.app.settings".msg = "Always import 'settings' from 'django.conf' instead."
 "pulpcore.app".msg = "The 'pulpcore' apis must only be consumed via 'pulpcore.plugin'."
 
 [tool.ruff.lint.isort]