pulpcore 3.76.0__py3-none-any.whl → 3.76.1__py3-none-any.whl

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

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

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/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/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/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.dist-info → pulpcore-3.76.1.dist-info}/METADATA

@@ -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.dist-info → pulpcore-3.76.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_certguard/__init__.py,sha256=llnEd00PrsAretsgAOHiNKFbmvIdXe3iDVPmSaKz7gU,71
 pulp_certguard/pytest_plugin.py,sha256=qhRbChzqN2PROtD-65KuoTfKr5k9T3GPsz9daFgpqpM,852
-pulp_certguard/app/__init__.py,sha256=Nci7BRqqXKWz6yFfyZ84D29DIz5IPtDkplzJohrUJyo,297
+pulp_certguard/app/__init__.py,sha256=ZJG_hpr0DY5FK-rulaYcw81s2Vz9_tsPykOohd-fyDk,297
 pulp_certguard/app/models.py,sha256=xy5IWxf0LQxayIDmQw25Y2YhB_NrlTGvuvdY-YW7QBU,8119
 pulp_certguard/app/serializers.py,sha256=3jxWu82vU3xA578Qbyz-G4Q9Zlh3MFLGRHzX62M0RF8,1826
 pulp_certguard/app/utils.py,sha256=O6T1Npdb8fu3XqIkDJd8PQdEFJWPUeQ-i_aHXBl7MEc,816
@@ -49,7 +49,7 @@ pulp_certguard/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6q
 pulp_file/__init__.py,sha256=0vOCXofR6Eyxkg4y66esnOGPeESCe23C1cNBHj56w44,61
 pulp_file/manifest.py,sha256=1WwIOJrPSkFcmkRm7CkWifVOCoZvo_nnANgce6uuG7U,3796
 pulp_file/pytest_plugin.py,sha256=Fi_p-Vle_I-VYUSe4Zlg7esb_Ul5fpB8Rx9UGLK5UNQ,13281
-pulp_file/app/__init__.py,sha256=XssRb5XqaSKNG9KEXhClHanpelyCGjwXF1lzuxuPU7I,292
+pulp_file/app/__init__.py,sha256=Uj8lL9og-flRYyE8dXQGqmcwcyki0SyG4Qswk-CRTRo,292
 pulp_file/app/modelresource.py,sha256=v-m-_bBEsfr8wG0TI5ffx1TuKUy2-PsirhuQz4XXF-0,1063
 pulp_file/app/models.py,sha256=QsrVg_2uKqnR89sLN2Y7Zy260_nLIcUfa94uZowlmFw,4571
 pulp_file/app/replica.py,sha256=OtNWVmdFUgNTYhPttftVNQnSrnvx2_hnrJgtW_G0Vrg,1894
@@ -94,7 +94,7 @@ pulp_file/tests/functional/api/test_mime_types.py,sha256=ZTZVpEnYXcXsDVo1PaaWEXY
 pulp_file/tests/functional/api/test_publish.py,sha256=Bjb-IHknmlXS0gY15OUDvQFNJJQJqWaXU7uFmORBOOQ,5844
 pulp_file/tests/functional/api/test_pulp_export.py,sha256=j8MJs1H4-fdRZecxroYpKHEu0aqcsPw21Fxx6YC3b10,10275
 pulp_file/tests/functional/api/test_rbac.py,sha256=8smU2gy94Bj03CiKC_8nIbB-AdZxoLbJT3G2rzGENgk,12423
-pulp_file/tests/functional/api/test_remote_settings.py,sha256=3aAHNlkc69Cv0XYjOVe6YjfvVW4UdAnlr0S5yhhy19c,8562
+pulp_file/tests/functional/api/test_remote_settings.py,sha256=g36B9HobAc7c_pRhUArRs0_7B6ZQyi-WS35Fh6jxui8,5362
 pulp_file/tests/functional/api/test_sync.py,sha256=jN87UoibkoJkqBV36ctvB9v72JKQHFnciRxFA-_1VfA,5673
 pulp_file/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_file/tests/unit/test_safe_paths.py,sha256=CRJX3-MdIZF_4-hVK-7brH9LSK2i97GdIYdqpe3Ao84,3796
@@ -110,7 +110,7 @@ pulpcore/pytest_plugin.py,sha256=wI6pXJ1minJh_dza-gOMLp9pWeuhKNyLc3PaZxpYkDI,377
 pulpcore/responses.py,sha256=mIGKmdCfTSoZxbFu4yIH1xbdLx1u5gqt3D99LTamcJg,6125
 pulpcore/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/app/access_policy.py,sha256=5vCKy6WoHtIt1_-eS5vMaZ7CmR4G-CIpsrB8yT-d88Q,6079
-pulpcore/app/apps.py,sha256=FjwPDWLAycVOolvF88KE6Eoho_mLHBSHZ_B5T0084Yo,17860
+pulpcore/app/apps.py,sha256=FbhBemzuCmMHD96tM274zjH2MPm9skxiWtpXU9S392Y,17860
 pulpcore/app/authentication.py,sha256=1LIJW6HIQQlZrliHy__jdzkDEh6Oj7xKgd0V-vRcDus,2855
 pulpcore/app/checks.py,sha256=jbfTF7nmftBbky4AQXHigpyCaGydKasvRUXsd72JZVg,1946
 pulpcore/app/entrypoint.py,sha256=HRfaHDkveSIfcTOtWEWYqg1poTmTo0J9hzzmj0yDcEM,4885
