Change semantic of OR of two permission classes

The original semantic of OR is defined as: the request pass either of the two has_permission() check, and pass either of the two has_object_permission() check, which could lead to situations that a request passes has_permission() but fails on has_object_permission() of Permission Class A, fails has_permission() but passes has_object_permission() of Permission Class B, passes the OR permission check. This should not be the desired permission check semantic in applications, because such a request should fail on either Permission Class (on Django object permission) alone, but passes the OR or the two.

My code fix this by changing the semantic so that the request has to pass either class's has_permission() and has_object_permission() to get the Django object permission of the OR check.

Author: MarkYu98

rest_framework/permissions.py

@@ -78,8 +78,9 @@ def has_permission(self, request, view):
 
     def has_object_permission(self, request, view, obj):
         return (
-            self.op1.has_object_permission(request, view, obj) or
-            self.op2.has_object_permission(request, view, obj)
+            (self.op1.has_permission(request, view) and self.op1.has_object_permission(request, view, obj))
+            or
+            (self.op2.has_permission(request, view) and self.op2.has_object_permission(request, view, obj))
         )
 
 

tests/test_permissions.py

@@ -615,7 +615,6 @@ def test_has_object_permissions_not_short_circuited(self):
         )
         assert composed_perm().has_object_permission(request, None, None) is False
 
-    @pytest.mark.skipif(not PY36, reason="assert_called_once() not available")
     def test_or_lazyness(self):
         request = factory.get('/1', format='json')
         request.user = AnonymousUser()