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

6167 Commits (bcb4e04200a9cec1438bd94d753e1a09f8948e4d)

Author SHA1 Message Date
Eric b58488a7e9 perf: connection token api 兼容处理 2023-04-10 16:43:31 +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
吴小白 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
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
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
jiangweidong 6aaa20ba17 Perf: 优化 2023-04-03 09:57:40 +08:00
jiangweidong 4c5e47cb99 perf: 普通用户工单申请时，选择指定账号，提示无权限 2023-03-30 16:26:12 +08:00
jiangweidong cfe0206179 feat: winrm协议支持网域自动化 2023-03-30 14:58:20 +08:00
吴小白 caef6a5052 perf: applet 使用 powershell 部署 2023-03-30 12:09:03 +08:00
老广 0cd6667ede
Merge pull request #10079 from jumpserver/pr@dev@perf_super_switch 
perf: 支持 super 方式的切换用户
 2023-03-30 10:24:43 +08:00
jiangweidong bc186df8d5 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into pr@dev@feat_windows_winrm 2023-03-29 17:11:07 +08:00
jiangweidong cab72c6991 feat: Windows类型资产增加winrm协议 2023-03-29 17:10:58 +08:00
Eric 344451ba55 perf: navicat 移到企业版 2023-03-29 14:56:20 +08:00
feng 678df5bf3e perf: 补回get_terminal_latest_stat 方法 2023-03-29 14:03:35 +08:00
fit2bot 8d3319717e
perf: 开启安全模式后过滤root administrator (#10089) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-28 16:26:40 +08:00
fit2bot 23b13db9e2
perf: category order (#10087) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-28 15:04:24 +08:00
Bai 3fa1b46312 fix: 修复授权规则Util类 2023-03-28 11:39:19 +08:00
jiangweidong 5b87470b5c perf: 优化账号活动日志界面的提示及操作日志的字段内容 2023-03-27 18:23:55 +08:00
Eric 118d33fa02 perf: 支持 super 方式的切换用户 2023-03-27 18:06:30 +08:00
Aaron3S 017682b383 perf: 增加我的资产通过 node_id 过滤我的资产 2023-03-27 14:53:39 +08:00
feng 1ac2fec13f feat: 收集账号 可选同步表 2023-03-27 14:13:44 +08:00
Bai 66d368f882 fix: 修改nodes_display required = False 2023-03-24 17:11:03 +08:00
Bai 30ab6836ab fix: 修改 login_button 2023-03-24 17:09:07 +08:00
fit2bot 55e1ef116b
perf: clear secret (#10053) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 16:04:09 +08:00
Bai 5d022c7056 fix: 修复资产导入支持填写节点路径 2023-03-23 16:01:19 +08:00
fit2bot f6c5c35a2c
feat: 账号收集批量同步账号 (#10051) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 15:24:19 +08:00
fit2bot 166d074adb
perf: 修改 port (#10049) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-23 14:13:08 +08:00
fit2bot 3b45ad0c61
feat: account remove secret (#10045) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-23 11:20:48 +08:00
老广 4b8fd64c5d
Merge pull request #10041 from jumpserver/pr@dev@feat_k8s_support_gateway 
feat: k8s 支持 gateway
 2023-03-22 19:43:54 +08:00
ibuler e3bd698baf feat: k8s 支持 gateway 2023-03-22 19:42:51 +08:00
fit2bot 0be3cb3c27
fix: account update (#10039) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 19:14:43 +08:00
fit2bot f7ae23f7d9
perf: 导入资产账号模版api优化 (#10038) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-03-22 18:35:23 +08:00
ibuler 1e0a6b5072 perf: 优化一下 2023-03-22 17:17:49 +08:00
ibuler c6071740b1 perf: 硬件设备支持账号切换 2023-03-22 16:43:00 +08:00
老广 463d54a4d8
Merge pull request #10023 from jumpserver/pr@dev@asset_accounts_secret_type_default 
perf: 设置资产账号的默认值，方便导入
 2023-03-22 15:38:26 +08:00
老广 8289e4c2c8
Merge pull request #10032 from jumpserver/pr@dev@platform_set_protocols 
perf: 修改 platform protocols
 2023-03-22 15:38:01 +08:00
ibuler aca0d62feb perf: 优化 protocols 2023-03-22 15:28:05 +08:00
ibuler 59d9572d07 perf: 优化 protocol 选择 2023-03-22 15:26:23 +08:00
ibuler ba076f6612 perf: 优化提示 2023-03-22 14:56:20 +08:00
fit2bot 43d805d0ca
perf: 配置CHANGE_AUTH_PLAN_SECURE_MODE_ENABLED 对改密的特权账号过滤 (#10033) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 14:48:05 +08:00
ibuler 180ded1773 perf: 修改 platform protocols 2023-03-22 14:15:25 +08:00
fit2bot 81b04c449a
fix: tanslate (#10031) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 13:47:12 +08:00
fit2bot ed4a4ceca1
perf: 批量创建账号 定义创建账号策略 忽略或抛出错误 (#10028) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-22 11:09:48 +08:00
ibuler cac59db1ec perf: 设置资产账号的默认值，方便导入 2023-03-21 12:43:54 +08:00
fit2bot 9413fd4cd1
perf: 支持 iframe 标签选择 (#9908) 
* perf: 支持 iframe 标签选择

* perf: 完善 iframe 的选择语法

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-03-20 17:26:47 +08:00
jiangweidong bac296f82e
Merge pull request #10015 from O-Jiangweidong/pr@dev@perf_dbeaver_no_upgrade_no_download 
perf: DBeaver连接时不检查更新、不提示创建实例数据库、不弹出下载驱动框
 2023-03-20 16:01:37 +08:00
fit2bot 69cd7bce17
perf: 批量创建账号时，跳过unique检查 不去创建 (#9966) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-20 15:45:21 +08:00
ibuler 44b6fd8771 fix: 去掉 warning 2023-03-20 10:05:29 +08:00
jiangweidong b6ccc53a71 perf: DBeaver连接时不检查更新、不提示创建实例数据库、不弹出下载驱动框 2023-03-20 10:02:50 +08:00
ibuler 209f0d72b4 perf: 去掉 warning 2023-03-20 10:01:42 +08:00
ibuler eac4b41783 perf: 优化 warning 2023-03-20 09:59:34 +08:00
老广 7a35309e88
Merge pull request #10009 from WeiZhixiong/dev 
fix: SyntaxWarning, apps/common/drf/parsers/base.py:114, "is" should be "=="
 2023-03-20 09:51:40 +08:00
fit2bot 39e618c127
perf: 资产批量更新平台 (#10013) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-19 23:55:16 +08:00
WeiZhixiong 8e33c6f422
fix: SyntaxWarning, apps/common/drf/parsers/base.py:114, "is" should be "==" 2023-03-18 23:19:51 +08:00
ibuler f5523aaf7b perf: 优化导入导出 2023-03-17 10:45:45 +00:00
ibuler 12db64ea18 perf: 优化导入导出 2023-03-17 18:44:21 +08:00
fit2bot 1acfdf0398
perf: 批量推送账号 分批处理 (#10000) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-17 17:10:10 +08:00
ibuler c094bce71e perf: 优化 ansible 写法 2023-03-17 16:57:40 +08:00
ibuler cad6fffd74 perf: 优化 Ansible 账号选择 2023-03-16 19:09:29 +08:00
Bai 93a7cee4de fix: 修复导出账号历史翻译信息 2023-03-16 11:18:41 +08:00
Bai 41edeb9027 fix: 修复日志记录到syslog时中文编码问题 2023-03-15 19:46:01 +08:00
ibuler 891d9d36b0 fix: windows 平台默认不开启 console 2023-03-15 19:01:18 +08:00
fit2bot ebdd67d0f4
perf: endpoint rules list (#9975) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-15 18:24:39 +08:00
老广 09eebd7486
Merge pull request #9970 from jumpserver/pr@dev@perf_platform_change 
perf: 优化资产平台的获取
 2023-03-15 17:37:12 +08:00
Bai 894955dd68 fix: 修复更新授权报错的问题 2023-03-15 16:33:38 +08:00
halo 0ade034391 fix: 修复celery api 报错 2023-03-15 15:37:15 +08:00
jiangweidong 07eebd93fb
perf: 测试资产可连接性选择账号策略优化 (#9954) 2023-03-15 15:16:27 +08:00
Bai ffe9dd1f95 fix: 优化账号模版可以根据 protocols 过滤 secret_type 字段 2023-03-15 14:48:14 +08:00
ibuler 2b7f90349c perf: 优化资产平台的获取 2023-03-15 14:14:48 +08:00
Bai 48b937d867 fix: 修复手动登录用户失败的问题 2023-03-15 11:36:51 +08:00
Aaron3S df249a0355 perf: 优化 playbook 删除策略,正在被 job 使用时无法被删除 2023-03-14 20:02:23 +08:00
fit2bot 2ce293bd81
fix: push ssh key account bug (#9948) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 17:15:04 +08:00
老广 bff97929b5
Merge pull request #9942 from jumpserver/pr@dev@perf_csv_loads_error 
perf: 优化 csv parse
 2023-03-14 16:35:37 +08:00
Bai 0053d469f9 fix: 修复用户导入模版中没有 password_strategy 字段问题 2023-03-14 16:31:57 +08:00
ibuler 4c24e95b47 perf: 优化 csv parse 2023-03-14 14:12:42 +08:00
fit2bot c4945b3563
perf: 优化ansible 选择账号 (#9940) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-14 11:40:25 +08:00
ibuler 082af029a7 perf: 优化资产迁移，避免冲突 2023-03-14 11:21:52 +08:00
Bai 44d7165674 perf: 优化一些翻译信息，label 中带单位 2023-03-14 11:19:41 +08:00
fit2bot d4102ceb7a
perf: push select account (#9932) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 19:35:12 +08:00
老广 4a3196e193
Merge pull request #9931 from jumpserver/pr@dev@fix_excel_import_export 
perf: 优化 csv import export
 2023-03-13 18:07:57 +08:00
ibuler 16a7ccc95e perf: 优化文案 2023-03-13 18:06:54 +08:00
ibuler 6bb42b8d59 perf: 优化 csv import export 2023-03-13 17:57:50 +08:00
fit2bot ed70432016
fix: 账号模版创建带密码的密钥之后无法添加到主机 (#9927) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-13 15:46:17 +08:00
halo 9f98e3f098 fix: 远程应用特权用户不生效问题 2023-03-12 21:27:30 +08:00
ibuler 2ffb9a5aa3 perf: 修改 Import export 2023-03-10 19:23:49 +08:00
ibuler fa3bfceddc perf: 优化导入导出 
perf: remove debug

perf: 修改账号导入导出

perf: 去掉一些 debug
 2023-03-10 19:23:49 +08:00
fit2bot 3658ecce0c
perf: 修改 ssh key with pass 报错 (#9917) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-03-10 16:04:48 +08:00
Bai aeb2e47880 feat: 支持飞书国际版(lark) 2023-03-10 15:13:12 +08:00
Bai 9be01b4c67 feat: 支持飞书国际版(lark) 2023-03-10 15:13:12 +08:00
Bai 83296be11f fix: ignore 2023-03-09 18:12:56 +08:00
Bai 266f5e9350 fix: 修复存在无效 es 时获取终端配置失败的问题 2023-03-09 17:12:05 +08:00
fit2bot dfbe8c0bc4
fix: 创建资产 可连接性为更新 (#9905) 
Co-authored-by: feng <1304903146@qq.com>
 2023-03-09 13:59:44 +08:00
jiangweidong 3de2992238 fix: 有可能保存明文密码 2023-03-09 13:02:34 +08:00
Eric fde92a28bd fix: 修复存储故障造成的录像获取失败问题 2023-03-09 11:51:00 +08:00
吴小白 2662ead1c4 perf: 正确配置 Ansible 证书校验 2023-03-09 11:19:24 +08:00
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
Eric_Lee a4e920e410
Merge pull request #9688 from jumpserver/pr@dev@fix_job_center_account_not_in_perm 
fix: 修复作业中心资产和用于没有过滤授权规则的问题
 2023-02-22 18:51:04 +08:00
Aaron3S 34386bd6fb fix: 修改生成 inventory 错误代码，增加运行作业权限校验 2023-02-22 18:06:46 +08:00
ibuler 5d8d0a320b perf: 优化账号历史 2023-02-22 17:58:00 +08:00
fit2bot 042108a9c0
perf: k8s account @input (#9692) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 17:56:20 +08:00
Eric 8eaf3fa781 perf: 部分字段 label 显示问题 2023-02-22 16:48:49 +08:00
fit2bot 7ceb27301b
perf: automation task name validate (#9690) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 16:23:18 +08:00
jiangweidong 0dba222796 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_operatelog_root_org 2023-02-22 15:57:17 +08:00
jiangweidong b9c0b9084e fix: 操作日志显示全部组织问题 2023-02-22 15:57:10 +08:00
Aaron3S d9a11900a9 fix: 修复作业中心资产和用于没有过滤授权规则的问题 2023-02-22 15:36:25 +08:00
ibuler e5081fd6a9 merge: with dev 2023-02-22 15:17:44 +08:00
fit2bot 89c4635162
perf: change secrett 提示 (#9686) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 15:15:00 +08:00
ibuler 33f6c5b257 perf: 修改 探测 2023-02-22 15:13:51 +08:00
Bai 156ad665c3 fix: rbac perms 2023-02-22 14:54:13 +08:00
Eric 312fe69015 fix: 修复发布应用失败 2023-02-22 14:10:13 +08:00
老广 4b8e2d464f
Merge pull request #9682 from jumpserver/pr@dev@change_platform_migration 
perf: 修复用户平台内置的问题
 2023-02-22 13:17:14 +08:00
ibuler 6f765ebef5 perf: 修复用户平台内置的问题 2023-02-22 13:08:32 +08:00
Eric_Lee bbd274b92f
Merge pull request #9681 from jumpserver/pr@dev@fix_host_select 
fix: 过滤离线的发布机
 2023-02-22 12:29:31 +08:00
Eric f407bfd7b2 fix: 过滤离线的发布机 2023-02-22 12:27:30 +08:00
jiangweidong fd146055f3 fix: 删除空行 2023-02-22 11:46:28 +08:00
jiangweidong cde59f7ae8 perf: 解决冲突 2023-02-22 11:44:46 +08:00
ibuler 0996b1fbf5 merge: with dev 2023-02-22 11:27:53 +08:00
ibuler b5321e497b perf: 修改账号去掉无用的 2023-02-22 11:25:33 +08:00
ibuler 0140d4349a perf: 修改 优化去掉版本号 2023-02-22 11:23:43 +08:00
老广 f103fa22c9
Merge pull request #9673 from jumpserver/pr@dev@fix_manual_update_account_can_ping_ok 
fix: 解决部分数据库在修改密码后仍能ping通的问题
 2023-02-22 11:21:58 +08:00
ibuler fae494d707 perf: 修改 acount 2023-02-22 11:20:57 +08:00
ibuler 4c233cfb69 perf: 优化 account，去掉版本好 2023-02-22 11:18:42 +08:00
fit2bot b9dcce5c51
fix: 资产更新没有账号及自动化任务更新name (#9679) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-22 11:04:29 +08:00
fit2bot d7946ccb6f
perf: 账号 资产 列表任务 (#9676) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 22:57:31 +08:00
fit2bot 7f1cbc8336
fix: except 无法解压的文件包 (#9677) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 22:52:52 +08:00
fit2bot 1bb128526a
fix: 修复使用key 方式 ansible 不能连接的问题 (#9675) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 22:45:02 +08:00
Eric 8f5d280e31 fix: 未激活的发布机，将无法使用 2023-02-21 22:25:50 +08:00