mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-06-26 23:07:24 +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>
205 lines
7.3 KiB
Python
205 lines
7.3 KiB
Python
# -*- coding: utf-8 -*-
|
||
#
|
||
from django.conf import settings
|
||
from django.utils import timezone
|
||
from rest_framework import generics
|
||
from rest_framework.fields import DateTimeField
|
||
from rest_framework.response import Response
|
||
|
||
from terminal.models import CommandStorage, Session, Command
|
||
from terminal.filters import CommandFilter
|
||
from orgs.utils import current_org
|
||
from common.api import JMSBulkModelViewSet
|
||
from common.utils import get_logger
|
||
from terminal.backends.command.serializers import InsecureCommandAlertSerializer
|
||
from terminal.exceptions import StorageInvalid
|
||
from terminal.backends import (
|
||
get_command_storage, get_multi_command_storage,
|
||
SessionCommandSerializer,
|
||
)
|
||
from terminal.notifications import CommandAlertMessage
|
||
|
||
logger = get_logger(__name__)
|
||
__all__ = ['CommandViewSet', 'InsecureCommandAlertAPI']
|
||
|
||
|
||
class CommandQueryMixin:
|
||
command_store = get_command_storage()
|
||
filterset_fields = [
|
||
"asset", "account", "user", "session",
|
||
"risk_level", "input"
|
||
]
|
||
default_days_ago = 5
|
||
|
||
@staticmethod
|
||
def get_org_id():
|
||
if current_org.is_default():
|
||
org_id = ''
|
||
else:
|
||
org_id = current_org.id
|
||
return org_id
|
||
|
||
def get_query_risk_level(self):
|
||
risk_level = self.request.query_params.get('risk_level')
|
||
if risk_level is None:
|
||
return None
|
||
if risk_level.isdigit():
|
||
return int(risk_level)
|
||
return None
|
||
|
||
def get_queryset(self):
|
||
# 解决访问 /docs/ 问题
|
||
if hasattr(self, 'swagger_fake_view'):
|
||
return self.command_store.model.objects.none()
|
||
date_from, date_to = self.get_date_range()
|
||
q = self.request.query_params
|
||
multi_command_storage = get_multi_command_storage()
|
||
queryset = multi_command_storage.filter(
|
||
date_from=date_from, date_to=date_to,
|
||
user=q.get("user"), asset=q.get("asset"), account=q.get("account"),
|
||
input=q.get("input"), session=q.get("session_id", q.get('session')),
|
||
risk_level=self.get_query_risk_level(), org_id=self.get_org_id(),
|
||
)
|
||
return queryset
|
||
|
||
def filter_queryset(self, queryset):
|
||
# 解决es存储命令时,父类根据filter_fields过滤出现异常的问题,返回的queryset类型list
|
||
return queryset
|
||
|
||
def get_date_range(self):
|
||
now = timezone.now()
|
||
days_ago = now - timezone.timedelta(days=self.default_days_ago)
|
||
date_from_st = days_ago.timestamp()
|
||
date_to_st = now.timestamp()
|
||
|
||
query_params = self.request.query_params
|
||
date_from_q = query_params.get("date_from")
|
||
date_to_q = query_params.get("date_to")
|
||
|
||
dt_parser = DateTimeField().to_internal_value
|
||
|
||
if date_from_q:
|
||
date_from_st = dt_parser(date_from_q).timestamp()
|
||
|
||
if date_to_q:
|
||
date_to_st = dt_parser(date_to_q).timestamp()
|
||
return date_from_st, date_to_st
|
||
|
||
|
||
class CommandViewSet(JMSBulkModelViewSet):
|
||
"""接受app发送来的command log, 格式如下
|
||
{
|
||
"user": "admin",
|
||
"asset": "localhost",
|
||
"account": "web",
|
||
"session": "xxxxxx",
|
||
"input": "whoami",
|
||
"output": "d2hvbWFp", # base64.b64encode(s)
|
||
"timestamp": 1485238673.0
|
||
}
|
||
|
||
"""
|
||
command_store = get_command_storage()
|
||
serializer_class = SessionCommandSerializer
|
||
filterset_class = CommandFilter
|
||
search_fields = ('input',)
|
||
model = Command
|
||
ordering_fields = ('timestamp',)
|
||
|
||
def merge_all_storage_list(self, request, *args, **kwargs):
|
||
merged_commands = []
|
||
|
||
storages = CommandStorage.objects.all()
|
||
for storage in storages:
|
||
if not storage.is_valid():
|
||
continue
|
||
|
||
qs = storage.get_command_queryset()
|
||
commands = self.filter_queryset(qs)
|
||
merged_commands.extend(commands[:]) # ES 默认只取 10 条数据
|
||
order = self.request.query_params.get('order', None)
|
||
if order == 'timestamp':
|
||
merged_commands.sort(key=lambda command: command.timestamp)
|
||
else:
|
||
merged_commands.sort(key=lambda command: command.timestamp, reverse=True)
|
||
page = self.paginate_queryset(merged_commands)
|
||
if page is not None:
|
||
serializer = self.get_serializer(page, many=True)
|
||
return self.get_paginated_response(serializer.data)
|
||
|
||
serializer = self.get_serializer(merged_commands, many=True)
|
||
return Response(serializer.data)
|
||
|
||
def list(self, request, *args, **kwargs):
|
||
command_storage_id = self.request.query_params.get('command_storage_id')
|
||
session_id = self.request.query_params.get('session_id')
|
||
|
||
if session_id and not command_storage_id:
|
||
# 会话里的命令列表肯定会提供 session_id,这里防止 merge 的时候取全量的数据
|
||
return self.merge_all_storage_list(request, *args, **kwargs)
|
||
|
||
queryset = self.filter_queryset(self.get_queryset())
|
||
|
||
page = self.paginate_queryset(queryset)
|
||
if page is not None:
|
||
page = self.load_remote_addr(page)
|
||
serializer = self.get_serializer(page, many=True)
|
||
return self.get_paginated_response(serializer.data)
|
||
|
||
# 适配像 ES 这种没有指定分页只返回少量数据的情况
|
||
queryset = queryset[:]
|
||
|
||
queryset = self.load_remote_addr(queryset)
|
||
serializer = self.get_serializer(queryset, many=True)
|
||
return Response(serializer.data)
|
||
|
||
def load_remote_addr(self, queryset):
|
||
commands = list(queryset)
|
||
session_ids = {command.session for command in commands}
|
||
sessions = Session.objects.filter(id__in=session_ids).values_list('id', 'remote_addr')
|
||
session_addr_map = {str(i): addr for i, addr in sessions}
|
||
for command in commands:
|
||
command.remote_addr = session_addr_map.get(command.session, '')
|
||
return commands
|
||
|
||
def get_queryset(self):
|
||
command_storage_id = self.request.query_params.get('command_storage_id')
|
||
if not command_storage_id:
|
||
return Command.objects.none()
|
||
|
||
storage = CommandStorage.objects.get(id=command_storage_id)
|
||
if not storage.is_valid():
|
||
raise StorageInvalid
|
||
else:
|
||
qs = storage.get_command_queryset()
|
||
return qs
|
||
|
||
def create(self, request, *args, **kwargs):
|
||
serializer = self.serializer_class(data=request.data, many=True)
|
||
if serializer.is_valid():
|
||
ok = self.command_store.bulk_save(serializer.validated_data)
|
||
if ok:
|
||
return Response("ok", status=201)
|
||
else:
|
||
return Response("Save error", status=500)
|
||
else:
|
||
msg = "Command not valid: {}".format(serializer.errors)
|
||
logger.error(msg)
|
||
return Response({"msg": msg}, status=401)
|
||
|
||
|
||
class InsecureCommandAlertAPI(generics.CreateAPIView):
|
||
serializer_class = InsecureCommandAlertSerializer
|
||
rbac_perms = {
|
||
'POST': 'terminal.add_command'
|
||
}
|
||
|
||
def post(self, request, *args, **kwargs):
|
||
serializer = InsecureCommandAlertSerializer(data=request.data, many=True)
|
||
serializer.is_valid(raise_exception=True)
|
||
commands = serializer.validated_data
|
||
for command in commands:
|
||
if command['risk_level'] >= settings.SECURITY_INSECURE_COMMAND_LEVEL:
|
||
CommandAlertMessage(command).publish_async()
|
||
return Response()
|