pulpcore 3.22.28__tar.gz → 3.22.30__tar.gz

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

@@ -8,6 +8,38 @@
 
 [//]: # (towncrier release notes start)
 
+# ## 3.22.30 (2024-08-10) {: #3.22.30 }
+
+### REST API {: #3.22.30-rest-api }
+
+#### Bugfixes {: #3.22.30-rest-api-bugfix }
+
+- Fixed RBAC permissions being incorrectly assigned in tasks that create objects.
+  https://access.redhat.com/security/cve/cve-2024-7143
+  [#5683](https://github.com/pulp/pulpcore/issues/5683)
+
+### Plugin API {: #3.22.30-plugin-api }
+
+No significant changes.
+
+---
+
+## 3.22.29 (2024-07-16) {: #3.22.29 }
+
+
+### REST API {: #3.22.29-rest-api }
+
+#### Bugfixes {: #3.22.29-rest-api-bugfix }
+
+- Browsable HREFs now have clickable links again.
+  [#5563](https://github.com/pulp/pulpcore/issues/5563)
+
+### Plugin API {: #3.22.29-plugin-api }
+
+No significant changes.
+
+---
+
 ## 3.22.28 (2024-06-24) {: #3.22.28 }
 
 

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

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

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

@@ -3,8 +3,6 @@ django
 dynaconf
 drf-spectacular
 pulp-smash @ git+https://github.com/pulp/pulp-smash.git
-pulpcore-client
-pulp-file-client
 pytest<8
 python-gnupg
 

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

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

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore/app/models/task.py

@@ -14,6 +14,7 @@ from django.contrib.postgres.fields import ArrayField
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import connection, models
 from django.utils import timezone
+from django_lifecycle import hook, AFTER_CREATE
 
 from pulpcore.app.models import (
     AutoAddObjPermsMixin,
@@ -231,6 +232,11 @@ class Task(BaseModel, AutoAddObjPermsMixin):
             task = Task.objects.get(pk=task_id)
         return task
 
+    @hook(AFTER_CREATE)
+    def add_role_dispatcher(self):
+        """Set the "core.task_user_dispatcher" role for the current user after creation."""
+        self.add_roles_for_object_creator("core.task_user_dispatcher")
+
     def set_running(self):
         """
         Set this Task to the running state, save it, and log output in warning cases.

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore/app/templatetags/pulp_urls.py

@@ -3,7 +3,7 @@ import re
 from django import template
 from django.conf import settings
 from django.utils.encoding import force_text
-from django.utils.html import escape
+from django.utils.html import escape, smart_urlquote
 from django.utils.safestring import SafeData, mark_safe
 
 register = template.Library()
@@ -20,6 +20,8 @@ WRAPPING_PUNCTUATION = [
     (""", """),
 ]
 word_split_re = re.compile(r"(\s+)")
+api_root_prefix = r"^" + settings.V3_API_ROOT.replace("/", r"\/")
+href_re = re.compile(api_root_prefix, re.IGNORECASE)
 
 
 @register.filter(needs_autoescape=True)
@@ -57,6 +59,9 @@ def urlize_quoted_hrefs(text, trim_url_limit=None, nofollow=True, autoescape=Tru
             url = None
             nofollow_attr = ' rel="nofollow"' if nofollow else ""
 
+            if href_re.match(middle):
+                url = smart_urlquote(middle)
+
             # Check if it's a real URL
             if url and ("{" in url or "%7B" in url):
                 url = None
@@ -74,8 +79,6 @@ def urlize_quoted_hrefs(text, trim_url_limit=None, nofollow=True, autoescape=Tru
                     words[i] = mark_safe(word)
                 elif autoescape:
                     words[i] = escape(word)
-        elif safe_input:
-            words[i] = mark_safe(word)
-        elif autoescape:
+        else:
             words[i] = escape(word)
     return "".join(words)

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore/app/viewsets/task.py

@@ -133,8 +133,21 @@ class TaskViewSet(
             ],
         },
         "core.task_viewer": ["core.view_task"],
+        # This is a special role to designate the user who dispatched the task, it is assigned to
+        # the user on the object-level at task creation. It is not meant to be edited or manually
+        # added/removed from users.
+        "core.task_user_dispatcher": ["core.add_task"],
     }
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        if self.action in ("add_role", "remove_role"):
+            if "core.task_user_dispatcher" == self.request.data.get("role"):
+                raise ValidationError(
+                    _("core.task_user_dispatcher can not be added/removed from a task.")
+                )
+        return qs
+
     @extend_schema(
         description="This operation cancels a task.",
         summary="Cancel a task",

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore/tasking/pulpcore_worker.py

@@ -442,7 +442,24 @@ def _perform_task(task_pk, task_working_dir_rel_path):
     task.set_running()
     # Store the task id in the environment for `Task.current()`.
     os.environ["PULP_TASK_ID"] = str(task.pk)
-    user = get_users_with_perms(task, with_group_users=False).first()
+    # These queries were specifically constructed and ordered this way to ensure we have the highest
+    # chance of getting the user who dispatched the task since we don't have a user relation on the
+    # task model. The second query acts as a fallback to provide ZDU support. Future changes will
+    # require to keep these around till a breaking change release is planned (3.70 the earliest).
+    user = (
+        get_users_with_perms(
+            task,
+            only_with_perms_in=["core.add_task"],
+            with_group_users=False,
+            include_model_permissions=False,
+        ).first()
+        or get_users_with_perms(
+            task,
+            only_with_perms_in=["core.manage_roles_task"],
+            with_group_users=False,
+            include_model_permissions=False,
+        ).first()
+    )
     _set_current_user(user)
     set_guid(task.logging_cid)
 

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore/tests/functional/api/test_tasking.py

@@ -17,10 +17,16 @@ from pulpcore.tests.functional.utils import download_file
 def dispatch_task(pulpcore_client):
     def _dispatch_task(*args, **kwargs):
         cid = pulpcore_client.default_headers.get("Correlation-ID") or str(uuid4())
+        username = pulpcore_client.configuration.username
         commands = (
             "from django_guid import set_guid; "
             "from pulpcore.tasking.tasks import dispatch; "
             "from pulpcore.app.util import get_url; "
+            "from django.contrib.auth import get_user_model; "
+            "from django_currentuser.middleware import _set_current_user; "
+            "User = get_user_model(); "
+            f"user = User.objects.filter(username='{username}').first(); "
+            "_set_current_user(user); "
             f"set_guid({cid!r}); "
             f"task = dispatch(*{args!r}, **{kwargs!r}); "
             "print(get_url(task))"
@@ -296,3 +302,36 @@ def test_cancel_gooey_task(tasks_api_client, dispatch_task, monitor_task):
             task = tasks_api_client.read(task_href)
 
     assert task.state == "canceled"
+
+
+@pytest.mark.parallel
+def test_correct_task_ownership(dispatch_task, users_roles_api_client, gen_user):
+    """Test that tasks get the correct ownership when dispatched."""
+    alice = gen_user(model_roles=["core.task_viewer"])
+    bob = gen_user(model_roles=["file.filerepository_creator"])
+
+    with alice:
+        atask_href = dispatch_task("pulpcore.app.tasks.test.sleep", args=(0,))
+    aroles = users_roles_api_client.list(alice.user.pulp_href)
+    assert aroles.count == 3
+    roles = {r.role: r.content_object for r in aroles.results}
+    correct_roles = {
+        "core.task_owner": atask_href,
+        "core.task_user_dispatcher": atask_href,
+        "core.task_viewer": None,
+    }
+    assert roles == correct_roles
+
+    with bob:
+        btask_href = dispatch_task("pulpcore.app.tasks.test.sleep", args=(0,))
+    aroles = users_roles_api_client.list(alice.user.pulp_href)
+    assert aroles.count == 3
+    broles = users_roles_api_client.list(bob.user.pulp_href)
+    assert broles.count == 3
+    roles = {r.role: r.content_object for r in broles.results}
+    correct_roles = {
+        "core.task_owner": btask_href,
+        "core.task_user_dispatcher": btask_href,
+        "file.filerepository_creator": None,
+    }
+    assert roles == correct_roles

pulpcore-3.22.30/pulpcore/tests/unit/test_pulp_urls.py

@@ -0,0 +1,55 @@
+from django.conf import settings
+
+from pulpcore.app.templatetags import pulp_urls
+
+
+def test_urlize_quoted_hrefs_basic_url():
+    """
+    text starts with API_ROOT, defaults. Should be made clickable
+    """
+    txt = settings.V3_API_ROOT + "foo/bar/"
+    ret = pulp_urls.urlize_quoted_hrefs(txt)
+    assert ret == f'<a href="{txt}" rel="nofollow">{txt}</a>'
+
+
+def test_urlize_quoted_hrefs_nofollow():
+    """
+    text starts with API_ROOT, defaults. Should be made clickable
+    """
+    txt = settings.V3_API_ROOT + "foo/bar/"
+    ret = pulp_urls.urlize_quoted_hrefs(txt, nofollow=False)
+    assert ret == f'<a href="{txt}">{txt}</a>'
+
+
+def test_urlize_quoted_hrefs_trim():
+    """
+    text starts with API_ROOT, defaults. Should be made clickable
+    """
+    txt = settings.V3_API_ROOT + "foo/bar/"
+    trim_txt = txt[0] + "..."
+    ret = pulp_urls.urlize_quoted_hrefs(txt, trim_url_limit=4)
+    assert ret == f'<a href="{txt}" rel="nofollow">{trim_txt}</a>'
+
+
+def test_urlize_quoted_hrefs_basic_url_xss():
+    """
+    text starts with API_ROOT, includes XSS, defaults. Should be made clickable, escape XSS
+    """
+    txt = settings.V3_API_ROOT + "foo/bar/<script>alert('ALERT!')</script>blech/"
+    escapified_linked_text = (
+        '<a href="' + settings.V3_API_ROOT + "foo/bar/"
+        '%3Cscript%3Ealert(&#x27;ALERT!&#x27;)%3C/script%3Eblech/" '
+        'rel="nofollow">' + settings.V3_API_ROOT + "foo/bar/&lt;script&gt;"
+        "alert(&#x27;ALERT!&#x27;)&lt;/script&gt;blech/</a>"
+    )
+    ret = pulp_urls.urlize_quoted_hrefs(txt)
+    assert ret == escapified_linked_text
+
+
+def test_urlize_quoted_hrefs_basic_escape():
+    """
+    text contains XSS. Expect escaped
+    """
+    txt = "foo/bar/<script>alert('ALERT!')</script>blech/"
+    ret = pulp_urls.urlize_quoted_hrefs(txt)
+    assert ret == "foo/bar/&lt;script&gt;alert(&#x27;ALERT!&#x27;)&lt;/script&gt;blech/"

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

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

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore.egg-info/SOURCES.txt

@@ -317,6 +317,7 @@ pulpcore/tests/unit/test_cache.py
 pulpcore/tests/unit/test_content_guard.py
 pulpcore/tests/unit/test_files.py
 pulpcore/tests/unit/test_import_checks.py
+pulpcore/tests/unit/test_pulp_urls.py
 pulpcore/tests/unit/test_settings.py
 pulpcore/tests/unit/test_util.py
 pulpcore/tests/unit/content/__init__.py

{pulpcore-3.22.28 → pulpcore-3.22.30}/pulpcore.egg-info/requires.txt

@@ -1,10 +1,10 @@
 aiodns<=3.1.1,>=3.0
-aiofiles<=23.3.0,>=22.1
+aiofiles<23.3.0,>=22.1
 aiohttp<3.9.2,>=3.8.1
 asyncio-throttle<=1.0.2,>=1.0
 backoff<2.2.2,>=2.1.2
 click<=8.1.7,>=8.1.0
-cryptography<42.0.1,>=38.0.1
+cryptography<42.0,>=38.0.1
 Django~=3.2.16
 django-currentuser<=0.5.3,>=0.5.3
 django-filter<=22.1,>=22.1

{pulpcore-3.22.28 → pulpcore-3.22.30}/requirements.txt

@@ -1,11 +1,11 @@
 aiodns>=3.0,<=3.1.1
-aiofiles>=22.1,<=23.3.0
+aiofiles>=22.1,<23.3.0
 aiohttp>=3.8.1,<3.9.2
 asyncio-throttle>=1.0,<=1.0.2
 async-timeout>=4.0.3,<4.0.4;python_version<"3.11"
 backoff>=2.1.2,<2.2.2
 click>=8.1.0,<=8.1.7
-cryptography>=38.0.1,<42.0.1
+cryptography>=38.0.1,<42.0
 Django~=3.2.16  # LTS version, switch only if we have a compelling reason to
 django-currentuser>=0.5.3,<=0.5.3
 django-filter>=22.1,<=22.1

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

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