ФУНКЦИИ - МЕЖПРОЕКТНАЯ КОММУНИКАЦИЯ: блокировка и удаление участников воркспейса в God Mode

plane-src/apps/api/plane/app/permissions/base.py

@@ -9,6 +9,8 @@ from rest_framework import status
 
 from enum import Enum
 
+from plane.utils.workspace_bans import release_expired_workspace_bans
+
 
 class ROLE(Enum):
     ADMIN = 20
@@ -20,6 +22,9 @@ def allow_permission(allowed_roles, level="PROJECT", creator=False, model=None):
     def decorator(view_func):
         @wraps(view_func)
         def _wrapped_view(instance, request, *args, **kwargs):
+            if not request.user.is_anonymous and kwargs.get("slug"):
+                release_expired_workspace_bans(member=request.user, workspace_slug=kwargs["slug"])
+
             # Check for creator if required
             if creator and model:
                 # check if the user is part of the workspace or not

plane-src/apps/api/plane/app/permissions/project.py

@@ -8,6 +8,12 @@ from rest_framework.permissions import SAFE_METHODS, BasePermission
 # Module import
 from plane.db.models import ProjectMember, WorkspaceMember
 from plane.db.models.project import ROLE
+from plane.utils.workspace_bans import release_expired_workspace_bans
+
+
+def release_request_workspace_ban(request, view):
+    if hasattr(view, "workspace_slug") and view.workspace_slug:
+        release_expired_workspace_bans(member=request.user, workspace_slug=view.workspace_slug)
 
 
 class ProjectBasePermission(BasePermission):
@@ -15,6 +21,8 @@ class ProjectBasePermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return WorkspaceMember.objects.filter(
@@ -58,6 +66,8 @@ class ProjectMemberPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return ProjectMember.objects.filter(
@@ -87,6 +97,8 @@ class ProjectEntityPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         # Handle requests based on project__identifier
         if hasattr(view, "project_identifier") and view.project_identifier:
             if request.method in SAFE_METHODS:
@@ -121,6 +133,8 @@ class ProjectAdminPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,
@@ -135,6 +149,8 @@ class ProjectLitePermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         return ProjectMember.objects.filter(
             workspace__slug=view.workspace_slug,
             member=request.user,

plane-src/apps/api/plane/app/permissions/workspace.py

@@ -7,6 +7,7 @@ from rest_framework.permissions import BasePermission, SAFE_METHODS
 
 # Module imports
 from plane.db.models import WorkspaceMember
+from plane.utils.workspace_bans import release_expired_workspace_bans
 
 
 # Permission Mappings
@@ -15,6 +16,11 @@ Member = 15
 Guest = 5
 
 
+def release_request_workspace_ban(request, view):
+    if hasattr(view, "workspace_slug") and view.workspace_slug:
+        release_expired_workspace_bans(member=request.user, workspace_slug=view.workspace_slug)
+
+
 # TODO: Move the below logic to python match - python v3.10
 class WorkSpaceBasePermission(BasePermission):
     def has_permission(self, request, view):
@@ -25,6 +31,8 @@ class WorkSpaceBasePermission(BasePermission):
         if request.method == "POST":
             return True
 
+        release_request_workspace_ban(request, view)
+
         ## Safe Methods
         if request.method in SAFE_METHODS:
             return True
@@ -53,6 +61,8 @@ class WorkspaceOwnerPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         return WorkspaceMember.objects.filter(
             workspace__slug=view.workspace_slug, member=request.user, role=Admin
         ).exists()
@@ -63,6 +73,8 @@ class WorkSpaceAdminPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         return WorkspaceMember.objects.filter(
             member=request.user,
             workspace__slug=view.workspace_slug,
@@ -76,6 +88,8 @@ class WorkspaceEntityPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         ## Safe Methods -> Handle the filtering logic in queryset
         if request.method in SAFE_METHODS:
             return WorkspaceMember.objects.filter(
@@ -95,6 +109,8 @@ class WorkspaceViewerPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         return WorkspaceMember.objects.filter(
             member=request.user, workspace__slug=view.workspace_slug, is_active=True
         ).exists()
@@ -105,6 +121,8 @@ class WorkspaceUserPermission(BasePermission):
         if request.user.is_anonymous:
             return False
 
+        release_request_workspace_ban(request, view)
+
         return WorkspaceMember.objects.filter(
             member=request.user, workspace__slug=view.workspace_slug, is_active=True
         ).exists()