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
老广 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
jiangweidong 02619e5ed8 fix: 解决部分数据库在修改密码后仍能ping通的问题 2023-02-21 22:08:34 +08:00
Eric_Lee 5add329a30
Merge pull request #9672 from jumpserver/pr@dev@fix_su_from 
fix: 账号 su from 过滤未生效
 2023-02-21 21:12:20 +08:00
Eric 4200fa7ff8 fix: 账号 su from 过滤未生效 2023-02-21 21:09:28 +08:00
jiangweidong 9c851cbd68 perf: 解决冲突 2023-02-21 20:32:44 +08:00
jiangweidong def5989cdc perf: 支持数据库网域执行Task 2023-02-21 20:27:44 +08:00
Eric_Lee a11eac7c3a
Merge pull request #9660 from jumpserver/pr@dev@perf_applethost 
perf: 修改发布机选项默认值
 2023-02-21 20:14:08 +08:00
Eric_Lee 0d8e0bd1cc
Merge pull request #9666 from jumpserver/pr@dev@fix_rdp_download 
fix: rdp file download
 2023-02-21 20:13:36 +08:00
Eric_Lee 85dbdd648f
Merge pull request #9669 from jumpserver/pr@dev@fix_ftp_log 
fix: 修复 ftp 审计日志上传失败
 2023-02-21 20:13:08 +08:00
