mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-25 05:22:36 +00:00
* [Update] 初始化操作日志 * [Feature] 完成操作日志记录 * [Update] 修改mfa失败提示 * [Update] 修改增加created by内容 * [Update] 增加改密日志 * [Update] 登录日志迁移到日志审计中 * [Update] change block user logic, if login success, clean block limit * [Update] 更新中/英文翻译(ALL) (#1662) * Revert "授权页面分页问题" * 增加命令导出 (#1566) * [Update] gunicorn不使用eventlet * [Update] 添加eventlet * 替换淘宝IP查询接口 * [Feature] 添加命令记录下载功能 (#1559) * [Feature] 添加命令记录下载功能 * [Update] 文案修改,导出记录、提交,取消全部命令导出 * [Update] 命令导出,修复时间问题 * [Update] paramiko => 2.4.1 * [Update] 修改settings * [Update] 修改权限判断 * Dev (#1646) * [Update] 添加org * [Update] 修改url * [Update] 完成基本框架 * [Update] 修改一些逻辑 * [Update] 修改用户view * [Update] 修改资产 * [Update] 修改asset api * [Update] 修改协议小问题 * [Update] stash it * [Update] 修改约束 * [Update] 修改外键为org_id * [Update] 删掉Premiddleware * [Update] 修改Node * [Update] 修改get_current_org 为 proxy对象 current_org * [Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571) * [Update] 修改permission (#1574) * Tmp org (#1579) * [Update] 添加org api, 升级到django 2.0 * [Update] fix some bug * [Update] 修改一些bug * [Update] 添加授权规则org (#1580) * [Update] 修复创建授权规则,显示org_name不是有效UUID的bug * [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug; * Tmp org (#1583) * [Update] 修改一些内容 * [Update] 修改datatable 支持process * [Bugfix] 修复asset queryset 没有valid方法的bug * [Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584) * [Update] 修复创建授权规则,显示org_name不是有效UUID的bug * [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug; * [Update] 在线/历史/命令model添加org * [Bugfix] 修复命令记录,保存org不成功bug * [Update] Org功能修改 * [Bugfix] 修复merge带来的问题 * [Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug (#1594) * [Bugfix] 修复资产授权添加用户,显示其他org的用户bug * [Update] org admin 显示资产详情右侧选项卡 * Tmp org (#1596) * [Update] 修改index view * [Update] 修改nav * [Update] 修改profile * [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug * [Update] 修改get_all_assets * [Bugfix] 修复节点前面有个空目录 * [Bugfix] 修复merge引起的bug * [Update] Add init * [Update] Node get_all_assets 过滤游离资产,条件nodes_key=None -> nodes=None * [Update] 恢复原来的api地址 * [Update] 修改api * [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug * [Bugfix] Fix perm name unique * [Bugfix] 修复校验失败api * [Update] Merge with org * [Merge] 修改一下bug * [Update] 暂时修改一些url * [Update] 修改url 为django 2.0 path * [Update] 优化datatable 和显示组织优化 * [Update] 升级url * [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… (#1613) * [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode() method的bug * [Bugfix] (task任务系统)修复资产连接性测试、硬件刷新和系统用户连接性测试失败等bug * [Bugfix] 修复一些bug * [Bugfix] 修复一些bug * [Update] 更新org下普通用户的资产详情 (#1619) * [Update] 更新org下普通用户查看资产详情,只显示数据 * [Update] 优化org下普通用户查看资产详情前端代码 * [Update] 创建/更新用户的role选项;密码强度提示信息中英文; (#1623) * [Update] 修改 超级管理员/组织管理员 在 创建/更新 用户时role的选项 问题 * [Update] 用户密码强度提示信息支持中英文 * [Update] 修改token返回 * [Update] Asset返回org name * [Update] 修改支持xpack * [Update] 修改url * [Bugfix] 修复不登录就能查看资产的bug * [Update] 用户修改 * [Bugfix] ... * [Bugfix] 修复跳转错误的问题 * [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644) * [Update] 更新xpack下orgs的翻译信息 * [Update] 更新model Label,继承OrgModelMixin; * [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; * [Bugfix] 修复小bug * [Update] 优化一些api * [Update] 优化用户资产页面 * [Update] 更新 xpack/orgs 删除功能:限制在当前org下删除当前org (#1645) * [Update] 修改版本号 * [Update] 添加功能: 语言切换(中/英);修改 header_bar <商业支持、文档>显示方式 * [Update] 中/英切换文案修改;修改django_language key 从 settings 中获取 * [Update] 修改Dashboard页面文案,支持英文 * [Update] 更新中/英文翻译(ALL) * [Update] 解决翻译文件冲突 * [Update] 系统用户支持单独隋松 * [Update] 重置用户MFA * [Update] 设置session空闲时间 * [Update] 加密setting配置 * [Update] 修改单独推送和测试资产可连接性 * [Update] 添加功能:用户个人详情页添加 更改MFA操作 (#1748) * [Update] 添加功能:用户个人详情页添加 更改MFA操作 * [Update] 删除print * [Bugfix] 添加部分views的权限控制;从组织移除用户,同时从授权规则和用户组中移除此用户。 (#1746) * [Bugfix] 修复上传command log 为空 * [Update] 修复执行任务的bug * [Bugfix] 修复将用户从组内移除,其依然具有之前的组权限的bug, perms and user_groups * [Bugfix] 修复组管理员可以访问部分url-views的bug(如: /settings/)添加views权限控制 * [Update] 修改日志滚动 * [Bugfix] 修复组织权限控制的bug (#1763) * [Bugfix] 修复将用户从组内移除,其依然具有之前的组权限的bug, perms and user_groups * [Bugfix] 修复组管理员可以访问部分url-views的bug(如: /settings/)添加views权限控制
239 lines
8.2 KiB
Python
239 lines
8.2 KiB
Python
# ~*~ coding: utf-8 ~*~
|
|
# Copyright (C) 2014-2018 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved.
|
|
#
|
|
# Licensed under the GNU General Public License v2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.gnu.org/licenses/gpl-2.0.html
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from rest_framework import generics, mixins, viewsets
|
|
from rest_framework.serializers import ValidationError
|
|
from rest_framework.views import APIView
|
|
from rest_framework.response import Response
|
|
from rest_framework_bulk import BulkModelViewSet
|
|
from django.utils.translation import ugettext_lazy as _
|
|
from django.shortcuts import get_object_or_404
|
|
from django.db.models import Count
|
|
|
|
from common.utils import get_logger, get_object_or_none
|
|
from ..hands import IsOrgAdmin
|
|
from ..models import Node
|
|
from ..tasks import update_assets_hardware_info_util, test_asset_connectability_util
|
|
from .. import serializers
|
|
|
|
|
|
logger = get_logger(__file__)
|
|
__all__ = [
|
|
'NodeViewSet', 'NodeChildrenApi', 'NodeAssetsApi',
|
|
'NodeAddAssetsApi', 'NodeRemoveAssetsApi', 'NodeReplaceAssetsApi',
|
|
'NodeAddChildrenApi', 'RefreshNodeHardwareInfoApi',
|
|
'TestNodeConnectiveApi'
|
|
]
|
|
|
|
|
|
class NodeViewSet(viewsets.ModelViewSet):
|
|
queryset = Node.objects.all()
|
|
permission_classes = (IsOrgAdmin,)
|
|
serializer_class = serializers.NodeSerializer
|
|
|
|
def perform_create(self, serializer):
|
|
child_key = Node.root().get_next_child_key()
|
|
serializer.validated_data["key"] = child_key
|
|
serializer.save()
|
|
|
|
def update(self, request, *args, **kwargs):
|
|
node = self.get_object()
|
|
if node.is_root():
|
|
node_value = node.value
|
|
post_value = request.data.get('value')
|
|
if node_value != post_value:
|
|
return Response(
|
|
{"msg": _("You can't update the root node name")},
|
|
status=400
|
|
)
|
|
return super().update(request, *args, **kwargs)
|
|
|
|
|
|
class NodeChildrenApi(mixins.ListModelMixin, generics.CreateAPIView):
|
|
queryset = Node.objects.all()
|
|
permission_classes = (IsOrgAdmin,)
|
|
serializer_class = serializers.NodeSerializer
|
|
instance = None
|
|
|
|
def counter(self):
|
|
values = [
|
|
child.value[child.value.rfind(' '):]
|
|
for child in self.get_object().get_children()
|
|
if child.value.startswith("新节点 ")
|
|
]
|
|
values = [int(value) for value in values if value.strip().isdigit()]
|
|
count = max(values)+1 if values else 1
|
|
return count
|
|
|
|
def post(self, request, *args, **kwargs):
|
|
if not request.data.get("value"):
|
|
request.data["value"] = _("New node {}").format(self.counter())
|
|
return super().post(request, *args, **kwargs)
|
|
|
|
def create(self, request, *args, **kwargs):
|
|
instance = self.get_object()
|
|
value = request.data.get("value")
|
|
values = [child.value for child in instance.get_children()]
|
|
if value in values:
|
|
raise ValidationError(
|
|
'The same level node name cannot be the same'
|
|
)
|
|
node = instance.create_child(value=value)
|
|
return Response(
|
|
{"id": node.id, "key": node.key, "value": node.value},
|
|
status=201,
|
|
)
|
|
|
|
def get_object(self):
|
|
pk = self.kwargs.get('pk') or self.request.query_params.get('id')
|
|
if not pk:
|
|
node = None
|
|
else:
|
|
node = get_object_or_404(Node, pk=pk)
|
|
return node
|
|
|
|
def get_queryset(self):
|
|
queryset = []
|
|
query_all = self.request.query_params.get("all")
|
|
query_assets = self.request.query_params.get('assets')
|
|
node = self.get_object()
|
|
|
|
if node is None:
|
|
node = Node.root()
|
|
node.assets__count = node.get_all_assets().count()
|
|
queryset.append(node)
|
|
|
|
if query_all:
|
|
children = node.get_all_children()
|
|
else:
|
|
children = node.get_children()
|
|
queryset.extend(list(children))
|
|
|
|
if query_assets:
|
|
assets = node.get_assets()
|
|
for asset in assets:
|
|
node_fake = Node()
|
|
node_fake.assets__count = 0
|
|
node_fake.id = asset.id
|
|
node_fake.is_node = False
|
|
node_fake.key = node.key + ':0'
|
|
node_fake.value = asset.hostname
|
|
queryset.append(node_fake)
|
|
queryset = sorted(queryset, key=lambda x: x.is_node, reverse=True)
|
|
return queryset
|
|
|
|
def get(self, request, *args, **kwargs):
|
|
return super().list(request, *args, **kwargs)
|
|
|
|
|
|
class NodeAssetsApi(generics.ListAPIView):
|
|
permission_classes = (IsOrgAdmin,)
|
|
serializer_class = serializers.AssetSerializer
|
|
|
|
def get_queryset(self):
|
|
node_id = self.kwargs.get('pk')
|
|
query_all = self.request.query_params.get('all')
|
|
instance = get_object_or_404(Node, pk=node_id)
|
|
if query_all:
|
|
return instance.get_all_assets()
|
|
else:
|
|
return instance.get_assets()
|
|
|
|
|
|
class NodeAddChildrenApi(generics.UpdateAPIView):
|
|
queryset = Node.objects.all()
|
|
permission_classes = (IsOrgAdmin,)
|
|
serializer_class = serializers.NodeAddChildrenSerializer
|
|
instance = None
|
|
|
|
def put(self, request, *args, **kwargs):
|
|
instance = self.get_object()
|
|
nodes_id = request.data.get("nodes")
|
|
children = [get_object_or_none(Node, id=pk) for pk in nodes_id]
|
|
for node in children:
|
|
if not node:
|
|
continue
|
|
node.parent = instance
|
|
return Response("OK")
|
|
|
|
|
|
class NodeAddAssetsApi(generics.UpdateAPIView):
|
|
serializer_class = serializers.NodeAssetsSerializer
|
|
queryset = Node.objects.all()
|
|
permission_classes = (IsOrgAdmin,)
|
|
instance = None
|
|
|
|
def perform_update(self, serializer):
|
|
assets = serializer.validated_data.get('assets')
|
|
instance = self.get_object()
|
|
instance.assets.add(*tuple(assets))
|
|
|
|
|
|
class NodeRemoveAssetsApi(generics.UpdateAPIView):
|
|
serializer_class = serializers.NodeAssetsSerializer
|
|
queryset = Node.objects.all()
|
|
permission_classes = (IsOrgAdmin,)
|
|
instance = None
|
|
|
|
def perform_update(self, serializer):
|
|
assets = serializer.validated_data.get('assets')
|
|
instance = self.get_object()
|
|
if instance != Node.root():
|
|
instance.assets.remove(*tuple(assets))
|
|
else:
|
|
assets = [asset for asset in assets if asset.nodes.count() > 1]
|
|
instance.assets.remove(*tuple(assets))
|
|
|
|
|
|
class NodeReplaceAssetsApi(generics.UpdateAPIView):
|
|
serializer_class = serializers.NodeAssetsSerializer
|
|
queryset = Node.objects.all()
|
|
permission_classes = (IsOrgAdmin,)
|
|
instance = None
|
|
|
|
def perform_update(self, serializer):
|
|
assets = serializer.validated_data.get('assets')
|
|
instance = self.get_object()
|
|
for asset in assets:
|
|
asset.nodes.set([instance])
|
|
|
|
|
|
class RefreshNodeHardwareInfoApi(APIView):
|
|
permission_classes = (IsOrgAdmin,)
|
|
model = Node
|
|
|
|
def get(self, request, *args, **kwargs):
|
|
node_id = kwargs.get('pk')
|
|
node = get_object_or_404(self.model, id=node_id)
|
|
assets = node.assets.all()
|
|
# task_name = _("更新节点资产硬件信息: {}".format(node.name))
|
|
task_name = _("Update node asset hardware information: {}").format(node.name)
|
|
task = update_assets_hardware_info_util.delay(assets, task_name=task_name)
|
|
return Response({"task": task.id})
|
|
|
|
|
|
class TestNodeConnectiveApi(APIView):
|
|
permission_classes = (IsOrgAdmin,)
|
|
model = Node
|
|
|
|
def get(self, request, *args, **kwargs):
|
|
node_id = kwargs.get('pk')
|
|
node = get_object_or_404(self.model, id=node_id)
|
|
assets = node.assets.all()
|
|
# task_name = _("测试节点下资产是否可连接: {}".format(node.name))
|
|
task_name = _("Test if the assets under the node are connectable: {}".format(node.name))
|
|
task = test_asset_connectability_util.delay(assets, task_name=task_name)
|
|
return Response({"task": task.id})
|