@@ -323,7 +323,7 @@ pulpcore/app/serializers/purge.py,sha256=CnjKWUvkuI207QMbqwmNs7FqMdOMUh1cujagby3
 pulpcore/app/serializers/reclaim.py,sha256=-ewdNqu-Ck1B_IUWJHG0pvN5zCMMEK9RiWI45g7D0ro,1710
 pulpcore/app/serializers/repair.py,sha256=uKrxTnhoarxyyGCixPRn9pmG19gRRVUTM7nPwCVp6_8,554
 pulpcore/app/serializers/replica.py,sha256=E3jwn1vfBqT4Y4s9pWsTrUEJKPO9pO0q2ZmwcpIDVh4,4044
-pulpcore/app/serializers/repository.py,sha256=Wb8xKYgJE6z3za2ti3iilXLg0MVTVJC8V0iGqbs3ECc,19570
+pulpcore/app/serializers/repository.py,sha256=ak75nibokkVL841Ulau6W77csn1w9MsIS9e5fHmu25A,18299
 pulpcore/app/serializers/status.py,sha256=nIrQl-MlOzUIvV2DrkgC19gqGmRVNKvWVN4pIBELgcQ,3815
 pulpcore/app/serializers/task.py,sha256=IGJGoSEC_wKS8t77JGnZWRqK-Mk5-4rXSj8j0Ha6nRA,10026
 pulpcore/app/serializers/upload.py,sha256=4r6iBegbYHmgFYjBYPcqB8J7eSxXgY4ukayMxJZNh_M,2402
@@ -415,7 +415,7 @@ pulpcore/plugin/serializers/__init__.py,sha256=TSGHag4b_fUIlINCD9dq6pLToHiQz41ps
 pulpcore/plugin/serializers/content.py,sha256=l2VKp5qLstI8InuisjxISTo_YimbxSorDfWncx5VY0U,9072
 pulpcore/plugin/stages/__init__.py,sha256=ZSMmgOKoPjEfg1VhNpldJf2bUvqezCG4gj_FBkJ4CpU,466
 pulpcore/plugin/stages/api.py,sha256=6iet7K6H5c9vk5lS9oE3gCyLlqdDKoqPMfF-lNIA-GQ,8435
-pulpcore/plugin/stages/artifact_stages.py,sha256=e2Puplq2pZm4BmPaePOBDzC2kMp0R_VOXKfzoKTiBf4,22698
+pulpcore/plugin/stages/artifact_stages.py,sha256=yKJQc06YevDiWGDsQDuWXzL0juj49UZ_wrE718Bd4CI,22870
 pulpcore/plugin/stages/content_stages.py,sha256=kyoJfZY3K8QncmbuVMOCyG9PcLYp8athFvz6E7weL-Q,16082
 pulpcore/plugin/stages/declarative_version.py,sha256=Ml0baZHY4om4Ai12azUIuIR6xdINuJSoxHqlGlKXh14,7503
 pulpcore/plugin/stages/models.py,sha256=0b7xs9d64WTG2yHog1Zo_Z_-pomFAe-gC4u9wksY7H0,7490
@@ -526,9 +526,9 @@ pulpcore/tests/unit/stages/test_artifactdownloader.py,sha256=qB1ANdFmNtUnljg8fCd
 pulpcore/tests/unit/stages/test_stages.py,sha256=H1a2BQLjdZlZvcb_qULp62huZ1xy6ItTcthktVyGU0w,4735
 pulpcore/tests/unit/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulpcore/tests/unit/viewsets/test_viewset_base.py,sha256=W9o3V6758bZctR6krMPPQytb0xJuF-jb4uBWTNDoD_U,4837
-pulpcore-3.76.0.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
-pulpcore-3.76.0.dist-info/METADATA,sha256=5f61IyOCwpak0Q6PhHTNrsoz__lIfN1cz1Zzr0Y1BXs,4123
-pulpcore-3.76.0.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-pulpcore-3.76.0.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
-pulpcore-3.76.0.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
-pulpcore-3.76.0.dist-info/RECORD,,
+pulpcore-3.76.1.dist-info/licenses/LICENSE,sha256=dhnHU8rJXUdAIgIjveSKAyYG_KzN5eVG-bxETIGrNW0,17988
+pulpcore-3.76.1.dist-info/METADATA,sha256=kQOn6PhS5rHJr0MiGG3cX_1TXbOG7SKL9VOO34-cldE,4123
+pulpcore-3.76.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+pulpcore-3.76.1.dist-info/entry_points.txt,sha256=OZven4wzXzQA5b5q9MpP4HUpIPPQCSvIOvkKtNInrK0,452
+pulpcore-3.76.1.dist-info/top_level.txt,sha256=6h-Lm3FKQSaT_nL1KSxu_hBnzKE15bcvf_BoU-ea4CI,34
+pulpcore-3.76.1.dist-info/RECORD,,

{pulpcore-3.76.0.dist-info → pulpcore-3.76.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any