A community-supported supercharged document management system: scan, index and archive all your documents
Python aiangulararchivingdjangodmsdocument-managementdocument-management-systemllmmachine-learningocroptical-character-recognitionpdf
Fix: re-use permitted_object_ids
shamoonbfe8213b78ea
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.pyindex dcb84b527..4193bed72 100644--- a/src/documents/serialisers.py+++ b/src/documents/serialisers.py@@ -81,6 +81,7 @@ from documents.permissions import get_document_count_filter_for_userfrom documents.permissions import get_groups_with_only_permissionfrom documents.permissions import has_perms_owner_awarefrom documents.permissions import permitted_document_ids+from documents.permissions import restrict_queryset_to_visiblefrom documents.permissions import set_permissions_for_objectfrom documents.regex import validate_regex_patternfrom documents.templating.filepath import validate_filepath_template_and_render@@ -661,6 +662,8 @@ class TagSerializer(MatchingModelSerializer, OwnedObjectSerializer):.select_related("owner").annotate(document_count=Count("documents", filter=filter_q)))+ user = getattr(request, "user", None) if request else self.user+ children = restrict_queryset_to_visible(children, user, "view_tag")view = self.context.get("view")ordering = (diff --git a/src/documents/tests/test_tag_hierarchy.py b/src/documents/tests/test_tag_hierarchy.pyindex 0bb4c75c5..c50812edc 100644--- a/src/documents/tests/test_tag_hierarchy.py+++ b/src/documents/tests/test_tag_hierarchy.py@@ -1,5 +1,6 @@from unittest import mock+from django.contrib.auth.models import Permissionfrom django.contrib.auth.models import Userfrom rest_framework.test import APITestCase@@ -14,6 +15,36 @@ from documents.signals.handlers import run_workflowsfrom documents.tests.utils import DirectoriesMixin+class TestTagHierarchyPermissions(APITestCase):+ def test_children_only_include_visible_tags(self) -> None:+ owner = User.objects.create_user(username="owner")+ requester = User.objects.create_user(username="requester")+ requester.user_permissions.add(+ Permission.objects.get(codename="view_tag"),+ )+ parent = Tag.objects.create(name="Visible parent", owner=requester)+ hidden_child = Tag.objects.create(+ name="Hidden child",+ owner=owner,+ tn_parent=parent,+ )+ self.client.force_authenticate(user=requester)++ response = self.client.get("/api/tags/")++ assert response.status_code == 200+ parent_result = next(+ tag for tag in response.data["results"] if tag["id"] == parent.pk+ )+ assert parent_result["children"] == []+ assert hidden_child.pk not in response.data.get("all", [])++ response = self.client.get(f"/api/tags/{parent.pk}/")++ assert response.status_code == 200+ assert response.data["children"] == []++class TestTagHierarchy(DirectoriesMixin, APITestCase):def setUp(self) -> None:super().setUp()diff --git a/src/documents/views.py b/src/documents/views.pyindex c6f0aeb15..4bca07f20 100644--- a/src/documents/views.py+++ b/src/documents/views.py@@ -635,7 +635,9 @@ class TagViewSet(PermissionsAwareDocumentCountMixin, ModelViewSet[Tag]):annotate_document_count_for_related_queryset(Tag.objects.filter(pk__in=descendant_pks | {t.pk for t in all_tags},- ).select_related("owner"),+ )+ .filter(pk__in=permitted_object_ids(user, Tag, "view_tag"))+ .select_related("owner"),through_model=self.document_count_through,related_object_field=self._get_document_count_source_field(),user=user,