Ticket #19412: modelbackend-perms.diff

django/contrib/auth/backends.py

@@ -1 +1 @@
 from __future__ import unicode_literals
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
+from django.db.models.fields import FieldDoesNotExist
 
 
 class ModelBackend(object):
@@ -30 +31 @@
             if user_obj.is_superuser:
                 perms = Permission.objects.all()
             else:
-                user_groups_field = get_user_model()._meta.get_field('groups')
-                user_groups_query = 'group__%s' % user_groups_field.related_query_name()
-                perms = Permission.objects.filter(**{user_groups_query: user_obj})
+                try:
+                    user_groups_field = get_user_model()._meta.get_field('groups')
+                    user_groups_query = 'group__%s' % user_groups_field.related_query_name()
+                    perms = Permission.objects.filter(**{user_groups_query: user_obj})
+                except FieldDoesNotExist:
+                    # custom user object may not define groups
+                    perms = Permission.objects.none()
             perms = perms.values_list('content_type__app_label', 'codename').order_by()
             user_obj._group_perm_cache = set(["%s.%s" % (ct, name) for ct, name in perms])
         return user_obj._group_perm_cache
@@ -41 +46 @@
         if user_obj.is_anonymous() or obj is not None:
             return set()
         if not hasattr(user_obj, '_perm_cache'):
-            user_obj._perm_cache = set(["%s.%s" % (p.content_type.app_label, p.codename) for p in user_obj.user_permissions.select_related()])
+            if hasattr(user_obj, 'user_permissions'):
+                user_obj._perm_cache = set(["%s.%s" % (p.content_type.app_label, p.codename) for p in user_obj.user_permissions.select_related()])
+            else:
+                user_obj._perm_cache = set()
             user_obj._perm_cache.update(self.get_group_permissions(user_obj))
         return user_obj._perm_cache