Update ObjectPermissionBackend

Author: DavisRayM

kpi/backends.py

@@ -1,15 +1,29 @@
 # coding: utf-8
 from django.contrib.auth.backends import ModelBackend
+from django.contrib.auth.models import AnonymousUser
 from django.conf import settings
 
-from kpi.utils.object_permission import get_database_user
-from .utils.permissions import is_user_anonymous
+from .models.object_permission import get_anonymous_user, perm_parse
 
 
 class ObjectPermissionBackend(ModelBackend):
+    @staticmethod
+    def _translate_anonymous_user(user_obj):
+        """
+        Returns user_obj, is_anonymous, where user_obj is always a real
+        User object (translated from AnonymousUser if necessary), and
+        is_anonymous is True if the user is anonymous
+        """
+        is_anonymous = False
+        if isinstance(user_obj, AnonymousUser):
+            is_anonymous = True
+            user_obj = get_anonymous_user()
+        elif user_obj.pk == settings.ANONYMOUS_USER_ID:
+            is_anonymous = True
+        return user_obj, is_anonymous
+
     def get_group_permissions(self, user_obj, obj=None):
-        is_anonymous = is_user_anonymous(user_obj)
-        user_obj = get_database_user(user_obj)
+        user_obj, is_anonymous = self._translate_anonymous_user(user_obj)
         permissions = super().get_group_permissions(user_obj, obj)
         if is_anonymous:
             # Obey limits on anonymous users' permissions
@@ -19,8 +33,7 @@ def get_group_permissions(self, user_obj, obj=None):
             return permissions
 
     def get_all_permissions(self, user_obj, obj=None):
-        is_anonymous = is_user_anonymous(user_obj)
-        user_obj = get_database_user(user_obj)
+        user_obj, is_anonymous = self._translate_anonymous_user(user_obj)
         permissions = super().get_all_permissions(user_obj, obj)
         if is_anonymous:
             # Obey limits on anonymous users' permissions
@@ -30,8 +43,7 @@ def get_all_permissions(self, user_obj, obj=None):
             return permissions
 
     def has_perm(self, user_obj, perm, obj=None):
-        is_anonymous = is_user_anonymous(user_obj)
-        user_obj = get_database_user(user_obj)
+        user_obj, is_anonymous = self._translate_anonymous_user(user_obj)
         if obj is None or not hasattr(obj, 'has_perm'):
             if is_anonymous:
                 # Obey limits on anonymous users' permissions
@@ -43,4 +55,3 @@ def has_perm(self, user_obj, perm, obj=None):
             return False
         # Trust the object-level test to handle anonymous users correctly
         return obj.has_perm(user_obj, perm)
-

kpi/views/__init__.py

@@ -27,7 +27,7 @@ def home(request):
     cookie_jwt = request.COOKIES.get(settings.KPI_COOKIE_NAME)
     if request.user.is_anonymous and cookie_jwt:
         auth_class = JWTAuthentication()
-        user, token = auth_class.authenticate(request)
+        user, _ = auth_class.authenticate(request)
         user.backend = settings.AUTHENTICATION_BACKENDS[0]
         login(request, user)
     return TemplateResponse(request, "index.html")