mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-30 01:46:24 +01:00
Code Issues Releases Wiki Activity

Check is_authenticated flag on _check_perm and instances_user_has_any_permission_for

Browse Source 
This avoids making redundant queries on groups / permissions when user is anonymous.
This commit is contained in:
Matt Westcott 2016-02-21 19:30:57 +00:00
parent 49d232a356
commit a10f56287c
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wagtail/wagtailcore/permission_policies/collections.py
View File

@ -26,7 +26,7 @@ class CollectionPermissionLookupMixin(object):
If collection is specified, only consider GroupCollectionPermission records
that apply to that collection.
"""
if not user.is_active:
if not (user.is_active and user.is_authenticated()):
return False
if user.is_superuser:
@ -162,7 +162,7 @@ class CollectionPermissionPolicy(CollectionPermissionLookupMixin, BaseDjangoAuth
Return a queryset of all instances of this model for which the given user has
permission to perform any of the given actions
"""
if not user.is_active:
if not (user.is_active and user.is_authenticated()):
return self.model.objects.none()
elif user.is_superuser:
return self.model.objects.all()

12
wagtail/wagtailcore/tests/test_collection_permission_policies.py
View File

@ -222,6 +222,12 @@ class TestCollectionPermissionPolicy(PermissionPolicyTestCase):
)
)
self.assertFalse(
self.policy.user_has_any_permission_for_instance(
self.anonymous_user, ['change', 'delete'], self.changer_doc
)
)
def test_instances_user_has_permission_for(self):
self.assertResultSetEqual(
self.policy.instances_user_has_permission_for(
@ -636,6 +642,12 @@ class TestCollectionOwnershipPermissionPolicy(PermissionPolicyTestCase):
)
)
self.assertFalse(
self.policy.user_has_any_permission_for_instance(
self.anonymous_user, ['change', 'delete'], self.changer_doc
)
)
def test_instances_user_has_permission_for(self):
self.assertResultSetEqual(
self.policy.instances_user_has_permission_for(