Skip to content

permissions must return a boolean to allow &/| operator comparison #6286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rest_framework/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class IsAuthenticated(BasePermission):
"""

def has_permission(self, request, view):
return request.user and request.user.is_authenticated
return bool(request.user and request.user.is_authenticated)


class IsAdminUser(BasePermission):
Expand All @@ -119,7 +119,7 @@ class IsAdminUser(BasePermission):
"""

def has_permission(self, request, view):
return request.user and request.user.is_staff
return bool(request.user and request.user.is_staff)


class IsAuthenticatedOrReadOnly(BasePermission):
Expand All @@ -128,7 +128,7 @@ class IsAuthenticatedOrReadOnly(BasePermission):
"""

def has_permission(self, request, view):
return (
return bool(
request.method in SAFE_METHODS or
request.user and
request.user.is_authenticated
Expand Down
27 changes: 17 additions & 10 deletions tests/test_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import warnings

import django
from django.contrib.auth.models import Group, Permission, User
from django.contrib.auth.models import AnonymousUser, Group, Permission, User
from django.db import models
from django.test import TestCase
from django.urls import ResolverMatch
Expand Down Expand Up @@ -542,39 +542,46 @@ def test_permission_denied_for_object_with_custom_detail(self):
self.assertEqual(detail, self.custom_message)


class FakeUser:
def __init__(self, auth=False):
self.is_authenticated = auth
class PermissionsCompositionTests(TestCase):

def setUp(self):
self.username = 'john'
self.email = 'lennon@thebeatles.com'
self.password = 'password'
self.user = User.objects.create_user(
self.username,
self.email,
self.password
)
self.client.login(username=self.username, password=self.password)

class PermissionsCompositionTests(TestCase):
def test_and_false(self):
request = factory.get('/1', format='json')
request.user = FakeUser(auth=False)
request.user = AnonymousUser()
composed_perm = permissions.IsAuthenticated & permissions.AllowAny
assert composed_perm().has_permission(request, None) is False

def test_and_true(self):
request = factory.get('/1', format='json')
request.user = FakeUser(auth=True)
request.user = self.user
composed_perm = permissions.IsAuthenticated & permissions.AllowAny
assert composed_perm().has_permission(request, None) is True

def test_or_false(self):
request = factory.get('/1', format='json')
request.user = FakeUser(auth=False)
request.user = AnonymousUser()
composed_perm = permissions.IsAuthenticated | permissions.AllowAny
assert composed_perm().has_permission(request, None) is True

def test_or_true(self):
request = factory.get('/1', format='json')
request.user = FakeUser(auth=True)
request.user = self.user
composed_perm = permissions.IsAuthenticated | permissions.AllowAny
assert composed_perm().has_permission(request, None) is True

def test_several_levels(self):
request = factory.get('/1', format='json')
request.user = FakeUser(auth=True)
request.user = self.user
composed_perm = (
permissions.IsAuthenticated &
permissions.IsAuthenticated &
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy