mirror of
https://github.com/jumpserver/jumpserver.git
synced 2026-01-20 17:44:26 +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>
316 lines
11 KiB
Python
316 lines
11 KiB
Python
# -*- coding: utf-8 -*-
|
|
#
|
|
from functools import partial
|
|
|
|
from django.utils.translation import ugettext_lazy as _
|
|
from rest_framework import serializers
|
|
|
|
from common.serializers.fields import EncryptedField, ObjectRelatedField, LabeledChoiceField
|
|
from common.serializers import CommonBulkSerializerMixin
|
|
from common.utils import pretty_string, get_logger
|
|
from common.validators import PhoneValidator
|
|
from rbac.builtin import BuiltinRole
|
|
from rbac.models import OrgRoleBinding, SystemRoleBinding, Role
|
|
from rbac.permissions import RBACPermission
|
|
from ..const import PasswordStrategy
|
|
from ..models import User
|
|
|
|
__all__ = [
|
|
"UserSerializer",
|
|
"MiniUserSerializer",
|
|
"InviteSerializer",
|
|
"ServiceAccountSerializer",
|
|
]
|
|
|
|
logger = get_logger(__file__)
|
|
|
|
|
|
class RolesSerializerMixin(serializers.Serializer):
|
|
system_roles = ObjectRelatedField(
|
|
queryset=Role.system_roles, attrs=('id', 'display_name'),
|
|
label=_("System roles"), many=True
|
|
)
|
|
org_roles = ObjectRelatedField(
|
|
queryset=Role.org_roles, attrs=('id', 'display_name'),
|
|
label=_("Org roles"), many=True
|
|
)
|
|
|
|
@staticmethod
|
|
def get_system_roles_display(user):
|
|
return user.system_roles.display
|
|
|
|
@staticmethod
|
|
def get_org_roles_display(user):
|
|
return user.org_roles.display
|
|
|
|
def pop_roles_if_need(self, fields):
|
|
request = self.context.get("request")
|
|
view = self.context.get("view")
|
|
|
|
if not all([request, view, hasattr(view, "action")]):
|
|
return fields
|
|
if request.user.is_anonymous:
|
|
return fields
|
|
|
|
action = view.action or "list"
|
|
if action in ("partial_bulk_update", "bulk_update", "partial_update", "update"):
|
|
action = "create"
|
|
model_cls_field_mapper = {
|
|
SystemRoleBinding: ["system_roles"],
|
|
OrgRoleBinding: ["org_roles"],
|
|
}
|
|
|
|
for model_cls, fields_names in model_cls_field_mapper.items():
|
|
perms = RBACPermission.parse_action_model_perms(action, model_cls)
|
|
if request.user.has_perms(perms):
|
|
continue
|
|
# 没有权限就去掉
|
|
for field_name in fields_names:
|
|
fields.pop(field_name, None)
|
|
return fields
|
|
|
|
def get_fields(self):
|
|
fields = super().get_fields()
|
|
self.pop_roles_if_need(fields)
|
|
return fields
|
|
|
|
|
|
class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializers.ModelSerializer):
|
|
password_strategy = LabeledChoiceField(
|
|
choices=PasswordStrategy.choices,
|
|
default=PasswordStrategy.email,
|
|
required=False,
|
|
write_only=True,
|
|
label=_("Password strategy"),
|
|
)
|
|
mfa_enabled = serializers.BooleanField(read_only=True, label=_("MFA enabled"))
|
|
mfa_force_enabled = serializers.BooleanField(
|
|
read_only=True, label=_("MFA force enabled")
|
|
)
|
|
login_blocked = serializers.BooleanField(read_only=True, label=_("Login blocked"))
|
|
is_expired = serializers.BooleanField(read_only=True, label=_("Is expired"))
|
|
can_public_key_auth = serializers.BooleanField(
|
|
source="can_use_ssh_key_login", label=_("Can public key authentication"),
|
|
read_only=True
|
|
)
|
|
password = EncryptedField(
|
|
label=_("Password"),
|
|
required=False,
|
|
allow_blank=True,
|
|
allow_null=True,
|
|
max_length=1024,
|
|
)
|
|
custom_m2m_fields = {
|
|
"system_roles": [BuiltinRole.system_user],
|
|
"org_roles": [BuiltinRole.org_user],
|
|
}
|
|
|
|
class Meta:
|
|
model = User
|
|
# mini 是指能识别对象的最小单元
|
|
fields_mini = ["id", "name", "username"]
|
|
# 只能写的字段, 这个虽然无法在框架上生效,但是更多对我们是提醒
|
|
fields_write_only = [
|
|
"password", "public_key",
|
|
]
|
|
# small 指的是 不需要计算的直接能从一张表中获取到的数据
|
|
fields_small = fields_mini + fields_write_only + [
|
|
"email", "wechat", "phone", "mfa_level", "source",
|
|
"need_update_password", "mfa_enabled",
|
|
"is_service_account", "is_valid",
|
|
"is_expired", "is_active", # 布尔字段
|
|
"is_otp_secret_key_bound", "can_public_key_auth",
|
|
"date_expired", "date_joined",
|
|
"last_login", # 日期字段
|
|
"created_by", "comment", # 通用字段
|
|
"wecom_id", "dingtalk_id", "feishu_id",
|
|
]
|
|
# 包含不太常用的字段,可以没有
|
|
fields_verbose = fields_small + [
|
|
"mfa_force_enabled",
|
|
"is_first_login",
|
|
"date_password_last_updated",
|
|
"avatar_url",
|
|
]
|
|
# 外键的字段
|
|
fields_fk = []
|
|
# 多对多字段
|
|
fields_m2m = ["groups", "system_roles", "org_roles", ]
|
|
# 在serializer 上定义的字段
|
|
fields_custom = ["login_blocked", "password_strategy"]
|
|
fields = fields_verbose + fields_fk + fields_m2m + fields_custom
|
|
|
|
read_only_fields = [
|
|
"date_joined", "last_login", "created_by",
|
|
"is_first_login", "wecom_id", "dingtalk_id",
|
|
"feishu_id",
|
|
]
|
|
disallow_self_update_fields = ["is_active"]
|
|
extra_kwargs = {
|
|
"password": {
|
|
"write_only": True,
|
|
"required": False,
|
|
"allow_null": True,
|
|
"allow_blank": True,
|
|
},
|
|
"public_key": {"write_only": True},
|
|
"is_first_login": {"label": _("Is first login"), "read_only": True},
|
|
"is_active": {"label": _("Is active")},
|
|
"is_valid": {"label": _("Is valid")},
|
|
"is_service_account": {"label": _("Is service account")},
|
|
"is_expired": {"label": _("Is expired")},
|
|
"avatar_url": {"label": _("Avatar url")},
|
|
"created_by": {"read_only": True, "allow_blank": True},
|
|
"role": {"default": "User"},
|
|
"is_otp_secret_key_bound": {"label": _("Is OTP bound")},
|
|
"phone": {"validators": [PhoneValidator()]},
|
|
}
|
|
|
|
def validate_password(self, password):
|
|
password_strategy = self.initial_data.get("password_strategy")
|
|
if self.instance is None and password_strategy != PasswordStrategy.custom:
|
|
# 创建用户,使用邮件设置密码
|
|
return
|
|
if self.instance and not password:
|
|
# 更新用户, 未设置密码
|
|
return
|
|
return password
|
|
|
|
@staticmethod
|
|
def change_password_to_raw(attrs):
|
|
password = attrs.pop("password", None)
|
|
if password:
|
|
attrs["password_raw"] = password
|
|
return attrs
|
|
|
|
@staticmethod
|
|
def clean_auth_fields(attrs):
|
|
for field in ("password", "public_key"):
|
|
value = attrs.get(field)
|
|
if not value:
|
|
attrs.pop(field, None)
|
|
return attrs
|
|
|
|
def check_disallow_self_update_fields(self, attrs):
|
|
request = self.context.get("request")
|
|
if not request or not request.user.is_authenticated:
|
|
return attrs
|
|
if not self.instance:
|
|
return attrs
|
|
if request.user.id != self.instance.id:
|
|
return attrs
|
|
disallow_fields = set(list(attrs.keys())) & set(
|
|
self.Meta.disallow_self_update_fields
|
|
)
|
|
if not disallow_fields:
|
|
return attrs
|
|
# 用户自己不能更新自己的一些字段
|
|
logger.debug("Disallow update self fields: %s", disallow_fields)
|
|
for field in disallow_fields:
|
|
attrs.pop(field, None)
|
|
return attrs
|
|
|
|
def validate(self, attrs):
|
|
attrs = self.check_disallow_self_update_fields(attrs)
|
|
attrs = self.change_password_to_raw(attrs)
|
|
attrs = self.clean_auth_fields(attrs)
|
|
attrs.pop("password_strategy", None)
|
|
return attrs
|
|
|
|
def save_and_set_custom_m2m_fields(self, validated_data, save_handler, created):
|
|
m2m_values = {}
|
|
for f, default_roles in self.custom_m2m_fields.items():
|
|
roles = validated_data.pop(f, None)
|
|
if created and not roles:
|
|
roles = [
|
|
Role.objects.filter(id=role.id).first() for role in default_roles
|
|
]
|
|
m2m_values[f] = roles
|
|
|
|
instance = save_handler(validated_data)
|
|
for field_name, value in m2m_values.items():
|
|
if value is None:
|
|
continue
|
|
field = getattr(instance, field_name)
|
|
field.set(value)
|
|
return instance
|
|
|
|
def update(self, instance, validated_data):
|
|
save_handler = partial(super().update, instance)
|
|
instance = self.save_and_set_custom_m2m_fields(
|
|
validated_data, save_handler, created=False
|
|
)
|
|
return instance
|
|
|
|
def create(self, validated_data):
|
|
save_handler = super().create
|
|
instance = self.save_and_set_custom_m2m_fields(
|
|
validated_data, save_handler, created=True
|
|
)
|
|
return instance
|
|
|
|
|
|
class UserRetrieveSerializer(UserSerializer):
|
|
login_confirm_settings = serializers.PrimaryKeyRelatedField(
|
|
read_only=True, source="login_confirm_setting.reviewers", many=True
|
|
)
|
|
|
|
class Meta(UserSerializer.Meta):
|
|
fields = UserSerializer.Meta.fields + ["login_confirm_settings"]
|
|
|
|
|
|
class MiniUserSerializer(serializers.ModelSerializer):
|
|
class Meta:
|
|
model = User
|
|
fields = UserSerializer.Meta.fields_mini
|
|
|
|
|
|
class InviteSerializer(RolesSerializerMixin, serializers.Serializer):
|
|
users = serializers.PrimaryKeyRelatedField(
|
|
queryset=User.get_nature_users(),
|
|
many=True,
|
|
label=_("Select users"),
|
|
help_text=_("For security, only list several users"),
|
|
)
|
|
system_roles = None
|
|
|
|
|
|
class ServiceAccountSerializer(serializers.ModelSerializer):
|
|
class Meta:
|
|
model = User
|
|
fields = ["id", "name", "access_key", "comment"]
|
|
read_only_fields = ["access_key"]
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
from authentication.serializers import AccessKeySerializer
|
|
|
|
self.fields["access_key"] = AccessKeySerializer(read_only=True)
|
|
|
|
def get_username(self):
|
|
return self.initial_data.get("name")
|
|
|
|
def get_email(self):
|
|
name = self.initial_data.get("name")
|
|
name_max_length = 128 - len(User.service_account_email_suffix)
|
|
name = pretty_string(name, max_length=name_max_length, ellipsis_str="-")
|
|
return "{}{}".format(name, User.service_account_email_suffix)
|
|
|
|
def validate_name(self, name):
|
|
email = self.get_email()
|
|
username = self.get_username()
|
|
if self.instance:
|
|
users = User.objects.exclude(id=self.instance.id)
|
|
else:
|
|
users = User.objects.all()
|
|
if users.filter(email=email) or users.filter(username=username):
|
|
raise serializers.ValidationError(_("name not unique"), code="unique")
|
|
return name
|
|
|
|
def create(self, validated_data):
|
|
name = validated_data["name"]
|
|
email = self.get_email()
|
|
comment = validated_data.get("comment", "")
|
|
user, ak = User.create_service_account(name, email, comment)
|
|
return user
|