pulpcore 3.22.30__tar.gz → 3.22.31__tar.gz

{pulpcore-3.22.30 → pulpcore-3.22.31}/CHANGES.md

@@ -8,6 +8,22 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.22.31 (2024-10-01) {: #3.22.31 }
+
+### REST API {: #3.22.31-rest-api }
+
+#### Bugfixes {: #3.22.31-rest-api-bugfix }
+
+- Fixed a bug that caused Pulp to return duplicate content when a user was logged in as a
+  non-superuser while the content was part of multiple repositories.
+  [#3641](https://github.com/pulp/pulpcore/issues/3641)
+
+### Plugin API {: #3.22.31-plugin-api }
+
+No significant changes.
+
+---
+
 # ## 3.22.30 (2024-08-10) {: #3.22.30 }
 
 ### REST API {: #3.22.30-rest-api }

{pulpcore-3.22.30 → pulpcore-3.22.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulpcore
-Version: 3.22.30
+Version: 3.22.31
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team

{pulpcore-3.22.30 → pulpcore-3.22.31}/functest_requirements.txt

@@ -8,3 +8,5 @@ python-gnupg
 
 # from pulp_file
 beautifulsoup4
+pytest-xdist
+pytest-timeout

{pulpcore-3.22.30 → pulpcore-3.22.31}/pulpcore/app/apps.py

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

{pulpcore-3.22.30 → pulpcore-3.22.31}/pulpcore/app/viewsets/content.py

@@ -121,7 +121,12 @@ class BaseContentViewSet(NamedModelViewSet):
                 repo_viewset = get_viewset_for_model(repo)()
                 setattr(repo_viewset, "request", self.request)
                 scoped_repos.extend(repo_viewset.get_queryset().values_list("pk", flat=True))
-            return qs.filter(repositories__in=scoped_repos)
+
+            # calling the distinct clause at end of the query ensures that no duplicates from
+            # joined tables will be returned to the end-user; this behaviour is documented at
+            # https://docs.djangoproject.com/en/3.2/topics/db/queries, in the section Spanning
+            # multi-valued relationships
+            return qs.filter(repositories__in=scoped_repos).distinct()
         return qs
 
 

{pulpcore-3.22.30 → pulpcore-3.22.31}/pulpcore/tests/functional/api/test_workers.py

@@ -76,7 +76,7 @@ def task_schedule(cli_client):
         "from django.utils.timezone import now;"
         "from datetime import timedelta;"
         "from pulpcore.app.models import TaskSchedule;"
-        "dispatch_interval = timedelta(seconds=4);"
+        "dispatch_interval = timedelta(seconds=5);"
         "next_dispatch = now() + dispatch_interval;"
         "TaskSchedule("
         f"    name='{name}', task_name='{task_name}', "
@@ -100,8 +100,9 @@ def task_schedule(cli_client):
 def test_task_schedule(task_schedule, task_schedules_api_client):
     """Test that a worker will schedule a task roughly at a given time."""
     # Worker TTL is configured to 30s, therefore they will have a heartbeat each 10s (6 bpm). The
-    # task is scheduled 4s in the future to give us time to invesitgate the state before and after.
-    # 15s later we can be sure it was scheduled (as long as at least one worker is running).
+    # task is scheduled 5s in the future to give us time to invesitgate the state before and after.
+    # 16s later we can be sure it was scheduled (as long as at least one worker is running).
+    # Waiting for 18s to give some more slack.
 
     result = task_schedules_api_client.list(name=task_schedule["name"])
     assert result.count == 1
@@ -110,7 +111,7 @@ def test_task_schedule(task_schedule, task_schedules_api_client):
     assert ts.task_name == task_schedule["task_name"]
     assert ts.last_task is None
     # At least a worker heartbeat is needed
-    for i in range(15):
+    for i in range(18):
         sleep(1)
         ts = task_schedules_api_client.read(task_schedule_href=result.results[0].pulp_href)
         if ts.last_task is not None:

{pulpcore-3.22.30 → pulpcore-3.22.31}/pulpcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pulpcore
-Version: 3.22.30
+Version: 3.22.31
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team

{pulpcore-3.22.30 → pulpcore-3.22.31}/setup.py

@@ -8,7 +8,7 @@ with open("requirements.txt") as requirements:
 
 setup(
     name="pulpcore",
-    version="3.22.30",
+    version="3.22.31",
     description="Pulp Django Application and Related Modules",
     long_description=long_description,
     long_description_content_type="text/markdown",