github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,825 Commits
96 Branches
262 Tags
144 MiB
Commit Graph

10825 Commits (c49c394b5bb011373202b31aef3f29b53a25e10d)

Author SHA1 Message Date
Bai 21da805e78 fix: fix conflicts 2023-04-13 19:20:18 +08:00
fit2bot 928513edd0
fix: fix conflicts (#10197) 
* perf: domain gateway 也添加

* fix: 不支持es8 提示

* perf: 授权过期通知

* fix: 过滤系统用户密码过滤ansible不支持的字符

* perf: 优化 apt (#8398)

* pref: 修改 oracle lib path

* perf: 优化 apt

Co-authored-by: ibuler <ibuler@qq.com>

* fix: 修复授权过期通知bug (#8404)

Co-authored-by: feng626 <1304903146@qq.com>

* fix: 修改推送系统用户提示文案

* feat: add client linux arm64 version

* perf: 优化签名认证

* pref: 优化没有获取到节点的问题

* fix: 修复openid用户登录时默认邮件后缀使用配置项

* fix: 修复华为短信配置错误，前端提示不对的问题

* fix: 修复账号备份失败问题 (#8852)

Co-authored-by: feng626 <1304903146@qq.com>

* perf: 优化加密，没有rsa则不加密

* feat: 支持对开启SSL/TLS的MongoDb数据库改密

* perf: 工单新增相关过滤

* fix: 修复配置mfa失效日期 失效问题 (#8856)

Co-authored-by: feng626 <1304903146@qq.com>

* fix: 修复日志记录到syslog时中文编码问题

* workflow: 修改 Gitee 同步的目的仓库

* fix: 修复导出账号历史翻译信息

---------

Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
Co-authored-by: 老广 <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
Co-authored-by: BugKing <wangzhen@fit2cloud.com>
 2023-04-13 19:16:46 +08:00
fit2bot 1eb8e40d3e
feat: 账号推送附加参数 (#10080) 
* feat: 账号推送附加参数

* perf: 通过节点 资产 过滤平台api

* perf: push automation params

* perf: 修改playbook

* perf: params serializer

* perf: 账号推送playbook 调整

* perf: Automation serializer add params field

* perf: params 非必填

* perf: 添加is_params 给前端判断

* perf: is_params bool

* perf: 修改push account ansible逻辑

* perf: 修改获取push_kwargs方法

* perf: platform migrate

* perf: 修改api

* perf: 单个推送

* perf: push account

* perf: 修改asset auto_config

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-04-13 19:02:04 +08:00
jiangweidong 8e81aee1fd perf: luna连接时不显示 WinRM 协议选项 2023-04-13 18:29:21 +08:00
jiangweidong e12b832992
perf: 关闭SFTP后，luna界面不显示相应选项 (#10186) 
* perf: 关闭SFTP后，luna界面不显示相应选项

* perf: 修改默认值

* perf: 增加资产协议冗余字段，减少关联查询

* perf: 修改

* perf: 优化

* perf: 精简

* perf: 删掉空格

* perf: 修改继承类
 2023-04-13 17:26:24 +08:00
fit2bot 1aadb760f4
perf: 优化命令长度限制到8m (#10193) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-04-13 15:47:16 +08:00
fit2bot 4654756966
fix: 修复账号克隆 500 (#10192) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-13 14:20:07 +08:00
Bai 4c7c8f482d fix: 修复执行批量命令时报错的问题 TypeError:set obiect is not subscriptable 2023-04-12 18:30:34 +08:00
fit2bot 30b89e5cc9
perf: 账号模版更新 (#10184) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-12 17:59:13 +08:00
老广 b0365838fb
Merge pull request #10183 from O-Jiangweidong/pr@dev@perf_connect_gateway_no_gateway 
perf: 当连接资产为网关时，connection_token不返回网域网关信息
 2023-04-12 13:07:29 +08:00
jiangweidong a59f1895a3 perf: 当连接资产为网关时，connection_token不返回网域网关信息 2023-04-12 11:43:06 +08:00
ibuler 59b27822be perf: 添加迁移文件 2023-04-11 19:32:29 +08:00
ibuler 36813f64db perf: 修改 device platform 支持 su 2023-04-11 19:32:29 +08:00
jiangweidong 111296ecd2 fix: 手机号码校验逻辑问题 2023-04-10 18:00:39 +08:00
jiangweidong b7badc146a fix 2023-04-10 17:36:26 +08:00
jiangweidong 8ff1bae7e6 fix: 手机号可以为空及验证逻辑修改 2023-04-10 17:36:26 +08:00
Eric b58488a7e9 perf: connection token api 兼容处理 2023-04-10 16:43:31 +08:00
老广 1f63a9675f
Merge pull request #10169 from jumpserver/pr@dev@fix_migrate_error 
perf: 优化 custom info
 2023-04-10 15:19:38 +08:00
ibuler 907fcd7555 perf: 优化 custom info 2023-04-10 15:18:27 +08:00
Bai 616e636837 fix: 修复手机号字段问题 2023-04-10 14:36:22 +08:00
ibuler 34e846927b perf: 优化 connect token asset info 2023-04-10 13:47:38 +08:00
fit2bot 1248458451
perf: 优化支持 choices (#10151) 
* perf: 支持自定义类型资产

* perf: 改名前

* perf: 优化支持 choices

* perf: 优化自定义资产

* perf: 优化资产的详情

* perf: 修改完成自定义平台和资产

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-04-10 10:57:44 +08:00
wulabing cec176cc33 fix notifications.py 
fix ops.tasks.check_server_performance_period AttributeError: type object 'Status' has no attribute 'get_terminal_latest_stat'
 2023-04-10 10:35:16 +08:00
jiangweidong 7833433d5f feat: 手机号支持选择区号 2023-04-10 10:33:31 +08:00
halo ec2c8538d9 fix: 首次登录强制开启MFA页面bug 2023-04-07 10:19:49 +08:00
fit2bot e34fbce082
perf: patch account 400 (#10153) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-06 19:53:01 +08:00
fit2bot fb1978a40b
fix: terminal status (#10142) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-06 10:31:41 +08:00
fit2bot 47d0882090
perf: 用户添加密码 设置是否已存在 (#10138) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-04 18:02:58 +08:00
fit2bot 7c1e92c787
fix: 更新账号 跳过name检查 (#10136) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-04 16:04:44 +08:00
老广 9af2974bad
Merge pull request #10104 from O-Jiangweidong/pr@dev@feat_windows_winrm 
feat: Windows类型资产增加winrm协议
 2023-04-04 14:08:34 +08:00
Eric_Lee ba5ca3532b
Merge pull request #10133 from jumpserver/pr@dev@fix_deploy_applet 
fix: 修正 applet 部署失败
 2023-04-04 12:43:49 +08:00
吴小白 211963a098 fix: 修正 applet 部署失败 2023-04-04 12:32:54 +08:00
jiangweidong 187c1e3804 perf: 优化winrm协议网域连接支持ssh_key 2023-04-04 11:55:07 +08:00
Bai 55774dae02 fix: 修复Luna页面用户授权树搜索问题(同步加载方式) 2023-04-04 11:53:01 +08:00
Bai 00ec9b6d5a fix: 修复Luna页面用户授权树默认展开所有节点的问题(同步加载方式) 2023-04-04 11:31:38 +08:00
老广 98a2d9ffdb
Merge pull request #10127 from jumpserver/pr@dev@fix_systemuser_without_username_migrate_error 
fix: 优化系统用户迁移
 2023-04-04 11:16:55 +08:00
ibuler 2b8d0a64fb fix: 优化系统用户迁移 2023-04-04 10:31:57 +08:00
fit2bot 3c07667689
perf: 修改 account migrate (#10125) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 18:53:37 +08:00
Eric 9686c66874 perf: 会话分享记录字段翻译 2023-04-03 18:37:01 +08:00
fit2bot c5340b5adc
perf: 修改 account (#10088) 
* perf: 优化账号创建策略

* perf: 修改账号

* perf: 修改 account

* perf: 修改 account

* perf: 修改批量创建

* perf: 修改账号批量创建

* perf: 继续优化账号批量添加

* perf: 优化创建 accounts 的结果

* perf: 优化账号批量返回的格式

* perf: 优化账号

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-04-03 18:18:31 +08:00
fit2bot 4601bb9e58
perf: 优化mac客户端名字 (#10122) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 17:50:52 +08:00
老广 7d68148f7a
Merge pull request #10110 from jumpserver/dependabot/pip/requirements/redis-4.5.4 
build(deps): bump redis from 4.5.3 to 4.5.4 in /requirements
 2023-04-03 17:13:46 +08:00
老广 e386e7f33a
Merge pull request #10119 from jumpserver/pr@dev@fix_ldapuserimport 
fix: 修复 LDAP 导入用户时指定其他组织，还会导入到 Default 组织的问题
 2023-04-03 17:10:39 +08:00
Bai 34c9044d03 fix: 修复 LDAP 导入用户时指定其他组织，还会导入到 Default 组织的问题 2023-04-03 08:47:21 +00:00
fit2bot 90cbf653ac
perf: 优化luna tree title (#10118) 
Co-authored-by: feng <1304903146@qq.com>
 2023-04-03 16:47:14 +08:00
Eric_Lee 1c93d7f0a3
Merge pull request #10107 from jumpserver/pr@dev@perf_dockerfile 
perf: applet 使用 powershell 部署
 2023-04-03 15:58:47 +08:00
Eric d9ad5aee4a perf: 修改默认值和变量名 2023-04-03 15:39:15 +08:00
Eric 1fbaa85178 perf: 修改接口 2023-04-03 15:39:15 +08:00
Eric 789eb0cf36 feat: 协作分享增加读写控制 2023-04-03 15:39:15 +08:00
jiangweidong cbe384161a perf: 优化一个函数名 2023-04-03 10:17:00 +08:00