mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-04-07 21:03:15 +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>
235 lines
8.3 KiB
Python
235 lines
8.3 KiB
Python
from datetime import datetime
|
||
|
||
from django.db import transaction
|
||
from django.core.cache import cache
|
||
from django.utils.translation import ugettext_lazy as _
|
||
|
||
from users.models import User
|
||
from common.utils import get_request_ip, get_logger
|
||
from common.utils.timezone import as_current_tz
|
||
from common.utils.encode import Singleton
|
||
from common.local import encrypted_field_set
|
||
from settings.serializers import SettingsSerializer
|
||
from jumpserver.utils import current_request
|
||
from audits.models import OperateLog
|
||
from orgs.utils import get_current_org_id
|
||
|
||
from .backends import get_operate_log_storage
|
||
from .const import ActionChoices
|
||
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
|
||
class ModelClient:
|
||
@staticmethod
|
||
def save(**kwargs):
|
||
log_id = kwargs.get('id', '')
|
||
op_log = OperateLog.objects.filter(pk=log_id).first()
|
||
if op_log is not None:
|
||
raw_after = op_log.after or {}
|
||
raw_before = op_log.before or {}
|
||
cur_before = kwargs.get('before') or {}
|
||
cur_after = kwargs.get('after') or {}
|
||
raw_before.update(cur_before)
|
||
raw_after.update(cur_after)
|
||
op_log.before = raw_before
|
||
op_log.after = raw_after
|
||
op_log.save()
|
||
else:
|
||
OperateLog.objects.create(**kwargs)
|
||
|
||
|
||
class OperatorLogHandler(metaclass=Singleton):
|
||
CACHE_KEY = 'OPERATOR_LOG_CACHE_KEY'
|
||
|
||
def __init__(self):
|
||
self.log_client = self.get_storage_client()
|
||
|
||
@staticmethod
|
||
def get_storage_client():
|
||
client = get_operate_log_storage()
|
||
return client
|
||
|
||
@staticmethod
|
||
def _consistent_type_to_str(value1, value2):
|
||
if isinstance(value1, datetime):
|
||
value1 = as_current_tz(value1).strftime('%Y-%m-%d %H:%M:%S')
|
||
if isinstance(value2, datetime):
|
||
value2 = as_current_tz(value2).strftime('%Y-%m-%d %H:%M:%S')
|
||
return value1, value2
|
||
|
||
def _look_for_two_dict_change(self, left_dict, right_dict):
|
||
# 以右边的字典为基础
|
||
before, after = {}, {}
|
||
for key, value in right_dict.items():
|
||
pre_value = left_dict.get(key, '')
|
||
pre_value, value = self._consistent_type_to_str(pre_value, value)
|
||
if sorted(str(value)) == sorted(str(pre_value)):
|
||
continue
|
||
if pre_value:
|
||
before[key] = pre_value
|
||
if value:
|
||
after[key] = value
|
||
return before, after
|
||
|
||
def cache_instance_before_data(self, instance_dict):
|
||
instance_id = instance_dict.get('id')
|
||
if instance_id is None:
|
||
return
|
||
|
||
key = '%s_%s' % (self.CACHE_KEY, instance_id)
|
||
cache.set(key, instance_dict, 3 * 60)
|
||
|
||
def get_instance_dict_from_cache(self, instance_id):
|
||
if instance_id is None:
|
||
return None, None
|
||
|
||
key = '%s_%s' % (self.CACHE_KEY, instance_id)
|
||
cache_instance = cache.get(key, {})
|
||
log_id = cache_instance.get('operate_log_id')
|
||
return log_id, cache_instance
|
||
|
||
def get_instance_current_with_cache_diff(self, current_instance):
|
||
log_id, before, after = None, None, None
|
||
instance_id = current_instance.get('id')
|
||
if instance_id is None:
|
||
return log_id, before, after
|
||
|
||
log_id, cache_instance = self.get_instance_dict_from_cache(instance_id)
|
||
if not cache_instance:
|
||
return log_id, before, after
|
||
|
||
before, after = self._look_for_two_dict_change(
|
||
cache_instance, current_instance
|
||
)
|
||
return log_id, before, after
|
||
|
||
@staticmethod
|
||
def get_resource_display_from_setting(resource):
|
||
resource_display = None
|
||
setting_serializer = SettingsSerializer()
|
||
label = setting_serializer.get_field_label(resource)
|
||
if label is not None:
|
||
resource_display = label
|
||
return resource_display
|
||
|
||
def get_resource_display(self, resource):
|
||
resource_display = str(resource)
|
||
return_value = self.get_resource_display_from_setting(resource_display)
|
||
if return_value is not None:
|
||
resource_display = return_value
|
||
return resource_display
|
||
|
||
@staticmethod
|
||
def serialized_value(value: (list, tuple)):
|
||
if len(value) == 0:
|
||
return ''
|
||
if isinstance(value[0], str):
|
||
return ','.join(value)
|
||
return ','.join([i['value'] for i in value if i.get('value')])
|
||
|
||
def __data_processing(self, dict_item, loop=True):
|
||
encrypt_value = '******'
|
||
for key, value in dict_item.items():
|
||
if isinstance(value, bool):
|
||
value = _('Yes') if value else _('No')
|
||
elif isinstance(value, (list, tuple)):
|
||
value = self.serialized_value(value)
|
||
elif isinstance(value, dict) and loop:
|
||
self.__data_processing(value, loop=False)
|
||
if key in encrypted_field_set:
|
||
value = encrypt_value
|
||
dict_item[key] = value
|
||
return dict_item
|
||
|
||
def data_processing(self, before, after):
|
||
if before:
|
||
before = self.__data_processing(before)
|
||
if after:
|
||
after = self.__data_processing(after)
|
||
return before, after
|
||
|
||
@staticmethod
|
||
def _get_Session_params(resource, **kwargs):
|
||
# 更新会话的日志不在Activity中体现,
|
||
# 否则会话结束,录像文件结束操作的会话记录都会体现出来
|
||
params = {}
|
||
action = kwargs.get('data', {}).get('action', 'create')
|
||
if action == ActionChoices.create:
|
||
params = {
|
||
'action': ActionChoices.connect,
|
||
'resource_id': str(resource.asset_id),
|
||
'user': resource.user
|
||
}
|
||
return params
|
||
|
||
@staticmethod
|
||
def _get_ChangeSecretRecord_params(resource, **kwargs):
|
||
return {
|
||
'action': ActionChoices.change_auth,
|
||
'resource_id': str(resource.account_id),
|
||
}
|
||
|
||
@staticmethod
|
||
def _get_UserLoginLog_params(resource, **kwargs):
|
||
username = resource.username
|
||
user_id = User.objects.filter(username=username).\
|
||
values_list('id', flat=True)[0]
|
||
return {
|
||
'action': ActionChoices.login,
|
||
'resource_id': str(user_id),
|
||
}
|
||
|
||
def _activity_handle(self, data, object_name, resource):
|
||
param_func = getattr(self, '_get_%s_params' % object_name, None)
|
||
if param_func is not None:
|
||
params = param_func(resource, data=data)
|
||
data['is_activity'] = True
|
||
data.update(params)
|
||
return data
|
||
|
||
def create_or_update_operate_log(
|
||
self, action, resource_type, resource=None,
|
||
force=False, log_id=None, before=None, after=None,
|
||
object_name=None
|
||
):
|
||
user = current_request.user if current_request else None
|
||
if not user or not user.is_authenticated:
|
||
return
|
||
|
||
remote_addr = get_request_ip(current_request)
|
||
resource_display = self.get_resource_display(resource)
|
||
before, after = self.data_processing(before, after)
|
||
if not force and not any([before, after]):
|
||
# 前后都没变化,没必要生成日志,除非手动强制保存
|
||
return
|
||
|
||
data = {
|
||
'id': log_id, "user": str(user), 'action': action,
|
||
'resource_type': str(resource_type), 'resource': resource_display,
|
||
'remote_addr': remote_addr, 'before': before, 'after': after,
|
||
'org_id': get_current_org_id(), 'resource_id': str(resource.id)
|
||
}
|
||
data = self._activity_handle(data, object_name, resource=resource)
|
||
with transaction.atomic():
|
||
if self.log_client.ping(timeout=1):
|
||
client = self.log_client
|
||
else:
|
||
logger.info('Switch default operate log storage save.')
|
||
client = get_operate_log_storage(default=True)
|
||
|
||
try:
|
||
client.save(**data)
|
||
except Exception as e:
|
||
error_msg = 'An error occurred saving OperateLog.' \
|
||
'Error: %s, Data: %s' % (e, data)
|
||
logger.error(error_msg)
|
||
|
||
|
||
op_handler = OperatorLogHandler()
|
||
create_or_update_operate_log = op_handler.create_or_update_operate_log
|
||
cache_instance_before_data = op_handler.cache_instance_before_data
|
||
get_instance_current_with_cache_diff = op_handler.get_instance_current_with_cache_diff
|
||
get_instance_dict_from_cache = op_handler.get_instance_dict_from_cache
|