mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-25 21:42:37 +00:00
* perf:automation * pref: 修改账号推送 * perf: 修改 assets * perf: 修改 accounts * feat: 优化代码 * fix: 修复 ObjectRelatedField 获取 value attr 时先判断是否有 attr 属性 * perf: 增加翻译 * feat: 增加部分翻译 * feat: 去除无用列 * perf: ticket remove app * fix: 修复创建账号备份任务失败的问题 * perf: 添加 accounts app * perf: ticket type serializer (#9252) Co-authored-by: feng <1304903146@qq.com> * perf: ticket * perf: 修改 accounts api * perf: 优化 AssetPermissionSerializer fields 顺序 * perf: 修改 accounts * feat: 限制常用用户名api返回长度 * feat: 限制常用用户名api返回长度 * perf: 修改 LoginAssetACL 序列类,增加 users_username_group, accounts_username_group... 字段 * perf: 修改 CommandFilterACLSerializer 增加 command_groups_amount 字段 * perf: 修改rbac API啥的 (#9254) * perf: migrate * perf: 修改 AssetPermedSerializer domain 字段类型 * perf: 放开push account 权限位 * perf: 修改 accounts * perf: 修改 LoginACLSerializer 字段类型 * pref: 修改数据库 migrations * perf: filter asset systemuser * perf: 修改 SessionSerializer 字段类型 * pref: 修改 applet host * perf: 修改 SessionCommandSerializer 字段类型 * perf: 修改 accounts import * perf: 修改 celery datetime * perf: 修改 asset serializer * pref: 修改 labeled field * feat: 修改翻译 * perf: 修改 JobSerializer 字段类型 * feat: 支持使用 ws 发送终断任务 * perf: add AccessTokenAuthentication * perf: 修改 BaseStorageSerializer 字段类型 * perf: 修改 AppletHostSerializer 字段类型 * perf: signal event * perf: asset types automations (#9259) Co-authored-by: feng <1304903146@qq.com> * perf: 修改下载 rdp 文件时返回的 address 地址信息为空的问题 * perf: 修改 AssetSerializer.accounts.secret 为 write_only; 修改 DomainWithGatewaySerializer.gateways 返回 account 信息及 secret 字段; * perf: automation 干库 (#9260) Co-authored-by: feng <1304903146@qq.com> * perf: account push api * feat: 修改迁移文件 * feat: 删除无用代码 * feat: 优化部分资源无操作日志 * perf: 修改 account * perf: perm tree * perf: asset serializers retrieve * perf: 格式化代码 * perf: AutomationExecution (#9268) Co-authored-by: feng <1304903146@qq.com> * perf: AssetDetailSerializer 和 Asset Model 添加 specific_info 字段; * perf: 修改账号推送 * feat: handle ws heartbeat status * perf: k8s tree (#9269) Co-authored-by: feng <1304903146@qq.com> * perf: 修改账号推送 * perf: 修改 asset detail serializer * fix: 修复 windows 不能运行 powershell 命令的问题 * feat: 支持按照资源时间线查看操作活动 * feat: 翻译 * feat: 优化操作日志 * perf: asset clone * fix: 错误的修改改回去 * perf: create asset account * feat: 增加task 刷新续传功能 * fix: applet host deloypment filter host * perf: 修改了 common 结构,和 push accounts * perf: 整理 common 结构 * perf: 修改 const import * perf: 修改 allow bulk destroy * fix: applet host search fileds * perf: applet bulk delete * fix: applet list 404 * perf: 修改 common view * feat: 增加一些翻译, 修复 playbook 上传的错误 * fix: 修改错别字 * perf: 修改 applets status * perf: 修改网关 api * perf: automateion (#9281) Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> * perf: 失效 connect methods 当 applet 删除 或者 host 删除 * perf: 网关账号的密码类型改成 LabelField * perf: chrome applet script * perf: verify code ttl (#9282) Co-authored-by: feng <1304903146@qq.com> * perf: database ping * perf: ws * perf: 修改网关创建 * perf: account task org (#9285) Co-authored-by: feng <1304903146@qq.com> * perf: asset test api * perf: port 添加 account * pref: 修改 db mapper permission * fix: db port mapper list api * perf: account change secret (#9286) Co-authored-by: feng <1304903146@qq.com> * perf: 修改 setup_eager_loading * perf: SecretStrategy * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * feat: 修改 ConnectionToken Create API 支持校验 ACL 逻辑 * pref: web database 信号转发 * perf: account push automation * perf: push filter account * perf: 修改 publish 版本 * perf: 修改网关 * fix: 修改资产 Specific 信息中 JSONField 字段返回 json.loads 对象 * feat: 远程应用内置Navicat Premium 16 * feat: 更新下载链接 * feat: 整理代码格式 * perf: 修改 terminal point * perf: update chrome applet script * fix: 资产 specific 获取 JSONField 时, 判断值的类型不为 list, dict * perf: domain (#9292) Co-authored-by: feng <1304903146@qq.com> * perf: 优化 endpoint 监听端口,仅 oracle 动态 * perf: 修改翻译 * perf: 修改文案 * perf: 修改缺失的翻译 * perf: 修改 endpoint help text * feat: 还原格式 * feat: 去掉基类 * feat: 增加特权账号字段 * perf: decode content * fix: check pid * perf: 修改 smart endpoint * perf: 修改 endpoint mysql default port * feat: 优化 * perf: 修改 endpoint mysql default port * perf: gateway test (#9295) Co-authored-by: feng <1304903146@qq.com> * perf: migrate * perf: 修改 endpoint mysql default port * fix: 修复获取任务执行结果死循环 * feat: 作业审计日志增加字段 * fix: add on_transaction_commit task post save * perf: gateway (#9297) Co-authored-by: feng <1304903146@qq.com> * feat: 过滤 jumpserver 自动产生的用户 * fix: 修复ops节点选择的问题 * fix: 修改 统一 connection-token 和 command 的 review API 返回数据 from_ticket_info * perf: change secret (#9298) Co-authored-by: feng <1304903146@qq.com> * perf: 修改 db port manager * perf: 修改 db port manager * perf: add celery log mark * perf: remove debug log data * fix: navicat use manual type * fix: remove navicate download url * perf: push_account_enabled (#9301) Co-authored-by: feng <1304903146@qq.com> * fix: 修改navicat启动程序MD5值 * perf: push account (#9303) Co-authored-by: feng <1304903146@qq.com> * feat: Redis/MongoDB 支持SSL * fix: 修改授权规则过滤字段 node_name,node_id; 修复获取授权节点下的资产为空的问题; * perf: push account button (#9305) Co-authored-by: feng <1304903146@qq.com> * perf: account push * fix: 修复获取 /user//assets/tree/ 返回用户授权的所有资产 * perf: asset ping (#9307) Co-authored-by: feng <1304903146@qq.com> * perf: asset enabled_info * perf: 优化activity记录都保存至operatelog中 * feat: 远程应用navicat支持试用版连接 * perf: 优化迁移文件 * perf: 修改资产列表 API category type 字段 choices 根据 category 进行返回 * fix * perf: 修改账号列表 API 解决根据 node_id asset_id 搜索账号列表无效的问题 * fix: navicat dba账号登录 * perf: 优化navicat连接 * perf: 修改账号列表 Model Manager 继承自 OrgManager,解决组织过滤问题 * perf: 修改账号列表 Filter 支持根据 platform,category,type 字段搜索 * perf: change secret email (#9312) Co-authored-by: feng <1304903146@qq.com> * feat: 保证认证信息一定清理 * perf: add mariadb * perf: 修改资产类型树数量统计资产或账号 * perf: applet chrome quit * perf: 优化关闭欢迎页面 * fix * perf: executed amount * perf: 修改 built-in applet installation * perf: 修改资产列表增加标签搜索 * perf: 修改资产列表增加标签搜索 * perf: account task automation (#9319) Co-authored-by: feng <1304903146@qq.com> * perf: account trigger * perf: 修改系统设置文案:批量命令执行 -> 作业中心 * perf: 优化migrate (#9320) Co-authored-by: feng <1304903146@qq.com> * perf: 修改资产节点树 API,支持搜索资产、节点 * perf: audit dashboard (#9321) Co-authored-by: feng <1304903146@qq.com> * fix: 修改 has_perm 权限判断兼容 list 和 str 类型 * perf: 修改一些换行 * perf: 修改 ansible config * fix: oracle依赖文件地址错误 (#9324) * perf: ansible mudules * perf: 修改 runner host cwd Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Aaron3S <chenyang@fit2cloud.com> Co-authored-by: Bai <baijiangjie@gmail.com> Co-authored-by: feng <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com> Co-authored-by: Eric <xplzv@126.com> Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com> Co-authored-by: jiangweidong <80373698+Hi-JWD@users.noreply.github.com>
217 lines
7.6 KiB
Python
217 lines
7.6 KiB
Python
# ~*~ coding: utf-8 ~*~
|
|
from functools import partial
|
|
from collections import namedtuple, defaultdict
|
|
|
|
from django.db.models.signals import m2m_changed
|
|
from django.utils.translation import ugettext_lazy as _
|
|
from rest_framework import status
|
|
from rest_framework.response import Response
|
|
from rest_framework.decorators import action
|
|
from rest_framework.generics import get_object_or_404
|
|
from rest_framework.serializers import ValidationError
|
|
|
|
from assets.models import Asset
|
|
from common.const.http import POST
|
|
from common.utils import get_logger
|
|
from common.api import SuggestionMixin
|
|
from common.exceptions import SomeoneIsDoingThis
|
|
from common.const.signals import PRE_REMOVE, POST_REMOVE
|
|
from orgs.mixins import generics
|
|
from orgs.utils import current_org
|
|
from orgs.mixins.api import OrgBulkModelViewSet
|
|
from .. import serializers
|
|
from ..models import Node
|
|
from ..tasks import (
|
|
update_node_assets_hardware_info_manual,
|
|
test_node_assets_connectivity_manual,
|
|
check_node_assets_amount_task
|
|
)
|
|
|
|
logger = get_logger(__file__)
|
|
__all__ = [
|
|
'NodeViewSet', 'NodeAssetsApi', 'NodeAddAssetsApi',
|
|
'NodeRemoveAssetsApi', 'MoveAssetsToNodeApi',
|
|
'NodeAddChildrenApi', 'NodeTaskCreateApi',
|
|
]
|
|
|
|
|
|
class NodeViewSet(SuggestionMixin, OrgBulkModelViewSet):
|
|
model = Node
|
|
filterset_fields = ('value', 'key', 'id')
|
|
search_fields = ('full_value',)
|
|
serializer_class = serializers.NodeSerializer
|
|
rbac_perms = {
|
|
'match': 'assets.match_node',
|
|
'check_assets_amount_task': 'assets.change_node'
|
|
}
|
|
|
|
@action(methods=[POST], detail=False, url_path='check_assets_amount_task')
|
|
def check_assets_amount_task(self, request):
|
|
task = check_node_assets_amount_task.delay(current_org.id)
|
|
return Response(data={'task': task.id})
|
|
|
|
def perform_update(self, serializer):
|
|
node = self.get_object()
|
|
if node.is_org_root() and node.value != serializer.validated_data['value']:
|
|
msg = _("You can't update the root node name")
|
|
raise ValidationError({"error": msg})
|
|
return super().perform_update(serializer)
|
|
|
|
def destroy(self, request, *args, **kwargs):
|
|
node = self.get_object()
|
|
if node.is_org_root():
|
|
error = _("You can't delete the root node ({})".format(node.value))
|
|
return Response(data={'error': error}, status=status.HTTP_403_FORBIDDEN)
|
|
if node.has_offspring_assets():
|
|
error = _("Deletion failed and the node contains assets")
|
|
return Response(data={'error': error}, status=status.HTTP_403_FORBIDDEN)
|
|
return super().destroy(request, *args, **kwargs)
|
|
|
|
|
|
class NodeAssetsApi(generics.ListAPIView):
|
|
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):
|
|
model = Node
|
|
serializer_class = serializers.NodeAddChildrenSerializer
|
|
instance = None
|
|
|
|
def update(self, request, *args, **kwargs):
|
|
""" 同时支持 put 和 patch 方法"""
|
|
instance = self.get_object()
|
|
node_ids = request.data.get("nodes")
|
|
children = Node.objects.filter(id__in=node_ids)
|
|
for node in children:
|
|
node.parent = instance
|
|
return Response("OK")
|
|
|
|
|
|
class NodeAddAssetsApi(generics.UpdateAPIView):
|
|
model = Node
|
|
serializer_class = serializers.NodeAssetsSerializer
|
|
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):
|
|
model = Node
|
|
serializer_class = serializers.NodeAssetsSerializer
|
|
instance = None
|
|
|
|
def perform_update(self, serializer):
|
|
assets = serializer.validated_data.get('assets')
|
|
node = self.get_object()
|
|
node.assets.remove(*assets)
|
|
|
|
# 把孤儿资产添加到 root 节点
|
|
orphan_assets = Asset.objects.filter(
|
|
id__in=[a.id for a in assets],
|
|
nodes__isnull=True
|
|
).distinct()
|
|
Node.org_root().assets.add(*orphan_assets)
|
|
|
|
|
|
class MoveAssetsToNodeApi(generics.UpdateAPIView):
|
|
model = Node
|
|
serializer_class = serializers.NodeAssetsSerializer
|
|
instance = None
|
|
|
|
def perform_update(self, serializer):
|
|
assets = serializer.validated_data.get('assets')
|
|
node = self.get_object()
|
|
self.remove_old_nodes(assets)
|
|
node.assets.add(*assets)
|
|
|
|
def remove_old_nodes(self, assets):
|
|
m2m_model = Asset.nodes.through
|
|
|
|
# 查询资产与节点关系表,查出要移动资产与节点的所有关系
|
|
relates = m2m_model.objects.filter(asset__in=assets).values_list('asset_id', 'node_id')
|
|
if relates:
|
|
# 对关系以资产进行分组,用来发 `reverse=False` 信号
|
|
asset_nodes_mapper = defaultdict(set)
|
|
for asset_id, node_id in relates:
|
|
asset_nodes_mapper[asset_id].add(node_id)
|
|
|
|
# 组建一个资产 id -> Asset 的 mapper
|
|
asset_mapper = {asset.id: asset for asset in assets}
|
|
|
|
# 创建删除关系信号发送函数
|
|
senders = []
|
|
for asset_id, node_id_set in asset_nodes_mapper.items():
|
|
senders.append(partial(m2m_changed.send, sender=m2m_model, instance=asset_mapper[asset_id],
|
|
reverse=False, model=Node, pk_set=node_id_set))
|
|
# 发送 pre 信号
|
|
[sender(action=PRE_REMOVE) for sender in senders]
|
|
num = len(relates)
|
|
asset_ids, node_ids = zip(*relates)
|
|
# 删除之前的关系
|
|
rows, _i = m2m_model.objects.filter(asset_id__in=asset_ids, node_id__in=node_ids).delete()
|
|
if rows != num:
|
|
raise SomeoneIsDoingThis
|
|
# 发送 post 信号
|
|
[sender(action=POST_REMOVE) for sender in senders]
|
|
|
|
|
|
class NodeTaskCreateApi(generics.CreateAPIView):
|
|
perm_model = Asset
|
|
model = Node
|
|
serializer_class = serializers.NodeTaskSerializer
|
|
|
|
def check_permissions(self, request):
|
|
action = request.data.get('action')
|
|
action_perm_require = {
|
|
'refresh': 'assets.refresh_assethardwareinfo',
|
|
'test': 'assets.test_assetconnectivity'
|
|
}
|
|
perm_required = action_perm_require.get(action)
|
|
has = self.request.user.has_perm(perm_required)
|
|
|
|
if not has:
|
|
self.permission_denied(request)
|
|
|
|
def get_object(self):
|
|
node_id = self.kwargs.get('pk')
|
|
node = get_object_or_404(self.model, id=node_id)
|
|
return node
|
|
|
|
@staticmethod
|
|
def set_serializer_data(s, task):
|
|
data = getattr(s, '_data', {})
|
|
data["task"] = task.id
|
|
setattr(s, '_data', data)
|
|
|
|
@staticmethod
|
|
def refresh_nodes_cache():
|
|
Task = namedtuple('Task', ['id'])
|
|
task = Task(id="0")
|
|
return task
|
|
|
|
def perform_create(self, serializer):
|
|
action = serializer.validated_data["action"]
|
|
node = self.get_object()
|
|
if action == "refresh_cache" and node is None:
|
|
task = self.refresh_nodes_cache()
|
|
self.set_serializer_data(serializer, task)
|
|
return
|
|
|
|
if action == "refresh":
|
|
task = update_node_assets_hardware_info_manual.delay(node.id)
|
|
else:
|
|
task = test_node_assets_connectivity_manual.delay(node.id)
|
|
self.set_serializer_data(serializer, task)
|