github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,718 Commits
73 Branches
250 Tags
115 MiB
Commit Graph

5553 Commits (7d93c9ebc5864902bbebb17a4d1572932f69b5bf)

Author SHA1 Message Date
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