mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-22 21:24:38 +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>
243 lines
8.8 KiB
Python
243 lines
8.8 KiB
Python
# -*- coding: utf-8 -*-
|
|
#
|
|
from rest_framework import serializers
|
|
from rest_framework.validators import UniqueValidator
|
|
from urllib.parse import urlparse
|
|
from django.utils.translation import ugettext_lazy as _
|
|
from django.db.models import TextChoices
|
|
from common.serializers.fields import LabeledChoiceField
|
|
from common.serializers import MethodSerializer
|
|
from common.serializers.fields import ReadableHiddenField, EncryptedField
|
|
from ..models import ReplayStorage, CommandStorage
|
|
from .. import const
|
|
|
|
|
|
# Replay storage serializers
|
|
# --------------------------
|
|
def replay_storage_endpoint_format_validator(endpoint):
|
|
h = urlparse(endpoint)
|
|
if h.path:
|
|
raise serializers.ValidationError(_('Endpoint invalid: remove path `{}`').format(h.path))
|
|
return endpoint
|
|
|
|
|
|
class ReplayStorageTypeBaseSerializer(serializers.Serializer):
|
|
BUCKET = serializers.CharField(
|
|
required=True, max_length=1024, label=_('Bucket'), allow_null=True
|
|
)
|
|
ACCESS_KEY = serializers.CharField(
|
|
max_length=1024, required=False, allow_blank=True,
|
|
label=_('Access key id'), allow_null=True,
|
|
)
|
|
SECRET_KEY = EncryptedField(
|
|
max_length=1024, required=False, allow_blank=True,
|
|
label=_('Access key secret'), allow_null=True,
|
|
)
|
|
ENDPOINT = serializers.CharField(
|
|
validators=[replay_storage_endpoint_format_validator],
|
|
required=True, max_length=1024, label=_('Endpoint'), allow_null=True,
|
|
)
|
|
|
|
|
|
class ReplayStorageTypeS3Serializer(ReplayStorageTypeBaseSerializer):
|
|
endpoint_help_text = '''
|
|
S3 format: http://s3.{REGION_NAME}.amazonaws.com <br>
|
|
S3(China) format: http://s3.{REGION_NAME}.amazonaws.com.cn <br>
|
|
Such as: http://s3.cn-north-1.amazonaws.com.cn
|
|
'''
|
|
ENDPOINT = serializers.CharField(
|
|
validators=[replay_storage_endpoint_format_validator],
|
|
required=True, max_length=1024, label=_('Endpoint'), help_text=_(endpoint_help_text),
|
|
allow_null=True,
|
|
)
|
|
|
|
|
|
class ReplayStorageTypeCephSerializer(ReplayStorageTypeBaseSerializer):
|
|
pass
|
|
|
|
|
|
class ReplayStorageTypeSwiftSerializer(ReplayStorageTypeBaseSerializer):
|
|
class ProtocolChoices(TextChoices):
|
|
http = 'http', 'http'
|
|
https = 'https', 'https'
|
|
|
|
REGION = serializers.CharField(
|
|
required=True, max_length=1024, label=_('Region'), allow_null=True
|
|
)
|
|
PROTOCOL = serializers.ChoiceField(
|
|
choices=ProtocolChoices.choices, default=ProtocolChoices.http.value, label=_('Protocol'),
|
|
allow_null=True,
|
|
)
|
|
|
|
|
|
class ReplayStorageTypeOSSSerializer(ReplayStorageTypeBaseSerializer):
|
|
endpoint_help_text = '''
|
|
OSS format: http://{REGION_NAME}.aliyuncs.com <br>
|
|
Such as: http://oss-cn-hangzhou.aliyuncs.com
|
|
'''
|
|
ENDPOINT = serializers.CharField(
|
|
validators=[replay_storage_endpoint_format_validator],
|
|
max_length=1024, label=_('Endpoint'), help_text=_(endpoint_help_text), allow_null=True,
|
|
)
|
|
|
|
|
|
class ReplayStorageTypeOBSSerializer(ReplayStorageTypeBaseSerializer):
|
|
endpoint_help_text = '''
|
|
OBS format: obs.{REGION_NAME}.myhuaweicloud.com <br>
|
|
Such as: obs.cn-north-4.myhuaweicloud.com
|
|
'''
|
|
ENDPOINT = serializers.CharField(
|
|
max_length=1024, label=_('Endpoint'), help_text=_(endpoint_help_text), allow_null=True,
|
|
)
|
|
|
|
|
|
class ReplayStorageTypeCOSSerializer(ReplayStorageTypeS3Serializer):
|
|
endpoint_help_text = '''Such as: http://cos.{REGION_NAME}.myqcloud.com'''
|
|
ENDPOINT = serializers.CharField(
|
|
validators=[replay_storage_endpoint_format_validator],
|
|
required=True, max_length=1024, label=_('Endpoint'), help_text=_(endpoint_help_text),
|
|
allow_null=True,
|
|
)
|
|
|
|
|
|
class ReplayStorageTypeAzureSerializer(serializers.Serializer):
|
|
class EndpointSuffixChoices(TextChoices):
|
|
china = 'core.chinacloudapi.cn', 'core.chinacloudapi.cn'
|
|
international = 'core.windows.net', 'core.windows.net'
|
|
|
|
CONTAINER_NAME = serializers.CharField(
|
|
max_length=1024, label=_('Container name'), allow_null=True
|
|
)
|
|
ACCOUNT_NAME = serializers.CharField(max_length=1024, label=_('Account name'), allow_null=True)
|
|
ACCOUNT_KEY = EncryptedField(max_length=1024, label=_('Account key'), allow_null=True)
|
|
ENDPOINT_SUFFIX = serializers.ChoiceField(
|
|
choices=EndpointSuffixChoices.choices, default=EndpointSuffixChoices.china.value,
|
|
label=_('Endpoint suffix'), allow_null=True,
|
|
)
|
|
|
|
|
|
# mapping
|
|
replay_storage_type_serializer_classes_mapping = {
|
|
const.ReplayStorageType.s3.value: ReplayStorageTypeS3Serializer,
|
|
const.ReplayStorageType.ceph.value: ReplayStorageTypeCephSerializer,
|
|
const.ReplayStorageType.swift.value: ReplayStorageTypeSwiftSerializer,
|
|
const.ReplayStorageType.oss.value: ReplayStorageTypeOSSSerializer,
|
|
const.ReplayStorageType.azure.value: ReplayStorageTypeAzureSerializer,
|
|
const.ReplayStorageType.obs.value: ReplayStorageTypeOBSSerializer,
|
|
const.ReplayStorageType.cos.value: ReplayStorageTypeCOSSerializer
|
|
}
|
|
|
|
|
|
# Command storage serializers
|
|
# ---------------------------
|
|
def command_storage_es_host_format_validator(host):
|
|
h = urlparse(host)
|
|
default_error_msg = _('The address format is incorrect')
|
|
if h.scheme not in ['http', 'https']:
|
|
raise serializers.ValidationError(default_error_msg)
|
|
if ':' not in h.netloc:
|
|
raise serializers.ValidationError(default_error_msg)
|
|
_host, _port = h.netloc.rsplit(':', maxsplit=1)
|
|
if not _host:
|
|
error_msg = _('Host invalid')
|
|
raise serializers.ValidationError(error_msg)
|
|
if not _port.isdigit():
|
|
error_msg = _('Port invalid')
|
|
raise serializers.ValidationError(error_msg)
|
|
return host
|
|
|
|
|
|
class CommandStorageTypeESSerializer(serializers.Serializer):
|
|
hosts_help_text = '''
|
|
Tip: If there are multiple hosts, use a comma (,) to separate them. <br>
|
|
(eg: http://www.jumpserver.a.com:9100, http://www.jumpserver.b.com:9100)
|
|
'''
|
|
HOSTS = serializers.ListField(
|
|
child=serializers.CharField(validators=[command_storage_es_host_format_validator]),
|
|
label=_('Hosts'), help_text=_(hosts_help_text), allow_null=True
|
|
)
|
|
INDEX_BY_DATE = serializers.BooleanField(
|
|
default=False, label=_('Index by date'),
|
|
help_text=_('Whether to create an index by date')
|
|
)
|
|
INDEX = serializers.CharField(
|
|
max_length=1024, default='jumpserver', label=_('Index'), allow_null=True
|
|
)
|
|
DOC_TYPE = ReadableHiddenField(default='_doc', label=_('Doc type'), allow_null=True)
|
|
IGNORE_VERIFY_CERTS = serializers.BooleanField(
|
|
default=False, label=_('Ignore Certificate Verification'),
|
|
source='OTHER.IGNORE_VERIFY_CERTS', allow_null=True,
|
|
)
|
|
|
|
|
|
# mapping
|
|
command_storage_type_serializer_classes_mapping = {
|
|
const.CommandStorageType.es.value: CommandStorageTypeESSerializer
|
|
}
|
|
|
|
|
|
# BaseStorageSerializer
|
|
class BaseStorageSerializer(serializers.ModelSerializer):
|
|
type = LabeledChoiceField(choices=const.ReplayStorageType.choices, label=_('Type'))
|
|
storage_type_serializer_classes_mapping = {}
|
|
meta = MethodSerializer()
|
|
|
|
class Meta:
|
|
model = None
|
|
fields = ['id', 'name', 'type', 'meta', 'is_default', 'comment']
|
|
|
|
def validate_meta(self, meta):
|
|
_meta = self.instance.meta if self.instance else {}
|
|
_meta.update(meta)
|
|
return _meta
|
|
|
|
def get_meta_serializer(self):
|
|
default_serializer = serializers.Serializer(read_only=True)
|
|
|
|
if isinstance(self.instance, self.__class__.Meta.model):
|
|
_type = self.instance.type
|
|
else:
|
|
_type = self.context['request'].query_params.get('type')
|
|
|
|
if _type:
|
|
serializer_class = self.storage_type_serializer_classes_mapping.get(_type)
|
|
else:
|
|
serializer_class = default_serializer
|
|
|
|
if not serializer_class:
|
|
serializer_class = default_serializer
|
|
|
|
if isinstance(serializer_class, type):
|
|
serializer = serializer_class()
|
|
else:
|
|
serializer = serializer_class
|
|
return serializer
|
|
|
|
def save(self, **kwargs):
|
|
instance = super().save(**kwargs)
|
|
if self.validated_data.get('is_default', False):
|
|
instance.set_to_default()
|
|
return instance
|
|
|
|
|
|
# CommandStorageSerializer
|
|
class CommandStorageSerializer(BaseStorageSerializer):
|
|
storage_type_serializer_classes_mapping = command_storage_type_serializer_classes_mapping
|
|
|
|
class Meta(BaseStorageSerializer.Meta):
|
|
model = CommandStorage
|
|
extra_kwargs = {
|
|
'name': {'validators': [UniqueValidator(queryset=CommandStorage.objects.all())]}
|
|
}
|
|
|
|
|
|
# ReplayStorageSerializer
|
|
class ReplayStorageSerializer(BaseStorageSerializer):
|
|
storage_type_serializer_classes_mapping = replay_storage_type_serializer_classes_mapping
|
|
|
|
class Meta(BaseStorageSerializer.Meta):
|
|
model = ReplayStorage
|
|
extra_kwargs = {
|
|
'name': {'validators': [UniqueValidator(queryset=ReplayStorage.objects.all())]}
|
|
}
|