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

4169 Commits (094446c548b1ab4ce48086783f6059e412440faa)

Author SHA1 Message Date
老广 0ef7a9571c
Merge pull request #7800 from jumpserver/pr@dev@feat_core_redis_support_ssl 
feat: JumpServer支持部署在使用了ssl的redis上
 2022-03-22 10:34:32 +08:00
ibuler 54fd1fb0c8 perf: 移动到信号中 2022-03-21 19:27:23 +08:00
ibuler 87c6eec619 perf: 优化 role bingding，优化 is_superuser 2022-03-21 19:27:23 +08:00
jiangweidong e35fbfc7e9
Update session.py 2022-03-21 19:02:30 +08:00
fit2bot 3345456dc2
fix: 修复wateway api (#7947) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-21 17:53:16 +08:00
Jiangjie.Bai 9ae74120ed fix: 修复用户API权限 2022-03-21 12:00:15 +08:00
Jiangjie.Bai 9e5c132485 fix: 修复用户API权限 2022-03-21 11:58:29 +08:00
fit2bot 5cc2fdae4f
fix: 修复api docs打不开的问题 (#7938) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-21 11:14:49 +08:00
jiangweidong e993f31b6d
feat: 支持纳管百度云资产 (#7921) 
Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-21 10:39:47 +08:00
Jiangjie.Bai 60edbb36a1 fix: 应用树隐藏mongodb节点 2022-03-18 18:02:15 +08:00
fit2bot 5da1ec55a7
perf: org del ticket perm (#7932) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-18 17:44:20 +08:00
Jiangjie.Bai b8c083af7e fix: 工单权限位放到sys角色中 2022-03-18 17:36:22 +08:00
Jiangjie.Bai 996621f303 fix: 移除权限dashboard 2022-03-18 17:10:34 +08:00
fit2bot ec9e5da653
fix: 修复apikey perm (#7918) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-18 15:53:34 +08:00
Jiangjie.Bai d4e4015d91 fix: 修复去除rolebiding change 权限 2022-03-18 15:38:33 +08:00
Jiangjie.Bai ac6052546a fix: 修改翻译 2022-03-17 19:20:39 +08:00
Jiangjie.Bai 0265adcc72 fix: 修改翻译 2022-03-17 19:20:39 +08:00
Jiangjie.Bai 9654083662 fix: 修改站内信权限位 2022-03-17 19:06:44 +08:00
fit2bot 08ff8fa285
fix: login confirm bug (#7914) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-17 18:50:37 +08:00
Jiangjie.Bai f82f7eba2b fix: 修改一些权限 2022-03-17 17:51:02 +08:00
Jiangjie.Bai a8cee26874 fix: 修复资产详情授权用户tab页的权限位 2022-03-17 17:25:20 +08:00
ibuler 3ed7477057 perf: 修改 default role 2022-03-17 16:53:29 +08:00
ibuler a3cddd5d34 fix: 修复批量命令的bug 2022-03-17 16:26:22 +08:00
Jiangjie.Bai 26b3c60e5c fix: 删除一些perms相关的权限位 2022-03-17 16:26:00 +08:00
ibuler b5dea38164 perf: 修改bug 2022-03-17 16:09:51 +08:00
ibuler 7addb881f6 fix: 修复系统用户Perms 2022-03-17 16:09:51 +08:00
fit2bot 9c395b674f
fix: command log search (#7906) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-17 15:39:05 +08:00
Jiangjie.Bai b297ebe973 fix: 修改应用category 2022-03-17 15:37:57 +08:00
fit2bot 5c7bfcff1c
perf: 修改 i18n (#7904) 
* perf: some perm to xpack

* perf: 修改 i18n

* perf: 修改 i18n

* perf: 修改 i18n

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-17 15:23:22 +08:00
fit2bot 76796f249d
fix: user match (#7903) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-17 14:47:24 +08:00
Jiangjie.Bai 55a63477ed fix: 去除系统用户资产相关权限 2022-03-17 14:38:19 +08:00
ibuler 5942037d81 perf: some perm to xpack 2022-03-17 14:24:52 +08:00
Jiangjie.Bai 5882b8a682 fix: 去除application secret change perm 2022-03-17 14:24:25 +08:00
fit2bot 34e75099a3
perf: 设置默认的角色，系统用户角色添加权限 (#7898) 
* perf: 修改 role handler

* perf: 设置默认的角色，系统用户角色添加权限

* perf: authentication 还是放到系统中吧

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-17 14:08:16 +08:00
feng626 8fe84345e4 fix: 工单默认权限 2022-03-17 14:06:34 +08:00
Jiangjie.Bai a31c3ccc30 fix: 去除application account delete perm 2022-03-17 14:05:08 +08:00
Jiangjie.Bai e13e34098a fix: 站内信命令告警中的会话地址 2022-03-17 14:05:08 +08:00
feng626 e8653c74cd fix: ticket URL type 2022-03-17 12:35:08 +08:00
feng626 1433c35ff9 fix: test gateway 2022-03-17 12:33:59 +08:00
Jiangjie.Bai a237b5a63d fix: 去掉terminal task add/delete 权限位 2022-03-17 11:40:54 +08:00
feng626 2587c8693e fix: account_change_pwd 2022-03-17 11:36:48 +08:00
feng626 dfe5e2bce3 fix: 修改rbac permission 2022-03-17 11:36:48 +08:00
Jiangjie.Bai 1a05a942c2 fix: 更新资产详情授权用户权限 2022-03-16 20:49:29 +08:00
Jiangjie.Bai 30556023d1 fix: 修复会话录像播放权限 2022-03-16 20:42:38 +08:00
fit2bot aa022a02c1
fix: 修复用户认证失败的详细信息显示 (#7886) 
* fix: 修复用户认证失败的详细信息显示

* fix: 更新授权树翻译

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-16 20:41:54 +08:00
fit2bot 433d829c29
fix: 添加profile myorgs (#7887) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-16 20:36:12 +08:00
fit2bot 3b507dc795
perf: 优化英文下树的显示 (#7883) 
* perf: 优化英文下树的显示

* perf: 修改翻译

* perf: 修改翻译

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-16 20:27:38 +08:00
Jiangjie.Bai 8233c69038 fix: 修复adhoc权限 2022-03-16 19:26:40 +08:00
ibuler 0fbc548c02 fix: 修复访问 flower 错误 2022-03-16 19:05:06 +08:00
Jiangjie.Bai aa9ae14e46 fix: 修复view action获取 2022-03-16 18:33:55 +08:00
Jiangjie.Bai 04b35ba520 fix: 修复批量命令权限位 2022-03-16 18:33:13 +08:00
ibuler 580d2cd80b perf: 修改 org admin 2022-03-16 18:26:16 +08:00
ibuler da9136f7af perf: 修改 org role 2022-03-16 18:26:16 +08:00
ibuler 1ce2706f20 perf: 修改翻译 2022-03-16 18:26:16 +08:00
ibuler bbdeba3659 perf: 修复 org admin all 2022-03-16 18:26:16 +08:00
feng626 3a26b9d102 fix: 修复工单相应bug 2022-03-16 17:40:51 +08:00
ibuler ee757e261d perf: 修改写法 2022-03-16 17:14:42 +08:00
ibuler f41e6db007 perf: sso token 只能超级管理员 2022-03-16 17:14:42 +08:00
ibuler 7eed7b32cc perf: 修复 org role binding 在root组织下看到的可能不对 2022-03-16 17:14:42 +08:00
Jiangjie.Bai efb26132f6 fix: 修复sso用户登录失败的问题 2022-03-16 17:11:22 +08:00
Jiangjie.Bai 572c5b6925 fix: 修改工单管理权限位 2022-03-16 14:54:50 +08:00
ibuler 8a1cd7e2a9 perf: fix some bug 2022-03-16 14:18:01 +08:00
Jiangjie.Bai c065f82d30 fix: 排除收集用户执行的更新、删除权限位 2022-03-16 14:17:35 +08:00
ibuler 995c9a6c19 perf: 修复一些bug， rolebingding 找到合适的 2022-03-16 14:08:54 +08:00
Jiangjie.Bai 5ec970fab4 fix: 全局组织受权限位控制 2022-03-16 14:07:00 +08:00
Jiangjie.Bai d320443c9f fix: 去除change_setting权限位 2022-03-15 20:25:18 +08:00
ibuler 4bfa88f01f perf: 修改 app tree 2022-03-15 20:09:30 +08:00
Jiangjie.Bai aedd8ba589 fix: 修复查看我的应用翻译 2022-03-15 19:51:59 +08:00
Jiangjie.Bai 172b492bc3 fix: 修复存储测试权限位 2022-03-15 19:41:25 +08:00
Jiangjie.Bai c4280d259a fix: 修复翻译/权限设置 2022-03-15 19:18:01 +08:00
Jiangjie.Bai b25ec559bb fix: 修复翻译/权限设置 2022-03-15 19:18:01 +08:00
ibuler cd46c8c78e perf: 发送验证码，不再提示 2022-03-15 18:47:12 +08:00
ibuler 8839e6293b perf: 修改 mfa 地址 2022-03-15 18:47:12 +08:00
ibuler 4f887b1b11 perf: 优化 tree node icon 2022-03-15 18:46:11 +08:00
fit2bot 90840a4417
fix: 工单创建bug (#7858) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-15 18:22:13 +08:00
fit2bot a18b9bad0a
fix:  修复ticketsession (#7857) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-15 17:32:54 +08:00
feng626 e1a238b778 fix: 删除资产授权缓存接口 2022-03-15 16:55:45 +08:00
fit2bot d77e84e6f8
fix: ticket comment bug (#7854) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-15 16:50:51 +08:00
Jiangjie.Bai 2042c7a6e5 fix: 云同步权限显示创建执行 2022-03-15 14:18:37 +08:00
Jiangjie.Bai 40aca26155 fix: 暂时排除会话分享的权限位 2022-03-15 13:13:16 +08:00
Jiangjie.Bai e18e76002c fix: 暂时排除会话分享的权限位 2022-03-15 13:00:56 +08:00
Jiangjie.Bai 3924ff0114 fix: 修改查看会话录像权限位 2022-03-15 11:37:09 +08:00
Jiangjie.Bai 2d7349d596 fix: 删除权限位connect_myasset/myapp 2022-03-15 11:11:37 +08:00
feng626 c41a81c8d0 fix: 修改授权权限 2022-03-15 11:06:48 +08:00
feng626 7ba19ab1a1 fix: exclude adhoc change delete 2022-03-14 20:36:02 +08:00
Jiangjie.Bai 72247d1df3 fix: 修复批量命令权限 2022-03-14 20:35:43 +08:00
feng626 faf82d7cfb fix: del connect my asset 2022-03-14 20:34:35 +08:00
feng626 4e8defc647 fix: 修复上传bug 2022-03-14 19:15:12 +08:00
Jiangjie.Bai 2f18208874 fix: 修复资产改密计划权限控制 2022-03-14 19:01:26 +08:00
Jiangjie.Bai b37e8cdc3f fix: 修复更新资产账号权限控制 2022-03-14 17:51:03 +08:00
Jiangjie.Bai 5b960fc46b fix: 修复测试资产账号权限 2022-03-14 17:51:03 +08:00
fit2bot df51c82cfd
perf: 优化Migration，删掉原来的 content type (#7835) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-03-14 17:10:34 +08:00
feng626 e9deb6fc7a fix: app relation api 2022-03-14 17:05:47 +08:00
Jiangjie.Bai cca49fa9cd fix: 修复授权树显示 2022-03-14 16:47:29 +08:00
feng626 a7cc457f54 fix: 修复setting perm 2022-03-14 15:50:53 +08:00
feng626 567c1b0124 fix: node test refresh perm 2022-03-14 14:37:59 +08:00
fit2bot 2da541c127
fix: 修改授权树(账号备份) (#7830) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-14 14:23:13 +08:00
jiangweidong 794139782f feat: JumpServer支持部署在使用了ssl的redis上，可使用证书连接 2022-03-14 11:35:14 +08:00
Jiangjie.Bai 307b739a03 fix: 修改授权树(收集用户) 2022-03-14 11:34:14 +08:00
feng626 ca5708988a fix: 修复saml2 auth 2022-03-14 11:17:15 +08:00
ibuler 90d84f4d69 perf: 修改消息订阅 2022-03-14 11:16:54 +08:00
ibuler 60564d1b4f perf: 修改 bug 2022-03-14 10:01:51 +08:00
fit2bot 017710c056
perf: 修改perms (#7822) 
* perf: 修改 perm tree

* perf: 修改perms

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-11 21:24:07 +08:00
Jiangjie.Bai a876a82a76 fix: 从组织移除用户 2022-03-11 21:20:44 +08:00
Jiangjie.Bai 8423ae602f fix: 移除TICKET_ENABLED配置;系统设置API限制权限 2022-03-11 21:02:26 +08:00
Jiangjie.Bai 8e2471c1eb fix: 移除TICKET_ENABLED配置;系统设置API限制权限 2022-03-11 21:02:26 +08:00
Jiangjie.Bai 224a9fbdb3 fix: 修复创建授权时actions为空保存时报错的问题 2022-03-11 21:00:37 +08:00
ibuler 797b184c7f perf: 修改 perm tree 2022-03-11 20:31:38 +08:00
fit2bot b3632f6531
fix: dingtalk auth perm (#7814) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 19:32:23 +08:00
fit2bot e3bc54e764
fix: 修复用户组添加用户 (#7809) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 19:31:55 +08:00
fit2bot f0325c48df
fix: 工单权限 (#7808) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 19:31:29 +08:00
fit2bot 416d4bd0c3
fix: 修复tree (#7802) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 17:24:28 +08:00
fit2bot 10c877c120
fix: 修复工单ticket exclude perm (#7799) 
* fix: 修复工单ticket exclude perm

* fix: 修复perm tree

Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 13:30:14 +08:00
jiangweidong f04378eaf8 feat: JumpServer支持部署在使用了ssl的redis上 2022-03-11 12:56:22 +08:00
fit2bot b644c47173
perf: 排除工单流权限 (#7798) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-11 11:04:21 +08:00
ibuler 8a565b9eef perf: 修改设置 2022-03-10 20:30:41 +08:00
ibuler 4eb7b50b52 perf: 修改设置 2022-03-10 20:30:41 +08:00
Jiangjie.Bai fd64bd03b4 fix: 修改LDAP配置API权限 2022-03-10 19:03:51 +08:00
Jiangjie.Bai 9c75147179 fix: 修改LDAP配置API权限 2022-03-10 19:03:51 +08:00
fit2bot 147e4cce94
perf: 修改 migrations (#7794) 
* perf: 优化 auditor 权限

* perf: 修改 migrations

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-10 18:55:53 +08:00
fit2bot d1e25e1fef
fix: 删除应用/授权应用相关权限 (#7792) 
* fix: 删除应用/授权应用相关权限

* fix: 删rbac清除code的一些迁移文件;增加到utils目录下

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-03-10 18:51:45 +08:00
fit2bot af2ba07338
fix: exclude (#7791) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-10 18:11:33 +08:00
fit2bot 29b9adb684
perf: 修复一把数据 (#7789) 
* fix: 优化 perm exclude

* perf: 修复一把数据

perf: 修复一些数据

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-10 17:40:31 +08:00
fit2bot 64e0860d24
fix: 修复app suggestion perm bug (#7788) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-10 17:24:24 +08:00
ibuler 9934007397 fix: 优化 perm exclude 2022-03-10 16:56:32 +08:00
Jiangjie.Bai 4044a71aea revert: 回滚权限树 2022-03-10 15:27:15 +08:00
fit2bot 9725f0c963
fix: 修复工单流500bug (#7784) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-10 11:26:34 +08:00
Jiangjie.Bai b017e68a56
Perf: 优化RBAC权限树 (#7782) 
* fix: 优化权限树(1)

* fix: 优化权限树(2)

* fix: 优化权限树(3)

* fix: 优化权限树(4)

* fix: 优化权限树(5)

* fix: 优化权限树(添加迁移文件)

* fix: 优化权限树(6)

* fix: 优化权限树(7)

* fix: 优化权限树(8)

* fix: 优化权限树(9)
 2022-03-10 11:25:33 +08:00
fit2bot 9ca0eaf7ce
fix: 修改校对资产数量permbug (#7777) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-09 15:01:44 +08:00
fit2bot 94e60e180e
fix: 修复新建组织用户列表获取到是全局用户bug (#7776) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-09 11:17:28 +08:00
fit2bot 8ed221ea5a
fix: org role perm (#7775) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 20:22:10 +08:00
fit2bot 42ebb1f82f
fix: 删除组织角色时 判断全局绑定用户数量 (#7774) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 20:00:19 +08:00
ibuler 9492518773 perf: 修改 redis conn 2022-03-08 18:49:50 +08:00
feng626 1cca9c10fb perf: 修改perm判断逻辑 2022-03-08 18:41:50 +08:00
feng626 c4a6715eb8 fix: 命令存储 or 命令权限 2022-03-08 17:43:26 +08:00
ibuler 4c31b5ec0f perf: 去掉一些 perm 2022-03-08 17:33:06 +08:00
fit2bot 9fd7fa9339
fix: add auditor perm (#7768) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 15:53:02 +08:00
feng626 a930f3aab3 fix: 修复创建更新用户给定默认权限 2022-03-08 14:07:02 +08:00
ibuler 5081fb5fe7 perf: 优化perm tree, 并添加缓存 2022-03-08 13:46:25 +08:00
fit2bot cb072123d6
fix: 修复org admin ticket flow perm (#7765) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 12:42:46 +08:00
fit2bot 761265dec5
fix: 修复index api perm (#7761) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-08 10:43:01 +08:00
fit2bot 89de111acc
fix: 修复特殊用户过滤 (#7759) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 20:09:52 +08:00
ibuler 14327ee398 perf: 优化账号备份api path 2022-03-07 19:56:27 +08:00
fit2bot 1b007c8c5c
perf: 修改权限树 (#7757) 
* perf: 修改 rbac tree

* perf: 修改权限树

* perf:  修改用户默认权限

Co-authored-by: ibuler <ibuler@qq.com>
 2022-03-07 19:02:37 +08:00
fit2bot 3222687aaa
fix: 修复应用授权权限bug (#7756) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 18:42:22 +08:00
feng626 79994f5ddc fix: 资产授权权限bug 2022-03-07 18:25:06 +08:00
fit2bot 8271492ec1
fix: 修复查看资产密钥bug (#7754) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 17:55:35 +08:00
fit2bot 27560793f8
fix: 修复系统用户任务权限bug (#7753) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-03-07 16:01:02 +08:00
Jiangjie.Bai 615929dd43 fix: 修复可以删除已关联用户角色的问题 2022-03-07 15:05:58 +08:00
feng626 a1c1b128e9 fix: 修复relation_systemuser_perm问题 2022-03-07 14:53:38 +08:00