github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,117 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

5898 Commits (bac296f82e1358c5728da299fe793010b5791c3a)

Author SHA1 Message Date
Bai 3f5af27a4e perf: 优化设置 MFA 文案(禁用=>重置) 2023-03-08 19:13:17 +08:00
fit2bot c90a2df28e
perf: automation account username change id (#9867) 
* perf: automation account username change id

* perf: 授权账号模版 自推送

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-03-08 18:52:00 +08:00
老广 8a0bd3379c
Merge pull request #9889 from jumpserver/pr@dev@perf_ignore_ssl 
perf: tinkerd 部署增加 ignore-verify-certs 配置
 2023-03-08 16:34:34 +08:00
Eric 177150c5cc perf: tinkerd 部署增加 ignore-verify-certs 配置 2023-03-08 16:16:10 +08:00
Bai bbddf6a342 fix: 修复组织管理员查看活动日志详情时没有对象的问题 2023-03-08 15:57:43 +08:00
Bai 6bbe602ebb fix: 修复组织管理员查看操作日志可以看到 system 组织下的操作问题, 只有系统管理员可以查看任务监控 2023-03-08 15:22:49 +08:00
老广 21352a2ab7
Merge pull request #9871 from jumpserver/pr@dev@fix_su_from_accounts 
fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug
 2023-03-08 14:06:59 +08:00
老广 1cbfd48e11
Merge pull request #9874 from jumpserver/pr@dev@fix_operatelog_hide_sth 
fix: 操作日志显示用户加密后的密文，及日期格式调整
 2023-03-08 14:06:12 +08:00
老广 c8c33c02ef
Merge pull request #9880 from jumpserver/pr@dev@perf_applet_certs 
fix: 修复自签证书下发布机部署失败
 2023-03-08 14:04:47 +08:00
老广 261ec60ab7
Merge pull request #9870 from jumpserver/pr@dev@fix_reconnecttoken 
feat: connection-token 添加重联兑换 API
 2023-03-08 14:04:01 +08:00
jiangweidong 72ca55c293 perf: 邮箱测试时，不填写'主题前缀'会报错 2023-03-08 13:49:38 +08:00
吴小白 7d6295775f perf: 还原国际化文本格式 2023-03-08 13:42:37 +08:00
吴小白 17ec105f69 perf: 修正错误 2023-03-08 13:40:55 +08:00
吴小白 366e20b165 fix: 修复自签证书下发布机部署失败 2023-03-08 13:27:03 +08:00
jiangweidong be669f7f05 fix: 操作日志显示用户加密后的密文，及日期格式调整 2023-03-08 11:21:15 +08:00
feng 8833b19d79 fix: 修复su-from-accounts API 500问题，Unsubscribe msg error 转成debug 2023-03-08 10:58:37 +08:00
Bai 4c7bc105d7 feat: connection-token 添加重联兑换 API 2023-03-08 10:25:53 +08:00
老广 bb30fcd7fd
Merge pull request #9851 from jumpserver/pr@dev@fix_private_key 
fix: 修复 ed25519 私钥测试可连接性失败问题
 2023-03-07 11:29:10 +08:00
Eric eedc1ae8b5 fix: 修复类型问题 2023-03-02 19:05:27 +08:00
Eric b951ed9206 fix: 修复 account 私钥文件生成 2023-03-02 18:57:49 +08:00
Eric 03cc487fe6 fix: 修复 ed25519 私钥测试可连接性失败问题 2023-03-02 18:50:09 +08:00
feng 22f3caa954 fix: 修复i8n 500 2023-03-02 16:23:16 +08:00
Bai 891c478d13 fix: 修复 ldap 用户登录时邮箱存在 500 的问题 2023-03-02 16:22:55 +08:00
Bai 1901ef7252 fix: 修复 ldap 用户登录时邮箱存在 500 的问题 2023-03-02 15:58:32 +08:00
Aaron3S 6bc2f73f49 fix: 修复作业执行没有日志权限的问题 2023-03-01 18:37:27 +08:00
fit2bot 820971e2be
perf: k8s tree run (#9834) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-01 18:26:54 +08:00
Bai 27e1c17b26 fix: 资产类型树返回类型节点时, 没有platfrom设置isParent为False, 解决展开节点重复的问题 2023-03-01 17:28:39 +08:00
fit2bot d8d73700ea
perf: k8s tree update api (#9827) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-01 17:04:17 +08:00
ibuler ed967dcba9 perf: 优化翻译 2023-03-01 15:20:55 +08:00
Bai c39acc9a93 fix: 修改翻译 Core API & HelpText 2023-03-01 15:20:27 +08:00
Bai c37e2d3dc2 fix: 修改翻译 已有 RDS 许可证 2023-03-01 15:20:27 +08:00
fit2bot 797c7635a7
perf: asset hardwareinfo (#9813) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-28 18:45:38 +08:00
老广 410668c209
Merge pull request #9812 from jumpserver/pr@dev@perf_rd_license 
perf: 优化 RD License 配置
 2023-02-28 18:31:16 +08:00
吴小白 3cbd772c4e perf: 优化 RD License 配置 2023-02-28 18:00:08 +08:00
Bai bc2d4735c1 fix: 修改翻译 2023-02-28 17:59:04 +08:00
fit2bot dfa3f4b53b
perf: 推送账号 社区版定时任务关闭 (#9804) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-28 13:35:17 +08:00
ibuler 8c81e60a1e perf: 修改协议创建时一些默认值 2023-02-27 19:48:07 +08:00
fit2bot fccdb66530
perf: 今日活跃资产 (#9796) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-27 18:10:08 +08:00
Aaron3S 094ad85d39 fix: 默认增加普通用户作业中心权限 2023-02-27 17:27:45 +08:00
ibuler 32081ea6ec perf: 添加账号用户名的推荐 
perf: 修改账号推荐
 2023-02-27 15:19:59 +08:00
ibuler 8937447955 perf: 修改资产 address 长度，以支持 mb4 
perf: 修改长度
 2023-02-27 14:07:54 +08:00
ibuler 454a38f994 perf: 去掉没有 Name 的迁移 2023-02-27 14:02:30 +08:00
老广 972d6fb924
Merge pull request #9777 from jumpserver/pr@dev@perf_account_migrate2 
perf: 优化迁移 accounts
 2023-02-27 10:08:00 +08:00
ibuler d2b6bb5013 perf: 优化迁移 accounts 
perf: 优化账号迁移，同名的迁移到历史中
 2023-02-26 09:47:40 +08:00
老广 ec31b4de73
Merge pull request #9759 from jumpserver/pr@dev@fix_activity_save_error 
fix: 解决Activity保存因为参数出错问题
 2023-02-24 18:18:18 +08:00
fit2bot f1c568dfc0
perf: 修改host info 接口, 社区开放applet, 修改改密发邮件bug (#9757) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-24 18:08:22 +08:00
jiangweidong 824e4c9e81 fix: 解决Activity保存因为参数出错问题 2023-02-24 17:59:32 +08:00
Bai 6541cd9f5f fix: 修复 web gui 支持的数据库 2023-02-24 15:12:41 +08:00
ibuler 22a1d60e3f perf: 优化 msg 2023-02-24 14:46:43 +08:00
Bai 63ca4f8fab fix: 修复认证MFA失败次数清空问题 2023-02-24 14:44:13 +08:00
fit2bot a4a871ff2b
fix: 修复计算今日活跃资产过滤逻辑 (#9745) 
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-24 12:16:45 +08:00
Bai 1b2de703f4 fix: 修复获取授权资产详情时返回 spec_info 字段, 解决连接 Magnus 问题 2023-02-24 11:41:15 +08:00
ibuler 0f338a3b58 perf: 修复社区版可能引起的问题 2023-02-24 00:31:38 +08:00
Bai 05d40a5255 fix: 修复平台列表创建同名校验问题 2023-02-23 19:57:55 +08:00
Bai 9b852f8b35 fix: 修复角色列表排序问题 2023-02-23 19:40:01 +08:00
fit2bot b3851adfe7
perf: translate (#9730) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 19:35:10 +08:00
Jiangjie.Bai 0a374db606
fix: 修复文件导出 {"": True"} 问题 (#9729) 2023-02-23 19:14:58 +08:00
老广 54239c9d44
Merge pull request #9725 from jumpserver/ssh_tunnel_no_auth_error 
fix: 对于网关无法连接的，给出原因并停止此任务的后续步骤，不影响其他任务
 2023-02-23 19:09:40 +08:00
fit2bot 37f7f1b510
fix: 修改查看 celery 日志的权限位 (#9728) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-23 19:06:08 +08:00
fit2bot ab0a1421a0
perf: push_account_enabled (#9727) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 18:55:15 +08:00
jiangweidong 10dad85e9f Merge branch 'dev' of http://github.com/jumpserver/jumpserver into ssh_tunnel_no_auth_error 2023-02-23 18:17:38 +08:00
jiangweidong e45eb96f12 fix: 对于网关无法连接的，给出原因并停止此任务的后续步骤，不影响其他任务 2023-02-23 18:15:31 +08:00
fit2bot b797b46ab8
perf: translate (#9724) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 18:14:44 +08:00
fit2bot 9f8900041d
per: gather account perm (#9723) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-02-23 18:08:56 +08:00
老广 aa81db57b1
Merge pull request #9722 from jumpserver/pr@dev@perf_asset_update 
perf: 优化资产批量更新
 2023-02-23 17:54:09 +08:00
ibuler 1a9cd2dee2 perf: 优化资产批量更新 2023-02-23 17:44:38 +08:00
fit2bot b2f38c2218
perf: 增加定时任务清理僵尸作业 (#9714) 
* perf: 增加定时任务清理僵尸作业

* perf: 优化代码结构

* fix: 修改翻译

* perf: 延长清理间隔时间

* perf: 添加优先级括号

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-23 17:01:24 +08:00
jiangweidong e1a1e838bf perf: 修改认证设置类的国际化，字符串方式会直接翻译成国际化内容 2023-02-23 16:59:35 +08:00
老广 4a36e54030
Merge pull request #9710 from jumpserver/pr@dev@fix_task_activity_error 
fix: 创建用户和验证账号任务的Activity日志保存失败
 2023-02-23 16:31:44 +08:00
jiangweidong 9c599fd1f4 fix: 更改label 2023-02-23 16:25:02 +08:00
jiangweidong 0a5766edd3 fix: 操作日志的国际化应该根据查询对象的语言决定 2023-02-23 16:20:43 +08:00
ibuler d1b807bd8b perf: 修改 account asset auto_info 返回 2023-02-23 16:14:24 +08:00
fit2bot 3ee2bfce9a
perf: 优化连接方式 (#9716) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-02-23 15:58:55 +08:00
老广 68ea8ef1b7
Merge pull request #9713 from jumpserver/pr@dev@perf_agent_check 
perf: 修改 agent 判断
 2023-02-23 15:27:12 +08:00
ibuler ee926cfa42 perf: 修改 agent 判断 2023-02-23 15:04:07 +08:00
Bai d4435799ac fix: 授权规则账号列表返回asset.auto_info字段 2023-02-23 11:45:56 +08:00
fit2bot aaeef83d38
perf: history account secret (#9711) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-23 11:27:03 +08:00
jiangweidong c2b592f6fe fix: 创建用户和验证账号任务的Activity日志保存失败 2023-02-23 10:46:59 +08:00
老广 4ec7a4a118
Merge pull request #9707 from jumpserver/pr@dev@fix_serializer 
perf: 修复 role user serializer 问题
 2023-02-22 22:21:13 +08:00
ibuler c4982dd3b5 perf: 修复 role user serializer 问题 2023-02-22 22:20:11 +08:00
fit2bot 2279219404
perf: 工单备注 markdown (#9706) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 22:12:50 +08:00
老广 58341a9e85
Merge pull request #9689 from jumpserver/pr@dev@fix_operatelog_root_org 
fix: 操作日志、Activity日志显示当前组织和SYSTEM组织下的内容
 2023-02-22 22:09:26 +08:00
老广 ce8be265e7
Merge pull request #9705 from jumpserver/pr@dev@perf_perm_migrate 
perf: 优化迁移
 2023-02-22 21:58:41 +08:00
ibuler b8b25d2da8 perf: 修改 翻译 2023-02-22 21:57:48 +08:00
jiangweidong 07c23c5341 perf: 解决冲突 2023-02-22 21:56:40 +08:00
ibuler 37524106bf perf: 优化迁移 2023-02-22 21:52:37 +08:00
jiangweidong 6b6f844795 fix: 修改org_id位置 2023-02-22 21:48:11 +08:00
Aaron3S 25bd5c71d1 fix: 增加无法读取的文件提示 2023-02-22 21:27:14 +08:00
Aaron3S 9b2f422622 perf: 优化报错代码 2023-02-22 21:14:13 +08:00
Bai 49c7a12bb3 fix: 修复资产授权规则过滤 2023-02-22 21:07:49 +08:00
老广 ad0fc0d70a
Merge pull request #9699 from jumpserver/pr@dev@perf_field 
perf: 优化部分 field
 2023-02-22 20:39:51 +08:00
老广 0b1f6e2606
Merge pull request #9693 from jumpserver/pr@dev@perf_accounts_version 
perf: 优化账号历史
 2023-02-22 20:38:52 +08:00
fit2bot b83667bbd5
perf: celery task and add org single (#9698) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 20:31:20 +08:00
ibuler ea31de0b2b perf: 优化部分 field 2023-02-22 20:30:43 +08:00
jiangweidong bcbab0ff49 fix: 解决冲突 2023-02-22 20:17:33 +08:00
jiangweidong 9207ee73ea fix: 解决Oracle验证账号任务失败问题 2023-02-22 20:16:04 +08:00
Eric_Lee 17a96a5b48
Merge pull request #9696 from jumpserver/pr@dev@fix_add_perm_classes 
fix: 添加 api permission_classes
 2023-02-22 20:07:41 +08:00
Aaron3S d14010d4fa fix: 添加 api permission_classes 2023-02-22 20:04:00 +08:00
fit2bot ec4cdc801f
perf: operate log amount (#9695) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 19:42:40 +08:00
fit2bot ddcd09c6a6
fix: 修复最后执行时间不更新的问题 (#9694) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-22 18:53:35 +08:00