fit2bot 0bd674bb9c
perf: ansible enabled false (#9670) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 20:06:45 +08:00
Eric 31a3e3b177 fix: 修复 ftp 审计日志上传失败 2023-02-21 19:35:35 +08:00
fit2bot b41880d4f2
perf: 自动化name 唯一键 校验 (#9668) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 18:31:42 +08:00
fit2bot 266e7e0dd7
perf: change secret is_active (#9667) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 17:54:59 +08:00
Eric 3f9f3f3290 fix: rdp file download 2023-02-21 17:39:33 +08:00
老广 b5d814e9be
Merge pull request #9665 from jumpserver/pr@dev@fix_platform_internal 
perf: 修改 platform 内置创建
 2023-02-21 15:50:58 +08:00
ibuler 771ea17469 perf: 修改 platform 内置创建 2023-02-21 15:49:59 +08:00
fit2bot 4735565cb8
perf: inventory 为空 任务跳过 (#9664) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 15:33:15 +08:00
fit2bot e4d28f5f3e
fix: 修复 playbook 编辑器无法清空内容的bug (#9663) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-21 15:22:08 +08:00
fit2bot 1caca32a26
perf: merge asset migrate (#9662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 15:15:26 +08:00
Eric 64e929a220 perf: 修改发布机选项默认值 2023-02-21 14:20:03 +08:00
ibuler 3df411fd61 perf: 修改权限位 2023-02-21 13:47:47 +08:00
ibuler 82432299b8 merge: with dev 2023-02-21 13:47:08 +08:00
ibuler df9e533b3c perf: 修改 rabc 2023-02-21 13:40:48 +08:00
ibuler 0001ffba1b perf: 优化 rbac 2023-02-21 13:39:28 +08:00
ibuler f4cc03434f perf: 修改 rbac asset nodes 2023-02-21 13:11:56 +08:00
ibuler e67a876513 perf: 优化账号任务 2023-02-21 13:00:04 +08:00
Eric_Lee f46b707f70
Merge pull request #9659 from jumpserver/pr@dev@fix_deployment 
fix: 修复应用发布状态
 2023-02-21 12:21:05 +08:00
Eric f5d086702a fix: 修复应用发布状态 2023-02-21 12:12:38 +08:00
jiangweidong b5347be4e3
perf: Navicat为xpack功能 (#9650) 
* perf: Navicat移动到xpack功能

* 优化

* fix: 去掉多余的import

* perf: 优化逻辑

* perf: 修改打印位置
 2023-02-21 11:37:30 +08:00
fit2bot c8e1660f7e
perf: windows not ssh automation (#9658) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-21 11:36:17 +08:00
ibuler b49b7125b2 perf: 修改收集用户中间 2023-02-21 08:34:31 +08:00
ibuler c9534bb9c4 perf: 优化账号推送 2023-02-20 23:50:33 +08:00
jiangweidong 296ce7a59f perf: 优化执行命令 2023-02-20 22:21:46 +08:00
jiangweidong 28e28b620b perf: 优化DBeaver连接数据库时，不显示cli-dos窗口 2023-02-20 22:10:59 +08:00
fit2bot ca22b08cde
perf: account update (#9656) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 20:22:26 +08:00
Bai 1888597451 fix: 修改slugfield校验问题 2023-02-20 20:15:47 +08:00
fit2bot 137d69a539
perf: ansible runner logs (#9655) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 20:14:06 +08:00
fit2bot b76ed67c9c
perf: 超时过期时间 解释 (#9653) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 19:21:32 +08:00
fit2bot 95eeeb4208
perf: 自动化脱敏 aix (#9652) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 19:12:57 +08:00
Bai 2adfbeaeb7 fix: 修复终端列表搜索问题 2023-02-20 18:42:56 +08:00
Aaron3S 958122847b fix: 作业日志搜索过滤问题 2023-02-20 18:00:58 +08:00
Eric e001003ed3 perf: 完善发布机的重复部署 2023-02-20 18:00:30 +08:00
ibuler 37c54e976f perf： 优化 tasks 2023-02-20 18:00:29 +08:00
Bai 8ab01931fb fix: 修复logger.error堆栈问题 2023-02-20 17:59:18 +08:00
Bai d246b9bb35 fix: 修复资产硬件信息收集失败的问题 2023-02-20 17:25:16 +08:00
fit2bot 995321cee9
perf: 工单详情跨组织 (#9644) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-20 16:48:52 +08:00
fit2bot 30e51e37be
fix: 修复华为 SMS 提示不友好 (#9643) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 16:46:28 +08:00
老广 17a77586f7
Merge pull request #9641 from jumpserver/pr@dev@perf_ansible_gateway 
fix: 修复 ansible 网关问题
 2023-02-20 16:22:39 +08:00
ibuler 9644d8b1bc fix: 修复 ansible 网关问题 2023-02-20 16:20:03 +08:00
fit2bot 614aa069b0
fix: 添加 str 方法, 修复操作日志不友好的问题 (#9640) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 16:05:35 +08:00
fit2bot d334b09fa6
fix: 修改playbook 创建的序列类 (#9639) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-20 15:50:43 +08:00
Bai 90813d7690 fix: 修改翻译 2023-02-20 15:24:43 +08:00
Bai c456782d9e fix: 修复 ticket session 监控用户没有权限的问题 2023-02-20 15:09:10 +08:00
ibuler ca6d71f442 perf: 优化 celery task context 2023-02-20 15:03:36 +08:00
老广 7c3b98cf3b
Merge pull request #9634 from jumpserver/pr@dev@perf_audit_log2 
pref: 优化 audit log
 2023-02-20 14:24:16 +08:00
老广 a25d9ffdf5
Merge pull request #9632 from jumpserver/pr@dev@perf_navicat_support_mongodb_ssl 
Feat: 支持navicat连接MongoDB SSL连接
 2023-02-20 14:15:26 +08:00
ibuler ce2c3d7ce2 pref: 优化 audit log 2023-02-20 14:13:22 +08:00
jiangweidong c2773351af Fix: 解决资产创建后系统执行Ping及Gather任务失败问题 2023-02-20 14:06:26 +08:00
jiangweidong 2e451574ee Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat_support_mongodb_ssl 2023-02-20 14:03:19 +08:00
jiangweidong 6cedb90f1b Feat: 支持navicat连接MongoDB SSL连接 2023-02-20 14:03:07 +08:00
老广 5058d8158d
Merge pull request #9631 from jumpserver/pr@dev@perf_ordering 
perf: 优化排序
 2023-02-20 13:41:30 +08:00
ibuler bb0bb4e764 perf: domain serializer 2023-02-20 13:40:42 +08:00
ibuler 4818e759bc perf: 优化 一些继承 2023-02-20 13:36:50 +08:00
ibuler 492dd34cb8 perf: 优化排序 2023-02-20 13:31:56 +08:00
Bai ec582e37dc fix: 修复录像返回数据 system_user -> account 2023-02-20 11:21:05 +08:00
Bai 0888fb2318 fix: 修复账号模版密码API查看权限问题 2023-02-20 10:57:52 +08:00
jiangweidong 37f74d7d73 fix: 格式看起来好看 2023-02-19 20:27:25 +08:00
jiangweidong 7837a28200 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_platform_activity_err 2023-02-19 20:20:49 +08:00
jiangweidong 3e7eef2522 fix: 平台Activity列表500 2023-02-19 20:20:42 +08:00
老广 7ea9b4d429
Merge pull request #9625 from jumpserver/pr@dev@fix_clean_activity_with_operation 
fix: 解决跨组织资源的Activty在其他组织下404的问题
 2023-02-19 20:05:42 +08:00
jiangweidong 485454f9c6 fix: 解决JobLog表依赖顺序不对，导致从新迁移失败问题 2023-02-19 19:49:06 +08:00
jiangweidong 3334f79e84 fix: 解决跨组织资源的Activty在其他组织下404的问题 2023-02-19 19:17:12 +08:00
ibuler da017f2e78 perf: 修改 ldap task 位置 2023-02-19 17:57:48 +08:00
老广 ba366e64e7
Merge pull request #9623 from jumpserver/pr@dev@account_push 
perf: account push
 2023-02-19 16:03:13 +08:00
feng a4cb1690d6 perf: account push 2023-02-19 16:01:34 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
ibuler 83c844292c perf: 优化 task 参数是 uuid 可能导致的问题 2023-02-19 15:10:10 +08:00
fit2bot bdb963750b
perf: oauth2 perm (#9620) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-18 17:55:11 +08:00
fit2bot fa8fdf71c1
perf: client upgrade (#9619) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-18 17:28:42 +08:00
fit2bot 9ed1b8fc86
perf: 修改 swagger 查询 (#9616) 
* perf: 修改 swagger 查询

* perf: 修改 operate log

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 21:11:06 +08:00
Bai 1035e27201 fix: 解决 swagger api 报错的问题 2023-02-17 21:10:16 +08:00
fit2bot 2b29ce69f4
perf: api dashboard (#9615) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 20:18:22 +08:00
fit2bot 60bdd17ca2
perf: login logs (#9614) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-02-17 20:15:52 +08:00
Aaron3S a79a766a6a fix: 修改 job 审计日志 2023-02-17 20:14:11 +08:00
Eric 40b49e258e perf: 去掉 tunnel 和 command 会话的监控 2023-02-17 20:13:51 +08:00
老广 2877ea0e3b
Merge pull request #9611 from jumpserver/pr@dev@perf_ping 
perf: 优化 Ping 和 telnet
 2023-02-17 19:42:50 +08:00
ibuler 10e50c7c2c perf: 修改 Ping 2023-02-17 19:42:14 +08:00
ibuler dd8bc5798b perf: 优化 Ping 和 telnet 2023-02-17 19:38:34 +08:00
Bai fb32c976b2 fix: 翻译所有 celerytask verbose 2023-02-17 19:25:19 +08:00
fit2bot 5f2f38d815
perf: mysql psql database (#9609) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 19:00:44 +08:00
ibuler 3cc22f8524 perf: settings 删掉 windows default shell 2023-02-17 17:19:46 +08:00
ibuler 98355ce468 perf: 优化一波 migrations 2023-02-17 17:19:18 +08:00
jiangweidong 23238ca8e0
fix: 解决一些资源的Activity日志无法查看问题 (#9608) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 17:17:25 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571) 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

* fix: 对 celery 任务添加 activity_callback 回调

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-17 17:14:53 +08:00
jiangweidong 2cecf20944 fix: 远程应用图标无法显示问题 2023-02-17 15:04:30 +08:00
fit2bot 419381bd10
perf: account backup (#9603) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 14:34:51 +08:00
老广 40bd197581
Merge pull request #9601 from jumpserver/pr@dev@feat_protect_resource 
feat: 增加media权限控制
 2023-02-17 14:17:08 +08:00
Bai 1bfb434651 fix: 修复创建网关时, 没有保存到 Host 列表中的问题; 2023-02-17 13:58:08 +08:00
jiangweidong fa5097fe28 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@feat_protect_resource 2023-02-17 13:42:51 +08:00
jiangweidong 12afc2aff5 feat: 增加media权限控制 2023-02-17 13:40:26 +08:00
fit2bot 7040f46565
perf: account view secret mfa (#9600) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 12:30:11 +08:00
Bai d85b024c47 fix: 修复打开 PERM_SINGLE_ASSET_TO_UNGROUP_NODE 配置时返回两个收藏夹节点的问题 2023-02-17 11:11:57 +08:00
jiangweidong 151433004c perf: 去掉dbeaver的clickhouse协议 2023-02-17 10:53:25 +08:00
fit2bot e056b31b4c
perf: 优化 index api 批量命令部分 (#9596) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-16 20:16:04 +08:00
fit2bot f7500b8aff
perf: account perm (#9595) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-16 19:39:10 +08:00
fit2bot fc2d7aafce
perf: push account (#9594) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-16 18:49:42 +08:00
老广 1298cc0a91
Merge pull request #9593 from jumpserver/pr@dev@perf_log_clean 
perf: 修改日志清理
 2023-02-16 18:47:26 +08:00
ibuler 0c30e509dc perf: 修改日志清理 2023-02-16 18:32:04 +08:00
jiangweidong 3b3355f3f8 perf: 修改PostgreSQL数据库参数为必填 2023-02-16 17:33:03 +08:00
老广 9af8c629ca
Merge pull request #9591 from jumpserver/pr@dev@fix_audit_log_search_field 
fix: 修复作业日志页面搜索和时间过滤组件不生效的问题
 2023-02-16 17:23:18 +08:00
老广 1678eeb915
Merge pull request #9587 from jumpserver/pr@dev@perf_gateway 
perf: 优化 gateway 返回情况
 2023-02-16 17:21:36 +08:00
老广 4242727f24
Merge pull request #9589 from jumpserver/pr@dev@perf_conn_method_koko_oracle 
perf: koko 不支持 oracle 登录
 2023-02-16 17:20:44 +08:00
Aaron3S aa7c3041f7 fix: 修复作业日志页面搜索和时间过滤组件不生效的问题 2023-02-16 17:10:46 +08:00
ibuler eff2cd104f perf: koko 不支持 oracle 登录 2023-02-16 16:55:20 +08:00
Bai 22dd81de43 fix: 创建删除节点、资产时，节点资产数量没有刷新的问题，监听的信号不太对，如果是 post_remove 那么获取资产的关联节点是获取不到的 2023-02-16 16:54:24 +08:00
jiangweidong 6bc72c519d
fix: sqlserver无法推送用户问题 (#9588) 2023-02-16 16:53:46 +08:00
ibuler a63709002d perf: 优化 gateway 返回情况 2023-02-16 16:51:42 +08:00
Bai 726f90ab16 fix: 修复创建 es 命令存储后台 meta.hosts 被修改的问题;deepcopy dict list value 在创建操作日志的时候 2023-02-16 15:56:44 +08:00
Bai bfa2e285f5 fix: 修复迁移数据库应用账号缺少的问题 2023-02-16 15:56:44 +08:00
fit2bot b8c872c68e
perf: account cannot be modified (#9585) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-16 15:53:45 +08:00
fit2bot ef33bc211d
fix: 修复任务再次执行报500问题 (#9584) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-16 15:52:21 +08:00
fit2bot e84411588a
fix: 解决playbook 上传500的问题 (#9580) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-16 15:36:54 +08:00
Eric_Lee eae4f76e1f
Merge pull request #9578 from jumpserver/pr@dev@applets_dbeaver 
perf: 优化applets-dbeaver依赖驱动方式
 2023-02-16 15:24:37 +08:00
老广 e1437ac6e6
Merge pull request #9581 from jumpserver/pr@dev@perf_change_account 
perf: 修改 account signal version
 2023-02-16 14:28:25 +08:00
fit2bot ea7d3c0651
perf: dashboard user amount (#9582) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-16 14:27:54 +08:00
ibuler f046ea3560 perf: 修改 account signal version 2023-02-16 14:21:24 +08:00
Bai 7d94e17e03 fix: 修改迁移文件 2023-02-16 14:21:24 +08:00
jiangweidong 541e418946 perf: 优化applets-dbeaver依赖驱动方式 2023-02-16 13:40:34 +08:00
老广 9cd0a348fc
Merge pull request #9575 from jumpserver/pr@dev@perf_session_account_id 
perf: 会话新增 account_id
 2023-02-16 10:13:30 +08:00
老广 e7ec0915a8
Merge pull request #9573 from jumpserver/pr@dev@perf_navicat 
fix: 解决applets在razor方式拉起代填错误问题
 2023-02-15 20:45:29 +08:00
老广 b464261ed3
Merge pull request #9554 from jumpserver/pr@dev@perf_activities_log 
perf: 优化Activity日志[操作日志、登录日志]显示
 2023-02-15 20:44:40 +08:00
jiangweidong 28babc116b Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat 2023-02-15 20:34:53 +08:00
huailei 679cd6a4e1
Merge pull request #9572 from jumpserver/pr@dev@perf_login_page_style 
perf: 调整登录页样式
 2023-02-15 20:31:30 +08:00
“huailei000” 61579bb290 perf: 调整登录页样式 2023-02-15 20:30:12 +08:00
jiangweidong 897c5ca24f Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@perf_navicat 2023-02-15 20:27:18 +08:00
jiangweidong 0f75fab094 fix: 解决applets在razor方式拉起代填错误问题 2023-02-15 20:27:12 +08:00
fit2bot e66168dfa4
perf: account secret 加密 (#9570) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 20:16:01 +08:00
Bai cf2089d826 fix: 修复迁移数据库应用账号缺少的问题 2023-02-15 20:09:14 +08:00
Eric b882b7de1a perf: 会话新增 account_id 2023-02-15 19:53:04 +08:00
老广 8be25e1944
Merge pull request #9568 from jumpserver/pr@dev@fix_koko_ssh 
fix: 修复 koko ssh 方式的连接开关
 2023-02-15 18:24:59 +08:00
Eric f4888304bc fix: 修复 koko ssh 方式的连接开关 2023-02-15 18:16:56 +08:00
fit2bot 7b95d19de6
perf: verify code ttl translate (#9567) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 18:16:24 +08:00
fit2bot 9339cd271a
perf: native method 优化 (#9566) 
* perf: native method 优化

* perf: update docker action test

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-02-15 17:55:29 +08:00
fit2bot 1ec20a8f98
fix: 修复系统设置中关闭magnus 和razor 不生效 (#9563) 
* fix: 修复系统设置中关闭magnus 和razor 不生效

* perf: 优化代码

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-15 17:46:17 +08:00
Eric 75b27b7834 fix: ssh native 不显示问题 2023-02-15 16:53:30 +08:00
fit2bot 4ac214e91d
perf: account task timing not triggered (#9564) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 16:48:27 +08:00
Bai 4109f2cb1c fix: 修改翻译 2023-02-15 16:30:46 +08:00
Eric 8f16c2a14f fix: 完善 DBeaver 安装 2023-02-15 16:05:52 +08:00
fit2bot 18496aba59
perf: sqlserver change_secret (#9560) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-15 15:13:45 +08:00
Bai 0828a0e9ba fix: 修复资产详情授权用户授权规则列表的搜索项 2023-02-15 14:55:02 +08:00
Bai 9a39aca0f1 fix: Session 过滤支持 Terminal Name 和 ID 字段 2023-02-15 14:32:46 +08:00
Aaron3S 757702b99d fix: 整理任务中心权限位 2023-02-15 14:04:03 +08:00
老广 186878366f
Merge pull request #9556 from jumpserver/pr@dev@fix_change_adhoc_model_verbose_name 
fix: 修改 adhoc 的 verbose_name
 2023-02-15 12:44:29 +08:00
jiangweidong d784123c04
feat: 远程应用Applets支持DBeaver (#9537) 
* perf: 远程应用Applets支持DBeaver

* feat: 更改下载路径

* perf: navicat修改不在这个pr中修改

* perf: add patch.yml

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-02-15 12:12:17 +08:00
Bai e25306608b fix: 修复克隆网关没有克隆账号的问题 2023-02-15 11:18:44 +08:00
Aaron3S d8ef556adf fix: 修改 adhoc 的 verbose_name 2023-02-15 11:17:57 +08:00
jiangweidong 7235910a86 perf: 优化Activity日志[操作日志、登录日志]显示 2023-02-15 10:46:37 +08:00
ibuler e466b6e38e perf: 优化产生的 activity 没有 org 2023-02-14 22:56:36 +08:00
老广 27e74f6d77
Merge pull request #9552 from jumpserver/pr@dev@perf_audit_log_to_perfect 
perf: 优化activity log
 2023-02-14 20:11:43 +08:00
ibuler 9a200920ca perf: 修改 asset info 2023-02-14 20:11:04 +08:00
ibuler fd38f5d89d perf: 优化activity log 2023-02-14 20:01:29 +08:00
jiangweidong ced454ca49 perf: 优化远程应用navicat连接时，确定有密码输入框后才输入密码 2023-02-14 19:50:20 +08:00
Aaron3S 1b4c52bc9f fix: 增加作业中心开关 2023-02-14 19:49:47 +08:00
Bai 09b672917a fix: 修复角色更新信号方法 2023-02-14 19:48:39 +08:00
fit2bot f20c803356
perf: ansible_enabled false (#9548) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 18:34:46 +08:00
jiangweidong 7d93c9ebc5 fix: 用户接口不分页时，api异常 2023-02-14 18:15:25 +08:00
Bai ac4a321225 fix: 修复角色列表用户数量字段为0的问题 2023-02-14 18:14:46 +08:00
Aaron3S 44d3f88225 fix: 屏蔽不需要的权限位 2023-02-14 18:14:19 +08:00
Bai 1f4fdc13aa fix: 修复一些 connection-token rbac 权限控制 2023-02-14 17:52:44 +08:00
Bai 174106ff1e fix: 排除一些关于 PermedAsset 相关的权限位 2023-02-14 17:15:32 +08:00
fit2bot 306193ca5f
perf: input_secret (#9542) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 16:53:10 +08:00
Aaron3S bd7e9ce4b9 perf: 优化代码结构 2023-02-14 16:44:42 +08:00
Aaron3S f7bb408ab2 feat: 增加命令过滤功能 2023-02-14 16:44:42 +08:00
fit2bot 26e890a99f
perf: ldap org (#9541) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 16:41:49 +08:00
Bai 2c13439b8a fix: 添加迁移文件 2023-02-14 16:38:28 +08:00
ibuler 786d96ee6e perf: 修改登录 2023-02-14 16:01:35 +08:00
ibuler 8b0a967306 perf: 优化 audit log 2023-02-14 15:53:08 +08:00
Bai 5c98fbbefd fix: 修复添加资产到节点，移除资产从节点，移动资产到节点 API rbac 权限位 2023-02-14 15:35:56 +08:00
Bai 770e7733e7 fix: 修复添加资产到节点，移除资产从节点，移动资产到节点 API rbac 权限位 2023-02-14 15:35:56 +08:00
Bai 71f3fe64b4 fix: 修复获取资产授权的账号 API，过滤未激活的账号 2023-02-14 14:37:21 +08:00
Bai eef067c9ca fix: 修复授权查看组织角色权限问题 2023-02-14 14:18:16 +08:00
ibuler b3244d0215 perf: 优化 redis 平台协议 2023-02-14 13:44:14 +08:00
Bai 18286b674c fix: 修复云同步执行报错的问题(protocols,Asset=>Host) 2023-02-14 11:39:23 +08:00
fit2bot 10d776f7e5
perf: account name required (#9533) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-14 11:37:18 +08:00
Bai 80903d1218 fix: 修复账号密钥查看rbac权限位 2023-02-14 11:30:54 +08:00
jiangweidong 85796acfe4 fix: 创建Web资产报错 2023-02-14 09:52:23 +08:00
老广 33a80cb8ef
Merge pull request #9527 from jumpserver/pr@dev@fix_localhost_script_inject_error 
fix: 过滤 localhost 注入问题
 2023-02-13 20:09:28 +08:00
老广 99e5ac9aa6
Merge pull request #9530 from jumpserver/pr@dev@perf_delay_run 
perf: 优化 delay run
 2023-02-13 20:06:01 +08:00
ibuler 223b73c5c6 perf: 优化 delay run 2023-02-13 20:04:17 +08:00
fit2bot 269cf6628a
perf: gateway auto (#9529) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-13 19:52:49 +08:00
老广 48fe6b975b
Merge pull request #9526 from jumpserver/pr@dev@perf_merge_delay 
perf: 改造 merge_delay_func
 2023-02-13 19:45:36 +08:00
ibuler bd9b1f1a5b perf: 优化 audit log 2023-02-13 19:42:42 +08:00
Aaron3S 011535a02a fix: 过滤 localhost 注入问题 2023-02-13 19:22:52 +08:00
Eric 9cd780eb06 perf: 改造 merge_delay_func 2023-02-13 19:14:00 +08:00
老广 854e0f5fe0
Merge pull request #9516 from jumpserver/pr@dev@perf_mail_test_msg 
perf: 修复测试 smtp 的subject prefix 丢失问题
 2023-02-13 18:25:27 +08:00
老广 0666b1e747
Merge pull request #9519 from jumpserver/pr@dev@perf_test_node_conn 
perf: 优化测试节点可连接性
 2023-02-13 18:24:23 +08:00
fit2bot 66b248db77
perf: 去除 applet 脚本的退出弹窗 (#9525) 
Co-authored-by: Eric <xplzv@126.com>
 2023-02-13 17:11:43 +08:00
Eric fcad5c637a perf: chrome https网站忽略证书 2023-02-13 15:45:31 +08:00
fit2bot eaad297c9c
fix: 修复 playbook 编辑器 main 文件无法修改的问题 (#9521) 
* fix: 修复 playbook 编辑器 main 文件无法修改的问题

* perf: 优化代码

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-13 15:39:29 +08:00
fit2bot 439d3ddf47
perf: 翻译 (#9520) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-13 15:29:48 +08:00
fit2bot 16922c4918
fix: 增加作业中心唯一校验 (#9518) 
* fix: 增加作业中心唯一校验

* fix: 增加迁移文件

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-13 15:05:31 +08:00
ibuler cd866532da perf: 优化测试节点可连接性 2023-02-13 15:04:45 +08:00
fit2bot 7f21e6cb6e
perf: terminal command ordering (#9517) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-13 14:44:17 +08:00
ibuler 29c5fd1191 perf: 修复测试 smtp 的subject prefix 丢失问题 2023-02-13 14:36:17 +08:00
Eric 9c5e4955f2 fix: 修复默认 event loop 冲突问题 2023-02-11 23:00:41 +08:00
老广 d7d7d1174e
Merge pull request #9509 from jumpserver/pr@dev@perf_loop_tasks 
fix: 优化并发延迟执行
 2023-02-10 19:45:25 +08:00
老广 a50b74a989
Merge pull request #9510 from jumpserver/pr@dev@fix_period_task_error 
feat:  修复 JOB 定时任务不执行的问题
 2023-02-10 19:45:04 +08:00
老广 0c2873ae86
Merge pull request #9512 from jumpserver/pr@dev@perf_asset_task 
perf: 优化 applet account 释放
 2023-02-10 19:44:27 +08:00
ibuler df3b76f357 perf: 优化 applet account 释放 2023-02-10 19:40:35 +08:00
fit2bot 64f21a518a
perf: asset gather fact (#9511) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 18:50:11 +08:00
Aaron3S 4daadbfa0a feat: 修复 JOB 定时任务不执行的问题 2023-02-10 18:38:04 +08:00
jiangweidong 564a87304c
perf: 优化关闭弹窗方式及数据库连接名称优化 (#9508) 2023-02-10 18:20:47 +08:00
Eric 78f6f6cf7d fix: 优化并发延迟执行 2023-02-10 18:01:31 +08:00
老广 aa483a3c6d
Merge pull request #9507 from jumpserver/pr@dev@perf_asset_task 
perf: 优化 task
 2023-02-10 17:43:39 +08:00
ibuler dd15286d27 perf: 优化 task 2023-02-10 17:36:15 +08:00
Aaron3S 889542079c fix: 修复仪表盘失败连接数不更新的问题 2023-02-10 16:03:37 +08:00
Bai 5153817ff4 fix: 修复同名用户登录时username设置问题 2023-02-10 16:01:50 +08:00
fit2bot ab132e02d0
perf: k8s tree (#9503) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 15:56:34 +08:00
ibuler 136bec94ca perf: merge with dev 2023-02-10 15:38:40 +08:00
ibuler f192567072 perf: remove debug 2023-02-10 15:21:48 +08:00
ibuler 98a2d39a04 perf: merge with remote 2023-02-10 15:08:33 +08:00
老广 b85b6a38e2
Merge pull request #9449 from jumpserver/pr@dev@perf_activity 
perf: 增加Activity日志中此资源的任务执行及详情查看
 2023-02-10 15:07:25 +08:00
jiangweidong e647205c24
perf: 优化applet-navicat连接方式 (#9498) 
* perf: 优化applet-navicat连接方式

* perf: 关闭许可证通知，不阻塞登录
 2023-02-10 15:03:21 +08:00
ibuler 6a0fbc6ac2 perf: 修改 signals 2023-02-10 14:44:59 +08:00
fit2bot e36506c3b8
perf: ansible log (#9499) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 14:37:55 +08:00
Eric 8b7bccc4ad perf: 使用 asyncio 延迟并发执行 2023-02-10 14:21:24 +08:00
fit2bot 0c11a602a8
perf: push account automation (#9497) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-10 14:07:20 +08:00
Bai fcf20335e8 fix: 修复更新角色权限、更新角色、用户绑定时，用户权限没有即使更新的问题 2023-02-10 12:00:01 +08:00
Bai 4c96d6935a fix: 修复没有 push_now 权限的用户可以在创建资产、创建账号中开启推送 2023-02-10 11:14:05 +08:00
jiangweidong c5b8ae6c9a perf: 修改变量名 2023-02-10 11:13:44 +08:00
jiangweidong 7926f7d75e fix: 修改OAuth2协议的注销地址为非必填项目 2023-02-10 11:13:44 +08:00
ibuler 37a52c420f perf: 优化并发处理 2023-02-09 20:48:25 +08:00
fit2bot 3c891ec313
fix: 修复因事务提交问题造成的任务无法执行和任务历史无法查看 (#9493) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-09 20:11:12 +08:00
fit2bot 1b1ae1145c
fix: 重命名文件前校验是否存在冲突 (#9488) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-09 20:05:26 +08:00
Eric e36a64ae2c perf: update resource 2023-02-09 20:00:20 +08:00
Eric d0e56a17d6 fix: 修复审计日志保存失败的问题 2023-02-09 20:00:20 +08:00
Bai 48067415ef fix: 修复第三方用户登录复核时，可以跳过的问题 2023-02-09 19:47:11 +08:00
fit2bot b81416d973
perf: playbook 批量删除 (#9490) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-09 19:02:45 +08:00
Aaron3S a87ff2d880 feat: 为所有api添加搜索 2023-02-09 17:49:49 +08:00
Aaron3S 5d13f1e357 fix: 修复 Job 命令不显示的问题 2023-02-09 17:46:30 +08:00
fit2bot 5401b1cdf2
perf: audit dashboard (#9486) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-09 17:17:35 +08:00
jiangweidong b3e609dc9b fix: 解决不同用户使用远程应用Navicat登录Oracle失败的问题 2023-02-09 16:36:49 +08:00
Aaron3S 403faf9663 fix: 修复上传方式创建 playbook 内容为空的问题 2023-02-09 16:32:17 +08:00
Aaron3S 921d8f6a28 fix: 保护必要文件不被删除 2023-02-09 16:32:17 +08:00
Aaron3S 238dc2e559 fix: 禁用omnidb 连接 sqlserver 2023-02-09 16:32:17 +08:00
fit2bot c7c5805b18
fix: update platform script (#9479) 
* fix: update platform script

* perf: check protocol setting

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-02-09 14:11:54 +08:00
Bai 4f6a17290a fix: 修复创建资产时账号禁用不生效的问题 2023-02-09 12:30:28 +08:00
fit2bot c088739a5d
perf: celery task search (#9477) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-09 11:49:16 +08:00
Bai df428feaeb fix: 修改 command review 返回为 response 对象 2023-02-09 11:10:20 +08:00
jiangweidong 33d5cdedea perf: 优化 2023-02-09 11:02:09 +08:00
fit2bot d6d45f64fa
perf: inventiry account (#9474) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 20:42:06 +08:00
fit2bot 7b9523d6be
perf: ansible accounts is_active (#9473) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 20:39:24 +08:00
fit2bot e3d1474b9b
perf: k8s tree error msg (#9472) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 20:14:33 +08:00
fit2bot ab76d8cce0
fix: 修复创建资产资源 dashboard 不变化的问题 (#9471) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-08 19:32:09 +08:00
fit2bot f3405b0937
fix: 修复新增用户控制台本周新增数量不变化的问题 (#9470) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-08 18:27:49 +08:00
fit2bot ddff968be1
perf: postgresql ansible (#9469) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 18:13:05 +08:00
Bai 03ad4124eb fix: 修复手动登录资产时，LoginACL QuerySet 会获取所有组织下规则的问题(@INPUT账号没有org_id) 2023-02-08 16:46:03 +08:00
fit2bot 5c1acae4c5
perf: push account ssh (#9467) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 15:36:45 +08:00
Bai 37f119260e fix: 修复 connection token 相关的返回字段 2023-02-08 15:32:02 +08:00
fit2bot 2c952c2877
fix: account create bug (#9465) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 14:30:05 +08:00
Bai 2a964bfa6c fix: (smart endpoint 切换到全局组织下匹配) 2023-02-08 14:29:17 +08:00
Bai 953adf6cfb fix: (smart endpoint 获取500的问题) (修复监控会话打开失败的问题) 2023-02-08 14:29:17 +08:00
老广 e590518108
Merge pull request #9463 from jumpserver/pr@dev@perf_ticket 
perf: 修改 platform serializer
 2023-02-08 13:56:12 +08:00
ibuler eabb41b74c perf: 修改 platform serializer 2023-02-08 13:53:21 +08:00
fit2bot d308efc63b
fix: 更新账号后 立即推送 (#9462) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 13:36:32 +08:00
jiangweidong e3c0425a7d perf: 优化 2023-02-08 11:46:10 +08:00
jiangweidong fa54df6d99 perf: 还原任务参数 2023-02-08 11:43:35 +08:00
jiangweidong fb285adcce 优化 2023-02-08 11:32:05 +08:00
fit2bot 32afa214fd
perf: k8s token 不过期 (#9460) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-08 11:28:44 +08:00
ibuler 8c65429157 fix: 修复 perms 循环引用 2023-02-08 10:52:33 +08:00
ibuler 17fce76ac4 perf: 修改 signal handler 2023-02-08 10:14:09 +08:00
fit2bot 63a4620b19
perf: account push no password (#9457) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-07 20:18:54 +08:00
fit2bot 38921cc5f0
perf: gather account (#9456) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-07 19:45:12 +08:00
ibuler fe725106ac fix: role detail 2023-02-07 17:51:22 +08:00
ibuler c87c432c1a perf: 延迟执行一个函数 2023-02-07 17:13:50 +08:00
老广 75b10d9d8f
Merge pull request #9452 from jumpserver/pr@dev@perf_job_delete 
perf: 优化 job 删除策略
 2023-02-07 16:25:51 +08:00
老广 bb8ca41149
Merge pull request #9454 from jumpserver/pr@dev@perf_api_sql 
perf: 优化 api sql 查询
 2023-02-07 16:24:45 +08:00
ibuler e7202ac984 perf: 优化 api sql 查询 2023-02-07 16:21:26 +08:00
Bai b41d30dbac fix: 修复导入更新资产时包含labels报错的问题(取消id唯一键校验) 2023-02-07 16:00:36 +08:00
Aaron3S 9ee2b1b1f5 perf: 优化 job 删除策略 2023-02-07 14:05:59 +08:00
fit2bot 90d5f62327
perf: gathered-accounts api (#9451) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-07 13:27:44 +08:00
Aaron3S 245bf073e9 增加历史任务再次执行功能 2023-02-07 11:43:12 +08:00
jiangweidong a1300e2886 perf: 增加登录日志详情 2023-02-07 09:49:17 +08:00
jiangweidong cb362b2fe4 perf: 生成迁移文件 2023-02-07 08:58:14 +08:00
jiangweidong 49c78f65a6 perf: 处理冲突 2023-02-07 08:55:57 +08:00
jiangweidong 90fdaca955 perf: 优化Activity日志 2023-02-07 08:52:48 +08:00
fit2bot 1dd915cefd
perf: win shell (#9448) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 19:45:08 +08:00
Bai 0deb093e7a fix: 修改工单close权限 2023-02-06 19:30:19 +08:00
fit2bot c7ce535630
perf: account seri type category (#9445) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 18:30:17 +08:00
老广 47f23a1b9c
Merge pull request #9443 from jumpserver/pr@dev@fix_execute_shell_chdir_invalid 
fix: 解决执行命令作业指定当前路径的问题
 2023-02-06 17:59:53 +08:00
fit2bot 7dae491691
perf: account asset category (#9444) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 17:02:27 +08:00
Aaron3S 462dc2543b fix: 解决执行命令作业指定当前路径的问题 2023-02-06 16:19:43 +08:00
fit2bot 8afe28773d
perf: clone plateform charset (#9442) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 15:05:38 +08:00
fit2bot 654cbe7bd0
perf: 创建网关 没有关联网域 (#9441) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 14:54:30 +08:00
Bai f52a2ea47f fix: 修改日文翻译文件 2023-02-06 14:29:09 +08:00
fit2bot 500124f485
perf: asset automation filter (#9440) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 13:37:03 +08:00
Aaron3S dbd3cb35ec fix: 修复无法更新命令的bug 2023-02-06 11:40:56 +08:00
Aaron3S a3baac6763 fix: 修复无法更新命令的bug 2023-02-06 11:27:40 +08:00
fit2bot 9a1109e13d
perf: 资产创建添加账号 没有携带密码 (#9436) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-06 11:00:36 +08:00
Bai 4af80bfcdf fix: 修改中文翻译文件 2023-02-06 10:30:40 +08:00
ibuler 1e075c3687 perf: 修改支持 connect methods 2023-02-06 10:30:16 +08:00
Eric 47c5f18c6e fix: applet deploy pip install 2023-02-03 23:47:41 +08:00
Bai 4960c4b260 fix: 修复登录资产ACL会获取所有组织下数据的问题 2023-02-03 20:03:31 +08:00
ibuler 91357b3715 perf: 优化 gateway 设置 2023-02-03 19:46:42 +08:00
老广 4462e745a5
Merge pull request #9428 from jumpserver/pr@dev@perf_ops_job 
perf: 修改 ops job 约束
 2023-02-03 18:41:39 +08:00
fit2bot 20d2efc407
perf: 主机硬件信息 (#9429) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-03 18:23:38 +08:00
ibuler 4220c72cd3 perf: 修改 ops job 约束 2023-02-03 16:44:05 +08:00
老广 431725b315
Merge pull request #9424 from jumpserver/pr@dev@perf_chrome 
perf: use Chromium browser
 2023-02-03 16:14:15 +08:00
ibuler 470d2703f4 perf: 协议端口校验 2023-02-03 16:13:29 +08:00
ibuler 7c429163ce perf: 协议端口校验 2023-02-03 16:03:34 +08:00
Bai ef3a1e399d fix: 修复登录资产ACL会获取所有组织下数据的问题 2023-02-03 15:21:46 +08:00
Bai ce8ad5f9cc perf: 优化资产授权规则过滤支持 accounts 2023-02-03 15:02:58 +08:00
Eric afb2b53035 fix: chromedriver path 2023-02-03 14:48:41 +08:00
Eric 159652ccfe fix: chrome path 2023-02-03 14:41:57 +08:00
Eric c22662a757 perf: use Chromium browser 
feat: add code dialog
 2023-02-03 14:35:23 +08:00
Bai d2ae6642eb fix: 修复更新账号时secret不正确导致更新失败的问题 2023-02-03 14:31:07 +08:00
ibuler 55de785947 perf: 优化最后更新 2023-02-03 12:25:09 +08:00
ibuler 88638187a5 perf: 修改 role 克隆 2023-02-03 11:29:23 +08:00
jiangweidong cb4410391c
fix: 修复mongodb ssl账号测试失败，oracle推送用户失败问题 (#9421) 2023-02-03 11:27:04 +08:00
fit2bot 003feb1aed
perf: command log risk choice (#9419) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 22:58:18 +08:00
fit2bot 93932f1904
perf: 优化批量更新 (#9418) 
* perf: 优化批量更新

* perf: 优化代码，减少 80%，依然可用

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-02-02 20:10:48 +08:00
ibuler b4068be89c perf: 修改换行 2023-02-02 18:16:40 +08:00
ibuler 3520f8222c merge: with dev 2023-02-02 18:13:32 +08:00
ibuler 77486f0773 fix: 修复用户过滤角色的错误 2023-02-02 18:09:31 +08:00
Bai d0bd35d88c fix: 修复测试ldap attr map报错问题 2023-02-02 17:06:17 +08:00
Aaron3S 1083f5f6f2 feat: 添加 task 的 verbose_name 2023-02-02 16:49:34 +08:00
Bai 4c9d16b4c1 fix: 修改角色列表viewset排序问题 2023-02-02 16:49:04 +08:00
Bai c3d01591e7 fix: 修改角色列表viewset排序问题 2023-02-02 16:49:04 +08:00
Bai 2d514c0db0 fix: 修改角色列表排序问题 2023-02-02 16:49:04 +08:00
Bai a045eb9936 fix: 修改角色列表排序问题 2023-02-02 16:49:04 +08:00
fit2bot be151523f4
perf: user filter (#9413) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 16:40:00 +08:00
fit2bot 64e48712a5
perf: gateway migrate (#9412) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 16:16:38 +08:00
Aaron3S e3e727f972 perf: 默认展开编辑器所有目录 2023-02-02 16:07:19 +08:00
Eric 3341d55d1b perf: APPLET_DOWNLOAD_HOST 优化 2023-02-02 15:37:14 +08:00
Eric 1c55bde8c8 perf: 发布机部署新增 CORE_HOST 配置 2023-02-02 15:37:14 +08:00
Bai 88edc9191c fix: 修改 ACL 排序 priority, date_updated, name 2023-02-02 15:34:22 +08:00
fit2bot 6429b56a54
fix: 资产克隆账号bug (#9407) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 15:01:56 +08:00
fit2bot d78725f7c5
perf: choice validate (#9404) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-02 14:52:44 +08:00
Bai 5fcd83b587 fix: 修复获取 swagger api 时，AssetSerializer category, type 字段手动设置 _choices 属性时报错的问题 2023-02-02 14:40:23 +08:00
feng 0aa681620f perf: asset tree search 2023-02-02 13:56:18 +08:00
Aaron3S d68ed57eb9 优化 playbook ide 2023-02-02 13:55:55 +08:00
jiangweidong 7a5195e91e
fix: 解决部署后，Oracle无法执行自动化任务问题 (#9400) 2023-02-02 10:33:07 +08:00
jiangweidong 3080771559
fix: 解决没获取到证书的mongodb导致的无法执行自动化任务 (#9399) 2023-02-02 10:32:48 +08:00
老广 f68dde456d
Merge pull request #9397 from jumpserver/pr@dev@perf_code_i18n 
perf: 修改 i18n
 2023-02-02 10:23:17 +08:00
fit2bot 758d6ae81b
perf: gateway print (#9398) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 19:02:41 +08:00
ibuler 853f9c422d perf: 修改 i18n 2023-02-01 18:45:51 +08:00
Aaron3S 9d898f0aec playbook ide 2023-02-01 18:22:52 +08:00
fit2bot 7b95859015
perf: device ansible (#9396) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 18:20:56 +08:00
Bai fc34980f20 fix: 修复主机详情显示硬件信息 2023-02-01 17:05:28 +08:00
老广 b4afdf7f72
Merge pull request #9389 from jumpserver/pr@dev@perf_audits_migrations 
perf: 优化audits的migrations
 2023-02-01 16:57:51 +08:00
老广 9dd7675bc9
Merge pull request #9393 from jumpserver/pr@dev@perf_user_create 
perf: 重构 notifications site msg
 2023-02-01 16:50:38 +08:00
ibuler 1169677286 perf: 重构 notifications site msg 2023-02-01 16:43:43 +08:00
Bai 4e2c2b652f fix: 修复创建数据库时包含账号失败的问题 2023-02-01 15:50:21 +08:00
jiangweidong 4762939dae perf: 优化audits的migrations 2023-02-01 15:13:07 +08:00
jiangweidong e324c46f87
fix: PrivateToken创建报错 (#9387) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-01 15:06:10 +08:00
Bai acab0b765c fix: 修复创建 2023-02-01 15:04:06 +08:00
fit2bot 66c58a2084
perf: 账号 模版创建 (#9386) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-01 14:43:58 +08:00
老广 d1f46768a3
Merge pull request #9385 from jumpserver/pr@dev@perf_user_create 
perf: 优化用户创建
 2023-02-01 12:56:46 +08:00
ibuler 023ca29752 perf: 优化用户创建 2023-02-01 12:39:38 +08:00
ibuler 4956e1147e perf: 优化用户创建 角色设置 2023-02-01 11:26:57 +08:00
Eric 142edd9438 perf: update applet download and deployment 2023-02-01 10:27:12 +08:00
ibuler 34b740583e perf: 修改 asset info 2023-01-31 19:37:16 +08:00
ibuler ae1b134f70 perf: 修改 spec for cert 2023-01-31 19:30:38 +08:00
ibuler e9454c42cc perf: 修改 spec 2023-01-31 19:22:20 +08:00
ibuler 6bbb1f7e86 perf: 修改 connectivity 2023-01-31 19:02:24 +08:00
ibuler 03c0d2edbd perf: 修改 connectivity 2023-01-31 18:51:04 +08:00
jiangweidong be670872e5 perf: 修改逻辑，将证书文件转换放到manager中 2023-01-31 18:32:14 +08:00
jiangweidong 6cda829f67 perf: 优化创建证书文件逻辑 2023-01-31 18:32:14 +08:00
jiangweidong 633e12bf86 feat: 其他mongodb自动化操作支持ssl 2023-01-31 18:32:14 +08:00
jiangweidong 211a0abe9e feat: 测试可连接性mongodb支持ssl 2023-01-31 18:32:14 +08:00
Bai ae79584faa perf: 修改账号列表 secret 字段名称 密钥/密码 2023-01-31 18:11:00 +08:00
ibuler ef51e74b8e perf： 继续替换 spec 2023-01-31 18:06:44 +08:00
ibuler 41154d3793 asset: specific to spec_info 2023-01-31 17:57:06 +08:00
ibuler 9ec7a8ac61 perf: 优化 asset info 2023-01-31 17:46:56 +08:00
fit2bot 2ea8e30ca5
fix: 账号备份无法执行 (#9379) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-31 16:17:45 +08:00
Bai a7b744db10 perf: 修改账号列表 secret 字段名称 密钥/密码 2023-01-31 16:07:10 +08:00
Bai 6b4dbe6554 fix: 修复账号列表导出500的问题 2023-01-31 15:45:31 +08:00
Bai 229e89af03 fix: 修复终端列表根据负载状态进行过滤 2023-01-31 15:04:20 +08:00
ibuler 9161b1ab1c perf: 资产的 specific 不返回加密信息 2023-01-31 13:41:09 +08:00
老广 bebfe10d73
Merge pull request #9373 from jumpserver/pr@dev@change_migrations 
perf: 修改 database 的 cert model field
 2023-01-31 13:05:19 +08:00
老广 685b99e04d
Merge pull request #9366 from jumpserver/pr@dev@fix_no_db_name_mongodb_task_err 
fix: mongodb无指定数据库时，一些自动化任务会失败
 2023-01-31 13:04:34 +08:00
ibuler 9d59fb736b perf: 修改 database 的 cert model field 2023-01-31 13:03:45 +08:00
ibuler b34af62ec1 perf: 修改 migrations 2023-01-31 11:12:09 +08:00
ibuler d5cc2e77b2 perf: admin user 不能删除，xpack 引用着，不确定顺序 2023-01-31 11:12:09 +08:00
fit2bot 3702ba92ea
perf: celery task delete (#9372) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-31 11:00:21 +08:00
ibuler 0c1048ed89 perf: 修改 migrations 2023-01-31 10:42:55 +08:00
ibuler 382201188c perf: admin user 不能删除，xpack 引用着，不确定顺序 2023-01-31 10:22:25 +08:00
jiangweidong 87ca9cb11d fix: 使用type 2023-01-30 20:26:07 +08:00
fit2bot bf867f8c95
celery yask perm tree (#9370) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 19:11:42 +08:00
fit2bot ec98f1bae5
perf: celery task del perm (#9369) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 19:07:46 +08:00
fit2bot f18f2df4ab
perf: account template secret (#9368) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 18:59:12 +08:00
老广 28d117bf3d
Merge pull request #9360 from jumpserver/pr@master@feat_support_redis_ssl_connect_magnus 
feat: 支持Magnus连接Redis SSL
 2023-01-30 17:52:53 +08:00
jiangweidong a664d0b752 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_no_db_name_mongodb_task_err 2023-01-30 17:33:15 +08:00
jiangweidong c34b7e69eb fix: mongodb无指定数据库时，一些自动化任务会失败 2023-01-30 17:33:10 +08:00
老广 d8f737c999
Merge pull request #9365 from jumpserver/pr@dev@perf_asset_migration 
perf: 优化 k8s migrations
 2023-01-30 17:15:40 +08:00
ibuler 351bcd3337 perf: 优化 k8s migrations 2023-01-30 17:04:11 +08:00
fit2bot c7c56775d3
perf: push accounts log error (#9364) 
Co-authored-by: feng <1304903146@qq.com>
 2023-01-30 17:00:52 +08:00
老广 e5ca8c5b2c
Merge pull request #9362 from jumpserver/pr@dev@perf_applet_upload 
perf: 优化 applet 上传报错
 2023-01-30 15:21:03 +08:00
ibuler 812f5490dc perf: 优化 applet 上传报错 2023-01-30 15:19:05 +08:00
jiangweidong c098172ed4 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@master@feat_support_redis_ssl_connect_magnus 2023-01-30 15:09:19 +08:00
jiangweidong b0baee95d3 feat: 支持Magnus连接Redis SSL 2023-01-30 15:09:13 +08:00