pulpcore 3.76.0__tar.gz → 3.76.1__tar.gz

{pulpcore-3.76.0 → pulpcore-3.76.1}/CHANGES.md

@@ -8,6 +8,31 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.76.1 (2025-04-24) {: #3.76.1 }
+
+### REST API {: #3.76.1-rest-api }
+
+#### Bugfixes {: #3.76.1-rest-api-bugfix }
+
+- Fixed a memory consumption issue that was triggered by the use of the Alternate Content Source feature.
+  [#6500](https://github.com/pulp/pulpcore/issues/6500)
+- Reverted fix for #6491, it broke certificate-chains.
+  [#6510](https://github.com/pulp/pulpcore/issues/6510)
+
+### Plugin API {: #3.76.1-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.76.1-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.76.1-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.76.0 (2025-04-22) {: #3.76.0 }
 
 ### REST API {: #3.76.0-rest-api }

{pulpcore-3.76.0 → pulpcore-3.76.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.76.0
+Version: 3.76.1
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.76.0"
+    version = "3.76.1"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.76.0"
+    version = "3.76.1"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulp_file/tests/functional/api/test_remote_settings.py

@@ -1,52 +1,10 @@
-import pytest
 import uuid
 
+import pytest
+
 from pulpcore.client.pulp_file import (
     RepositorySyncURL,
 )
-from pulpcore.client.pulp_file.exceptions import BadRequestException
-
-GOOD_CERT = """-----BEGIN CERTIFICATE-----
-MIICoDCCAYgCCQC2c2uY34HNlzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdn
-b3ZlZ2FuMB4XDTE5MDMxMzIxMDMzMFoXDTM4MDYxNjIxMDMzMFowEjEQMA4GA1UE
-AwwHZ292ZWdhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEatWsZ
-1iwGmTxD02dxMI4ci+Au4FzvmWLBWD07H5GGTVFwnqmNOKhP6DHs1EsMZevkUvaG
-CRxZlPYhjNFLZr2c2FnoDZ5nBXlSW6sodXURbMfyT187nDeBXVYFuh4T2eNCatnm
-t3vgdi+pWsF0LbOgpu7GJI2sh5K1imxyB77tJ7PFTDZCSohkK+A+0nDCnJqDUNXD
-5CK8iaBciCbnzp3nRKuM2EmgXno9Repy/HYxIgB7ZodPwDvYNjMGfvs0s9mJIKmc
-CKgkPXVO9y9gaRrrytICcPOs+YoU/PN4Ttg6wzxaWvJgw44vsR8wM/0i4HlXfBdl
-9br+cgn8jukDOgECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAyNHV6NA+0GfUrvBq
-AHXHNnBE3nzMhGPhF/0B/dO4o0n6pgGZyzRxaUaoo6+5oQnBf/2NmDyLWdalFWX7
-D1WBaxkhK+FU922+qwQKhABlwMxGCnfZ8F+rlk4lNotm3fP4wHbnO1SGIDvvZFt/
-mpMgkhwL4lShUFv57YylXr+D2vSFcAryKiVGk1X3sHMXlFAMLHUm3d97fJnmb1qQ
-wC43BlJCBQF98wKtYNwTUG/9gblfk8lCB2DL1hwmPy3q9KbSDOdUK3HW6a75ZzCD
-6mXc/Y0bJcwweDsywbPBYP13hYUcpw4htcU6hg6DsoAjLNkSrlY+GGo7htx+L9HH
-IwtfRg==
------END CERTIFICATE-----
-"""
-
-GOOD_CERT_WITH_COMMENT = """saydas Intermédiaire CA
------BEGIN CERTIFICATE-----
-MIICoDCCAYgCCQC2c2uY34HNlzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdn
-b3ZlZ2FuMB4XDTE5MDMxMzIxMDMzMFoXDTM4MDYxNjIxMDMzMFowEjEQMA4GA1UE
-AwwHZ292ZWdhbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEatWsZ
-1iwGmTxD02dxMI4ci+Au4FzvmWLBWD07H5GGTVFwnqmNOKhP6DHs1EsMZevkUvaG
-CRxZlPYhjNFLZr2c2FnoDZ5nBXlSW6sodXURbMfyT187nDeBXVYFuh4T2eNCatnm
-t3vgdi+pWsF0LbOgpu7GJI2sh5K1imxyB77tJ7PFTDZCSohkK+A+0nDCnJqDUNXD
-5CK8iaBciCbnzp3nRKuM2EmgXno9Repy/HYxIgB7ZodPwDvYNjMGfvs0s9mJIKmc
-CKgkPXVO9y9gaRrrytICcPOs+YoU/PN4Ttg6wzxaWvJgw44vsR8wM/0i4HlXfBdl
-9br+cgn8jukDOgECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAyNHV6NA+0GfUrvBq
-AHXHNnBE3nzMhGPhF/0B/dO4o0n6pgGZyzRxaUaoo6+5oQnBf/2NmDyLWdalFWX7
-D1WBaxkhK+FU922+qwQKhABlwMxGCnfZ8F+rlk4lNotm3fP4wHbnO1SGIDvvZFt/
-mpMgkhwL4lShUFv57YylXr+D2vSFcAryKiVGk1X3sHMXlFAMLHUm3d97fJnmb1qQ
-wC43BlJCBQF98wKtYNwTUG/9gblfk8lCB2DL1hwmPy3q9KbSDOdUK3HW6a75ZzCD
-6mXc/Y0bJcwweDsywbPBYP13hYUcpw4htcU6hg6DsoAjLNkSrlY+GGo7htx+L9HH
-IwtfRg==
------END CERTIFICATE-----
-"""
-
-BAD_CERT = """-----BEGIN CERTIFICATE-----\nBOGUS==\n-----END CERTIFICATE-----
-"""
 
 
 def _run_basic_sync_and_assert(file_bindings, remote, file_repo, monitor_task):
@@ -253,24 +211,3 @@ def test_header_for_sync(
     assert requests_record[0].path == "/basic/PULP_MANIFEST"
     assert header_name in requests_record[0].headers
     assert header_value == requests_record[0].headers[header_name]
-
-
-@pytest.mark.parallel
-def test_certificate_clean(file_remote_factory):
-    # Check that a good cert validates
-    a_remote = file_remote_factory(url="http://example.com/", ca_cert=GOOD_CERT)
-    assert a_remote.ca_cert == GOOD_CERT
-    a_remote = file_remote_factory(url="http://example.com/", client_cert=GOOD_CERT)
-    assert a_remote.client_cert == GOOD_CERT
-
-    # Check that a good-cert-with-comments validates and strips the comments
-    a_remote = file_remote_factory(url="http://example.com/", ca_cert=GOOD_CERT_WITH_COMMENT)
-    assert a_remote.ca_cert == GOOD_CERT
-    a_remote = file_remote_factory(url="http://example.com/", client_cert=GOOD_CERT_WITH_COMMENT)
-    assert a_remote.client_cert == GOOD_CERT
-
-    # Check that a bad-cert gets rejected
-    with pytest.raises(BadRequestException):
-        a_remote = file_remote_factory(url="http://example.com/", ca_cert=BAD_CERT)
-    with pytest.raises(BadRequestException):
-        a_remote = file_remote_factory(url="http://example.com/", client_cert=BAD_CERT)

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulpcore/app/apps.py

@@ -247,7 +247,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.76.0"
+    version = "3.76.1"
 
     # The python package name providing this app
     python_package_name = "pulpcore"

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulpcore/app/serializers/repository.py

@@ -1,6 +1,4 @@
-import OpenSSL
 import os
-
 from gettext import gettext as _
 from urllib.parse import urlparse
 
@@ -74,34 +72,6 @@ class RepositorySerializer(ModelSerializer):
         )
 
 
-def validate_certificate(which_cert, value):
-    """
-    Validate and return *just* the cert and not any commentary that came along with it.
-
-    Args:
-        which_cert: The attribute-name whose cert we're validating (only used for error-message).
-        value: The string being proposed as a certificate.
-
-    Raises:
-        ValidationError: When the provided value can't be interpreted as a certificate.
-
-    Returns:
-        The cert-string with *just* the validated BEGIN/END CERTIFICATE segments.
-    """
-    if value:
-        try:
-            # Let OpenSSL validate and clean the proposed cert.
-            cleansed_str = OpenSSL.crypto.dump_certificate(
-                OpenSSL.crypto.FILETYPE_PEM,
-                OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, bytes(value, "UTF-8")),
-            ).decode("ASCII")
-            return cleansed_str
-        except OpenSSL.crypto.Error as e:
-            raise serializers.ValidationError(
-                _("Invalid {} specified, error '{}'").format(which_cert, e.args)
-            )
-
-
 class RemoteSerializer(ModelSerializer, HiddenFieldsMixin):
     """
     Every remote defined by a plugin should have a Remote serializer that inherits from this
@@ -301,12 +271,6 @@ class RemoteSerializer(ModelSerializer, HiddenFieldsMixin):
             raise serializers.ValidationError(_("proxy_url must not contain credentials"))
         return value
 
-    def validate_ca_cert(self, value):
-        return validate_certificate("ca_cert", value)
-
-    def validate_client_cert(self, value):
-        return validate_certificate("client_cert", value)
-
     def validate(self, data):
         """
         Check, that proxy credentials are only provided completely and if a proxy is configured.

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulpcore/plugin/stages/artifact_stages.py

@@ -13,6 +13,7 @@ from pulpcore.plugin.models import (
     ContentArtifact,
     ProgressReport,
     RemoteArtifact,
+    Remote,
 )
 from pulpcore.plugin.sync import sync_to_async_iterable
 
@@ -469,6 +470,9 @@ class ACSArtifactHandler(Stage):
     Content Source if available.
     """
 
+    def __init__(self, *args, **kwargs):
+        self.remote_cache = {}
+
     async def run(self):
         async for batch in self.batches():
             # Gather batch d_artifact checksums
@@ -484,17 +488,19 @@ class ACSArtifactHandler(Stage):
                 existing_ras = (
                     RemoteArtifact.objects.acs()
                     .filter(**{f"{checksum_type}__in": batch_checksums[checksum_type]})
-                    .only("url", checksum_type, "remote")
-                    .select_related("remote")
+                    .only("url", checksum_type, "remote_id")
                 )
-                # todo: we could probably get rid of this select_related by separating
-                # out the remote query
                 async for ra in existing_ras.aiterator():
                     checksum = getattr(ra, checksum_type)
                     # pick the first occurence of RA from ACS
                     if checksum not in existing_ras_dict:
+                        if ra.remote_id not in self.remote_cache:
+                            self.remote_cache[ra.remote_id] = await Remote.objects.aget(
+                                pk=ra.remote_id
+                            )
+
                         existing_ras_dict[checksum] = {
-                            "remote": ra.remote,
+                            "remote": self.remote_cache[ra.remote_id],
                             "url": ra.url,
                         }
 

{pulpcore-3.76.0 → pulpcore-3.76.1}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.76.0
+Version: 3.76.1
 Summary: Pulp Django Application and Related Modules
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulpcore-3.76.0 → pulpcore-3.76.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "pulpcore"
-version = "3.76.0"
+version = "3.76.1"
 description = "Pulp Django Application and Related Modules"
 readme = "README.md"
 authors = [
@@ -206,7 +206,7 @@ ignore = [
 [tool.bumpversion]
 # This section is managed by the plugin template. Do not edit manually.
 
-current_version = "3.76.0"
+current_version = "3.76.1"
 commit = false
 tag = false
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"