Open source video conferencing app powered by LiveKit. Built with Django and React.
🔒️(backend) clarify administrator role checking function names
lebaudantoine64eadadaef37
diff --git a/src/backend/core/api/permissions.py b/src/backend/core/api/permissions.pyindex a28430c6..2300e903 100644--- a/src/backend/core/api/permissions.py+++ b/src/backend/core/api/permissions.py@@ -64,7 +64,7 @@ class RoomPermissions(permissions.BasePermission):if request.method == "DELETE":return obj.is_owner(user)- return obj.is_administrator(user)+ return obj.is_administrator_or_owner(user)class ResourceAccessPermission(IsAuthenticated):@@ -80,7 +80,7 @@ class ResourceAccessPermission(IsAuthenticated):if request.method == "DELETE" and obj.role == RoleChoices.OWNER:return obj.user == user- return obj.resource.is_administrator(user)+ return obj.resource.is_administrator_or_owner(user)class HasAbilityPermission(IsAuthenticated):@@ -98,7 +98,7 @@ class HasPrivilegesOnRoom(IsAuthenticated):def has_object_permission(self, request, view, obj):"""Determine if user has privileges on room."""- return obj.is_owner(request.user) or obj.is_administrator(request.user)+ return obj.is_administrator_or_owner(request.user)class IsRecordingEnabled(permissions.BasePermission):diff --git a/src/backend/core/api/serializers.py b/src/backend/core/api/serializers.pyindex 09a19130..bb7c8a93 100644--- a/src/backend/core/api/serializers.py+++ b/src/backend/core/api/serializers.py@@ -58,7 +58,9 @@ class ResourceAccessSerializerMixin:request = self.context.get("request", None)user = getattr(request, "user", None)- if not (user and user.is_authenticated and resource.is_administrator(user)):+ if not (+ user and user.is_authenticated and resource.is_administrator_or_owner(user)+ ):raise PermissionDenied(_("You must be administrator or owner of a room to add accesses to it."))@@ -118,9 +120,11 @@ class RoomSerializer(serializers.ModelSerializer):return outputrole = instance.get_role(request.user)- is_admin = models.RoleChoices.check_administrator_role(role)+ is_admin_or_owner = models.RoleChoices.check_administrator_role(+ role+ ) or models.RoleChoices.check_owner_role(role)- if is_admin:+ if is_admin_or_owner:access_serializer = NestedResourceAccessSerializer(instance.accesses.select_related("resource", "user").all(),context=self.context,@@ -128,7 +132,7 @@ class RoomSerializer(serializers.ModelSerializer):)output["accesses"] = access_serializer.data- if not is_admin:+ if not is_admin_or_owner:del output["configuration"]should_access_room = (@@ -147,7 +151,7 @@ class RoomSerializer(serializers.ModelSerializer):room_id=room_id, user=request.user, username=username)- output["is_administrable"] = is_admin+ output["is_administrable"] = is_admin_or_ownerreturn outputdiff --git a/src/backend/core/models.py b/src/backend/core/models.pyindex fe5af3c0..b92b9291 100644--- a/src/backend/core/models.py+++ b/src/backend/core/models.py@@ -35,7 +35,7 @@ class RoleChoices(models.TextChoices):@classmethoddef check_administrator_role(cls, role):"""Check if a role is administrator."""- return role in [cls.ADMIN, cls.OWNER]+ return role == cls.ADMIN@classmethoddef check_owner_role(cls, role):@@ -288,13 +288,13 @@ class Resource(BaseModel):role = RoleChoices.MEMBERreturn role- def is_administrator(self, user):+ def is_administrator_or_owner(self, user):"""- Check if a user is administrator of the resource.-- Users carrying the "owner" role are considered as administrators a fortiori.- """- return RoleChoices.check_administrator_role(self.get_role(user))+ Check if a user is administrator or owner of the resource."""+ role = self.get_role(user)+ return RoleChoices.check_administrator_role(+ role+ ) or RoleChoices.check_owner_role(role)def is_owner(self, user):"""Check if a user is owner of the resource."""diff --git a/src/backend/core/tests/test_models_rooms.py b/src/backend/core/tests/test_models_rooms.pyindex 3cc8acbb..23d1f23f 100644--- a/src/backend/core/tests/test_models_rooms.py+++ b/src/backend/core/tests/test_models_rooms.py@@ -102,7 +102,7 @@ def test_models_rooms_access_rights_none(django_assert_num_queries):with django_assert_num_queries(0):assert room.get_role(None) is Nonewith django_assert_num_queries(0):- assert room.is_administrator(None) is False+ assert room.is_administrator_or_owner(None) is Falsewith django_assert_num_queries(0):assert room.is_owner(None) is False@@ -115,7 +115,7 @@ def test_models_rooms_access_rights_anonymous(django_assert_num_queries):with django_assert_num_queries(0):assert room.get_role(user) is Nonewith django_assert_num_queries(0):- assert room.is_administrator(user) is False+ assert room.is_administrator_or_owner(user) is Falsewith django_assert_num_queries(0):assert room.is_owner(user) is False@@ -128,7 +128,7 @@ def test_models_rooms_access_rights_authenticated(django_assert_num_queries):with django_assert_num_queries(1):assert room.get_role(user) is Nonewith django_assert_num_queries(1):- assert room.is_administrator(user) is False+ assert room.is_administrator_or_owner(user) is Falsewith django_assert_num_queries(1):assert room.is_owner(user) is False@@ -141,7 +141,7 @@ def test_models_rooms_access_rights_member_direct(django_assert_num_queries):with django_assert_num_queries(1):assert room.get_role(user) == "member"with django_assert_num_queries(1):- assert room.is_administrator(user) is False+ assert room.is_administrator_or_owner(user) is Falsewith django_assert_num_queries(1):assert room.is_owner(user) is False@@ -154,7 +154,7 @@ def test_models_rooms_access_rights_administrator_direct(django_assert_num_queriwith django_assert_num_queries(1):assert room.get_role(user) == "administrator"with django_assert_num_queries(1):- assert room.is_administrator(user) is True+ assert room.is_administrator_or_owner(user) is Truewith django_assert_num_queries(1):assert room.is_owner(user) is False@@ -167,7 +167,7 @@ def test_models_rooms_access_rights_owner_direct(django_assert_num_queries):with django_assert_num_queries(1):assert room.get_role(user) == "owner"with django_assert_num_queries(1):- assert room.is_administrator(user) is True+ assert room.is_administrator_or_owner(user) is Truewith django_assert_num_queries(1):assert room.is_owner(user) is True