pulp-python 3.11.2__tar.gz → 3.12.1__tar.gz

{pulp-python-3.11.2 → pulp-python-3.12.1}/CHANGES.md

@@ -8,16 +8,44 @@
 
 [//]: # (towncrier release notes start)
 
-## 3.11.2 (2024-06-27) {: #3.11.2 }
+## 3.12.1 (2024-06-27) {: #3.12.1 }
 
 
-#### Bugfixes {: #3.11.2-bugfix }
+#### Bugfixes {: #3.12.1-bugfix }
 
 - Fixed the `package_types` filter breaking other remote filters.
   [#691](https://github.com/pulp/pulp_python/issues/691)
 
 ---
 
+## 3.12.0 (2024-06-25) {: #3.12.0 }
+
+
+#### Features {: #3.12.0-feature }
+
+- Added RBAC support.
+  [#399](https://github.com/pulp/pulp_python/issues/399)
+- Added Pulp replication support for Python distributions.
+  [#648](https://github.com/pulp/pulp_python/issues/648)
+- Added Domain support.
+  [#668](https://github.com/pulp/pulp_python/issues/668)
+
+#### Bugfixes {: #3.12.0-bugfix }
+
+- Fixed tls_validation not being disabled when set to false on the remote.
+  [#653](https://github.com/pulp/pulp_python/issues/653)
+
+#### Deprecations and Removals {: #3.12.0-removal }
+
+- Raised the minimum `pulpcore` bound to `>=3.49` and dropped support for `python 3.8`.
+  [#pulpcore](https://github.com/pulp/pulp_python/issues/pulpcore)
+
+#### Misc {: #3.12.0-misc }
+
+- 
+
+---
+
 ## 3.11.1 (2024-04-11) {: #3.11.1 }
 
 ### Bugfixes

{pulp-python-3.11.2 → pulp-python-3.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulp-python
-Version: 3.11.2
+Version: 3.12.1
 Summary: pulp-python plugin for the Pulp Project
 Home-page: https://www.pulpproject.org
 Author: Pulp Project Developers
@@ -12,9 +12,8 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 

pulp-python-3.12.1/functest_requirements.txt

@@ -0,0 +1,8 @@
+pytest<8
+lxml
+twine
+pypi-simple
+pytest-custom_exit_code
+pytest-xdist
+proxy.py~=2.4.4
+trustme~=1.1.0

pulp-python-3.12.1/pulp_python/app/__init__.py

@@ -0,0 +1,66 @@
+from django.db.models.signals import post_migrate
+from pulpcore.plugin import PulpPluginAppConfig
+from gettext import gettext as _
+
+
+class PulpPythonPluginAppConfig(PulpPluginAppConfig):
+    """
+    Entry point for pulp_python plugin.
+    """
+
+    name = "pulp_python.app"
+    label = "python"
+    version = "3.12.1"
+    python_package_name = "pulp-python"
+    domain_compatible = True
+
+    def ready(self):
+        """Register PyPI access policy hook."""
+        super().ready()
+        post_migrate.connect(
+            _populate_pypi_access_policies,
+            sender=self,
+            dispatch_uid="populate_pypi_access_policies_identifier",
+        )
+
+
+# TODO: Remove this when https://github.com/pulp/pulpcore/issues/5500 is resolved
+def _populate_pypi_access_policies(sender, apps, verbosity, **kwargs):
+    from pulp_python.app.pypi.views import PyPIView, SimpleView, UploadView, MetadataView
+
+    try:
+        AccessPolicy = apps.get_model("core", "AccessPolicy")
+    except LookupError:
+        if verbosity >= 1:
+            print(_("AccessPolicy model does not exist. Skipping initialization."))
+        return
+
+    for viewset in (PyPIView, SimpleView, UploadView, MetadataView):
+        access_policy = getattr(viewset, "DEFAULT_ACCESS_POLICY", None)
+        if access_policy is not None:
+            viewset_name = viewset.urlpattern()
+            db_access_policy, created = AccessPolicy.objects.get_or_create(
+                viewset_name=viewset_name, defaults=access_policy
+            )
+            if created:
+                if verbosity >= 1:
+                    print(
+                        "Access policy for {viewset_name} created.".format(
+                            viewset_name=viewset_name
+                        )
+                    )
+            elif not db_access_policy.customized:
+                dirty = False
+                for key in ["statements", "creation_hooks", "queryset_scoping"]:
+                    value = access_policy.get(key)
+                    if getattr(db_access_policy, key, None) != value:
+                        setattr(db_access_policy, key, value)
+                        dirty = True
+                if dirty:
+                    db_access_policy.save()
+                    if verbosity >= 1:
+                        print(
+                            "Access policy for {viewset_name} updated.".format(
+                                viewset_name=viewset_name
+                            )
+                        )

pulp-python-3.12.1/pulp_python/app/global_access_conditions.py

@@ -0,0 +1,30 @@
+from django.conf import settings
+
+
+# Access Condition methods that can be used with PyPI access policies
+
+
+def index_has_perm(request, view, action, perm="python.view_pythondistribution"):
+    """Access Policy condition that checks if the user has the perm on the index(distro)."""
+    if request.user.has_perm(perm):
+        return True
+    if settings.DOMAIN_ENABLED:
+        if request.user.has_perm(perm, obj=request.pulp_domain):
+            return True
+    return request.user.has_perm(perm, obj=view.distribution)
+
+
+def index_has_repo_perm(request, view, action, perm="python.view_pythonrepository"):
+    """
+    Access Policy condition that checks if the user has the perm on the index's repository.
+
+    If index doesn't have a repository, then default return True.
+    """
+    if request.user.has_perm(perm):
+        return True
+    if settings.DOMAIN_ENABLED:
+        if request.user.has_perm(perm, obj=request.pulp_domain):
+            return True
+    if repo := view.distribution.repository:
+        return request.user.has_perm(perm, obj=repo.cast())
+    return True

pulp-python-3.12.1/pulp_python/app/migrations/0012_add_domain.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.10 on 2024-05-30 17:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+import pulpcore.app.util
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("python", "0011_alter_pythondistribution_distribution_ptr_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="pythonpackagecontent",
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name="pythonpackagecontent",
+            name="_pulp_domain",
+            field=models.ForeignKey(
+                default=pulpcore.app.util.get_domain_pk,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="core.domain",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="pythonpackagecontent",
+            name="sha256",
+            field=models.CharField(db_index=True, max_length=64),
+        ),
+        migrations.AlterUniqueTogether(
+            name="pythonpackagecontent",
+            unique_together={("sha256", "_pulp_domain")},
+        ),
+    ]

pulp-python-3.12.1/pulp_python/app/migrations/0013_add_rbac_permissions.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.10 on 2024-06-14 01:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('python', '0012_add_domain'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='pythondistribution',
+            options={'default_related_name': '%(app_label)s_%(model_name)s', 'permissions': [('manage_roles_pythondistribution', 'Can manage roles on python distributions')]},
+        ),
+        migrations.AlterModelOptions(
+            name='pythonpublication',
+            options={'default_related_name': '%(app_label)s_%(model_name)s', 'permissions': [('manage_roles_pythonpublication', 'Can manage roles on python publications')]},
+        ),
+        migrations.AlterModelOptions(
+            name='pythonremote',
+            options={'default_related_name': '%(app_label)s_%(model_name)s', 'permissions': [('manage_roles_pythonremote', 'Can manage roles on python remotes')]},
+        ),
+        migrations.AlterModelOptions(
+            name='pythonrepository',
+            options={'default_related_name': '%(app_label)s_%(model_name)s', 'permissions': [('sync_pythonrepository', 'Can start a sync task'), ('modify_pythonrepository', 'Can modify content of the repository'), ('manage_roles_pythonrepository', 'Can manage roles on python repositories'), ('repair_pythonrepository', 'Can repair repository versions')]},
+        ),
+    ]

{pulp-python-3.11.2 → pulp-python-3.12.1}/pulp_python/app/modelresource.py

@@ -1,5 +1,6 @@
 from pulpcore.plugin.importexport import BaseContentResource
 from pulpcore.plugin.modelresources import RepositoryResource
+from pulpcore.plugin.util import get_domain
 from pulp_python.app.models import (
     PythonPackageContent,
     PythonRepository,
@@ -15,7 +16,9 @@ class PythonPackageContentResource(BaseContentResource):
         """
         :return: PythonPackageContent specific to a specified repo-version.
         """
-        return PythonPackageContent.objects.filter(pk__in=self.repo_version.content)
+        return PythonPackageContent.objects.filter(
+            pk__in=self.repo_version.content, _pulp_domain=get_domain()
+        )
 
     class Meta:
         model = PythonPackageContent

{pulp-python-3.11.2 → pulp-python-3.12.1}/pulp_python/app/models.py

@@ -6,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.conf import settings
 from pulpcore.plugin.models import (
+    AutoAddObjPermsMixin,
     Content,
     Publication,
     Distribution,
@@ -23,6 +24,7 @@ from .utils import (
     PYPI_SERIAL_CONSTANT,
 )
 from pulpcore.plugin.repo_version_utils import remove_duplicates, validate_repo_version
+from pulpcore.plugin.util import get_domain_pk, get_domain
 
 log = getLogger(__name__)
 
@@ -46,7 +48,7 @@ PLATFORMS = (
 )
 
 
-class PythonDistribution(Distribution):
+class PythonDistribution(Distribution, AutoAddObjPermsMixin):
     """
     Distribution for 'Python' Content.
     """
@@ -68,6 +70,7 @@ class PythonDistribution(Distribution):
         path = PurePath(path)
         name = None
         version = None
+        domain = get_domain()
         if path.match("pypi/*/*/json"):
             version = path.parts[2]
             name = path.parts[1]
@@ -76,7 +79,7 @@ class PythonDistribution(Distribution):
         elif len(path.parts) and path.parts[0] == "simple":
             # Temporary fix for PublishedMetadata not being properly served from remote storage
             # https://github.com/pulp/pulp_python/issues/413
-            if settings.DEFAULT_FILE_STORAGE != "pulpcore.app.models.storage.FileSystem":
+            if domain.storage_class != "pulpcore.app.models.storage.FileSystem":
                 if self.publication or self.repository:
                     try:
                         publication = self.publication or Publication.objects.filter(
@@ -105,7 +108,11 @@ class PythonDistribution(Distribution):
             )
             # TODO Change this value to the Repo's serial value when implemented
             headers = {PYPI_LAST_SERIAL: str(PYPI_SERIAL_CONSTANT)}
-            json_body = python_content_to_json(self.base_path, package_content, version=version)
+            if not settings.DOMAIN_ENABLED:
+                domain = None
+            json_body = python_content_to_json(
+                self.base_path, package_content, version=version, domain=domain
+            )
             if json_body:
                 return json_response(json_body, headers=headers)
 
@@ -113,6 +120,9 @@ class PythonDistribution(Distribution):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("manage_roles_pythondistribution", "Can manage roles on python distributions"),
+        ]
 
 
 class NormalizeName(models.Transform):
@@ -143,7 +153,7 @@ class PythonPackageContent(Content):
     name = models.TextField()
     name.register_lookup(NormalizeName)
     version = models.TextField()
-    sha256 = models.CharField(unique=True, db_index=True, max_length=64)
+    sha256 = models.CharField(db_index=True, max_length=64)
     # Optional metadata
     python_version = models.TextField()
     metadata_version = models.TextField()
@@ -168,6 +178,8 @@ class PythonPackageContent(Content):
     classifiers = models.JSONField(default=list)
     project_urls = models.JSONField(default=dict)
     description_content_type = models.TextField()
+    # Pulp Domains
+    _pulp_domain = models.ForeignKey("core.Domain", default=get_domain_pk, on_delete=models.PROTECT)
 
     @staticmethod
     def init_from_artifact_and_relative_path(artifact, relative_path):
@@ -179,6 +191,8 @@ class PythonPackageContent(Content):
         data["version"] = metadata.version
         data["filename"] = path.name
         data["sha256"] = artifact.sha256
+        data["pulp_domain_id"] = artifact.pulp_domain_id
+        data["_pulp_domain_id"] = artifact.pulp_domain_id
         return PythonPackageContent(**data)
 
     def __str__(self):
@@ -200,10 +214,10 @@ class PythonPackageContent(Content):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
-        unique_together = ("sha256",)
+        unique_together = ("sha256", "_pulp_domain")
 
 
-class PythonPublication(Publication):
+class PythonPublication(Publication, AutoAddObjPermsMixin):
     """
     A Publication for PythonContent.
     """
@@ -212,9 +226,12 @@ class PythonPublication(Publication):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("manage_roles_pythonpublication", "Can manage roles on python publications"),
+        ]
 
 
-class PythonRemote(Remote):
+class PythonRemote(Remote, AutoAddObjPermsMixin):
     """
     A Remote for Python Content.
 
@@ -249,9 +266,12 @@ class PythonRemote(Remote):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("manage_roles_pythonremote", "Can manage roles on python remotes"),
+        ]
 
 
-class PythonRepository(Repository):
+class PythonRepository(Repository, AutoAddObjPermsMixin):
     """
     Repository for "python" content.
     """
@@ -264,6 +284,12 @@ class PythonRepository(Repository):
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
+        permissions = [
+            ("sync_pythonrepository", "Can start a sync task"),
+            ("modify_pythonrepository", "Can modify content of the repository"),
+            ("manage_roles_pythonrepository", "Can manage roles on python repositories"),
+            ("repair_pythonrepository", "Can repair repository versions"),
+        ]
 
     def on_new_version(self, version):
         """

{pulp-python-3.11.2 → pulp-python-3.12.1}/pulp_python/app/pypi/serializers.py

@@ -4,6 +4,7 @@ from gettext import gettext as _
 from rest_framework import serializers
 from pulp_python.app.utils import DIST_EXTENSIONS
 from pulpcore.plugin.models import Artifact
+from pulpcore.plugin.util import get_domain
 from django.db.utils import IntegrityError
 
 log = logging.getLogger(__name__)
@@ -76,7 +77,7 @@ class PackageUploadSerializer(serializers.Serializer):
         try:
             artifact.save()
         except IntegrityError:
-            artifact = Artifact.objects.get(sha256=artifact.sha256)
+            artifact = Artifact.objects.get(sha256=artifact.sha256, pulp_domain=get_domain())
             artifact.touch()
             log.info(f"Artifact for {file.name} already existed in database")
         data["content"] = (artifact, file.name)
@@ -88,6 +89,6 @@ class PackageUploadTaskSerializer(serializers.Serializer):
     A Serializer for responding to a package upload task.
     """
 
-    session = serializers.CharField()
+    session = serializers.CharField(allow_null=True)
     task = serializers.CharField()
-    task_start_time = serializers.DateTimeField()
+    task_start_time = serializers.DateTimeField(allow_null=True)