diff --git a/src/documents/permissions.py b/src/documents/permissions.py index 2164dd94d6..dfa530516a 100644 --- a/src/documents/permissions.py +++ b/src/documents/permissions.py @@ -296,22 +296,29 @@ def set_permissions_for_objects( model_name = model.__name__.lower() ctype = ContentType.objects.get_for_model(model) + # Every action is resolved up front, before anything is written, so an + # unrecognized action name (see _resolve_permissions) aborts the whole + # call instead of leaving the actions ahead of it already applied -- + # BulkEditObjectsSerializer lets unknown keys through and its view turns + # the exception into a 400, so a half-applied change would otherwise be + # reported to the client as a failure. + permissions_by_action: dict[str, list[Permission]] = {} for action, entry in permissions.items(): - codename = f"{action}_{model_name}" - implied_codenames = {codename} + if "users" not in entry and "groups" not in entry: + continue + implied_codenames = {f"{action}_{model_name}"} if action == "change": # change gives view too implied_codenames.add(f"view_{model_name}") - - # Resolved once per action (not once per users/groups branch) and - # shared between both below -- also where an unrecognized action - # name (see _resolve_permissions) is caught. - permission_objs = ( - _resolve_permissions(implied_codenames, ctype) - if "users" in entry or "groups" in entry - else [] + permissions_by_action[action] = _resolve_permissions( + implied_codenames, + ctype, ) + for action, entry in permissions.items(): + codename = f"{action}_{model_name}" + permission_objs = permissions_by_action.get(action, []) + if "users" in entry: _apply_bulk_permission_entry( perm_model=UserObjectPermission, diff --git a/src/documents/tests/test_bulk_edit.py b/src/documents/tests/test_bulk_edit.py index 761a2f8814..068a219d07 100644 --- a/src/documents/tests/test_bulk_edit.py +++ b/src/documents/tests/test_bulk_edit.py @@ -631,6 +631,44 @@ class TestBulkEdit(DirectoriesMixin, TestCase): [self.doc1.pk], ) + def test_set_permissions_for_objects_unknown_action_applies_nothing( + self, + ) -> None: + """ + GIVEN: + - A permissions dict with a valid action ordered ahead of an + unrecognized one + WHEN: + - set_permissions_for_objects is called + THEN: + - Permission.DoesNotExist is raised + - The valid action ahead of it is not applied either + + Every action is resolved before any row is written, so a bad action + name cannot leave a half-applied change behind. That matters because + BulkEditObjectsView turns this exception into a 400: without the + up-front resolution the client would be told the request failed + while the leading action had already been committed. + """ + with self.assertRaises(Permission.DoesNotExist): + set_permissions_for_objects( + { + "view": {"users": [self.user1.id], "groups": []}, + "not_a_real_action": {"users": [self.user1.id], "groups": []}, + }, + Document, + [self.doc1.pk], + ) + + self.assertNotIn( + self.user1, + get_users_with_perms( + self.doc1, + only_with_perms_in=["view_document"], + with_group_users=False, + ), + ) + @mock.patch("documents.models.Document.delete") def test_delete_documents_old_uuid_field(self, m) -> None: m.side_effect = Exception("Data too long for column 'transaction_id' at row 1")