mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-03 08:25:04 +00:00
超级管理员可创建超级审计员并可设置审计员为组织审计员 (#3141)
* [Update] 超级管理员可创建超级审计员并可设置审计员为组织审计员 * [Update] 修改小问题 * [Update] 修改普通用户角色可以是组织审计员 * [Update] 更改组织审计员切换组织问题 * [Update] 修改小问题 * [Update] 普通用户是组织审计员的页面左侧栏显示 * [Update] 修改删除权限问题和组织显示问题 * [Update] 优化逻辑 * [Update] 优化类名 * [Update] 修改小问题 * [Update] 优化逻辑 * [Update] 优化切换到某一个组织逻辑 * [Update] 修改用户详情页的 删除/更新 按钮是否可点击 * [Update] 优化代码 * [Update] 组织管理列表增加审计员显示 * [Update] 优化代码细节 * [Update] 优化权限类逻辑 * [Update] 优化导航菜单控制 * [Update] 优化页面控制逻辑 * [Update] 修改变量名错误问题 * [Update] 修改页面上的小问题 * [Update] 审计员或组织审计员能够更新个人部分信息 * [Update] 用户名为admin的用户不能被删除 * [Update] 不同用户在不同组织下扮演不同角色的权限不同,为了避免切换组织时出现403,重定向到index * [Update] 一个用户在同一个组织既是管理员又是审计员,隐藏个人信息模块,仅当是审计员,在当前组织显示个人信息模块 * [Update] 修改方法命名 * [Update] 优化代码细节 * [Update] 修改命令执行列表方法 * [Update] 优化用户之间操作的权限逻辑;添加 UserModel 的 property 属性;修改 Organization 的 related name 名称; * [Update] 修改OrgProcessor Anonymous问题 * [Update] 修改用户序列类校验组织和转换raw密码的逻辑
This commit is contained in:
@@ -4,8 +4,6 @@ import time
|
||||
|
||||
from rest_framework import permissions
|
||||
from django.contrib.auth.mixins import UserPassesTestMixin
|
||||
from django.shortcuts import redirect
|
||||
from django.http.response import HttpResponseForbidden
|
||||
from django.conf import settings
|
||||
|
||||
from orgs.utils import current_org
|
||||
@@ -27,12 +25,6 @@ class IsAppUser(IsValidUser):
|
||||
and request.user.is_app
|
||||
|
||||
|
||||
class IsAuditor(IsValidUser):
|
||||
def has_permission(self, request, view):
|
||||
return super(IsAuditor, self).has_permission(request, view) \
|
||||
and request.user.is_auditor
|
||||
|
||||
|
||||
class IsSuperUser(IsValidUser):
|
||||
def has_permission(self, request, view):
|
||||
return super(IsSuperUser, self).has_permission(request, view) \
|
||||
@@ -45,6 +37,20 @@ class IsSuperUserOrAppUser(IsSuperUser):
|
||||
or request.user.is_app
|
||||
|
||||
|
||||
class IsSuperAuditor(IsValidUser):
|
||||
def has_permission(self, request, view):
|
||||
return super(IsSuperAuditor, self).has_permission(request, view) \
|
||||
and request.user.is_super_auditor
|
||||
|
||||
|
||||
class IsOrgAuditor(IsValidUser):
|
||||
def has_permission(self, request, view):
|
||||
if not current_org:
|
||||
return False
|
||||
return super(IsOrgAuditor, self).has_permission(request, view) \
|
||||
and current_org.can_audit_by(request.user)
|
||||
|
||||
|
||||
class IsOrgAdmin(IsValidUser):
|
||||
"""Allows access only to superuser"""
|
||||
|
||||
@@ -81,43 +87,6 @@ class IsCurrentUserOrReadOnly(permissions.BasePermission):
|
||||
return obj == request.user
|
||||
|
||||
|
||||
class LoginRequiredMixin(UserPassesTestMixin):
|
||||
def test_func(self):
|
||||
if self.request.user.is_authenticated:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
|
||||
class AdminUserRequiredMixin(UserPassesTestMixin):
|
||||
def test_func(self):
|
||||
if not self.request.user.is_authenticated:
|
||||
return False
|
||||
elif not current_org.can_admin_by(self.request.user):
|
||||
self.raise_exception = True
|
||||
return False
|
||||
return True
|
||||
|
||||
def dispatch(self, request, *args, **kwargs):
|
||||
if not request.user.is_authenticated:
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
if not current_org:
|
||||
return redirect('orgs:switch-a-org')
|
||||
|
||||
if not current_org.can_admin_by(request.user):
|
||||
if request.user.is_org_admin:
|
||||
return redirect('orgs:switch-a-org')
|
||||
return HttpResponseForbidden()
|
||||
return super().dispatch(request, *args, **kwargs)
|
||||
|
||||
|
||||
class SuperUserRequiredMixin(UserPassesTestMixin):
|
||||
def test_func(self):
|
||||
if self.request.user.is_authenticated and self.request.user.is_superuser:
|
||||
return True
|
||||
|
||||
|
||||
class WithBootstrapToken(permissions.BasePermission):
|
||||
def has_permission(self, request, view):
|
||||
authorization = request.META.get('HTTP_AUTHORIZATION', '')
|
||||
@@ -159,14 +128,61 @@ class NeedMFAVerify(permissions.BasePermission):
|
||||
return False
|
||||
|
||||
|
||||
class CanUpdateDeleteSuperUser(permissions.BasePermission):
|
||||
def has_object_permission(self, request, view, obj):
|
||||
if request.method in ['GET', 'OPTIONS']:
|
||||
return True
|
||||
elif request.method == 'DELETE' and str(request.user.id) == str(obj.id):
|
||||
class CanUpdateDeleteUser(permissions.BasePermission):
|
||||
|
||||
@staticmethod
|
||||
def has_delete_object_permission(request, view, obj):
|
||||
if not request.user.can_admin_current_org:
|
||||
return False
|
||||
elif request.user.is_superuser:
|
||||
# 超级管理员 / 组织管理员
|
||||
if str(request.user.id) == str(obj.id):
|
||||
return False
|
||||
# 超级管理员
|
||||
if request.user.is_superuser:
|
||||
if obj.is_superuser and obj.username in ['admin']:
|
||||
return False
|
||||
return True
|
||||
if hasattr(obj, 'is_superuser') and obj.is_superuser:
|
||||
# 组织管理员
|
||||
if obj.is_superuser:
|
||||
return False
|
||||
if obj.is_super_auditor:
|
||||
return False
|
||||
if obj.is_org_admin:
|
||||
return False
|
||||
if len(obj.audit_orgs) > 1:
|
||||
return False
|
||||
if len(obj.user_orgs) > 1:
|
||||
return False
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def has_update_object_permission(request, view, obj):
|
||||
if not request.user.can_admin_current_org:
|
||||
return False
|
||||
# 超级管理员 / 组织管理员
|
||||
if str(request.user.id) == str(obj.id):
|
||||
return True
|
||||
# 超级管理员
|
||||
if request.user.is_superuser:
|
||||
return True
|
||||
# 组织管理员
|
||||
if obj.is_superuser:
|
||||
return False
|
||||
if obj.is_super_auditor:
|
||||
return False
|
||||
if obj.is_org_admin:
|
||||
return False
|
||||
if len(obj.audit_orgs) > 1:
|
||||
return False
|
||||
if len(obj.user_orgs) > 1:
|
||||
return False
|
||||
return True
|
||||
|
||||
def has_object_permission(self, request, view, obj):
|
||||
if not request.user.can_admin_current_org:
|
||||
return False
|
||||
if request.method in ['DELETE']:
|
||||
return self.has_delete_object_permission(request, view, obj)
|
||||
if request.method in ['PUT', 'PATCH']:
|
||||
return self.has_update_object_permission(request, view, obj)
|
||||
return True
|
||||
|
Reference in New Issue
Block a user