120 Commits (c7f9259a2e14ee36c5ac50bc5a3a9d87271d1786)

Author	SHA1	Message	Date
Bai	519e0eac01	perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField	2 years ago
Bai	70fb00c4ee	perf: 修改命令过滤ACL序列类和部分翻译	2 years ago
Bai	229d36abb4	perf: 修改命令过滤 ACL 序列类	2 years ago
Bai	5568c4c5df	perf: 修改 CommandFilterACL Account 只匹配 username 字段	2 years ago
Bai	a69b762f13	fix: 修改 ACL ActionChoices review, accept, reject 引用	2 years ago
Bai	2b5bd558f3	perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法;	2 years ago
Bai	a70f85e346	fix: 修改 ConnectionToken Serializer	2 years ago
Bai	52e8082470	fix: 修改 LoginAssetACL 过滤 review	2 years ago
Bai	c8c5aca355	fix: 修改 ConnectionToken Serializer 命令过滤器	2 years ago
jiangweidong	faf1dedfe2	fix: 删除掉连接方式控制半成品代码	2 years ago
ibuler	61e6ab20a2	perf: 修改 Connect acl	2 years ago
ibuler	a6aafaec05	perf: 修改 command filter	2 years ago
ibuler	fdbaa0afe1	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2 years ago
ibuler	a18f544cf8	perf: 修改 acl	2 years ago
老广	1165ea817f	Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations ... [v3] feat: 支持Oracle、MongoDB、SQLServer数据库自动化操作部分功能	2 years ago
jiangweidong	85aad7ba62	feat: 解决冲突	2 years ago
Eric	10e3100d3c	fix: LoginAssetACL confirm action	2 years ago
ibuler	cb3877bbda	perf: 修改 acl 添加命令过滤 acl	2 years ago
Bai	b55b755e8e	fix: 修复 LoginAssetACL Check API 获取 account_username 失败的问题	2 years ago
Bai	a430b0f1a9	perf: 优化 Login Asset ACL Serializer reviewers 字段	2 years ago
Bai	2aa1d664a6	perf: 处理 acl filter 逻辑放到 queryset 中	2 years ago
Bai	2dea891b15	perf: 处理 acl 后台 check 逻辑	2 years ago
Bai	48d2949404	perf: 修改 acl assets name/address	2 years ago
Bai	99e126f515	perf: 修改 Acl accounts serializer	2 years ago
feng	3052aa759c	perf: ticket login asset acl	2 years ago
feng	49a4ceba85	perf: ticket	2 years ago
ibuler	1cd551e692	merge: with remote	2 years ago
fit2bot	cd3c3eeaf2	perf: code (#9044) ... Co-authored-by: feng <1304903146@qq.com>	2 years ago
feng	ba3f2099e6	perf: audits	2 years ago
feng	2f611009dc	perf: acl	2 years ago
feng	5bd40fcd22	fix: swagger	2 years ago
feng626	b2991362f1	perf: 查看用户授权	2 years ago
feng626	ffdb3f3b83	perf: ticket	2 years ago
feng626	94f898b55d	login asset acl	2 years ago
feng626	ca3d2271a8	merge v3	2 years ago
ibuler	3f47e63080	perf: remove system user	2 years ago
ibuler	85acd4b2ac	perf: 修改 command filter	2 years ago
ibuler	d402ba5d92	perf: 修改资产名称	2 years ago
fit2bot	429e838973	perf: 优化用户登录ACL根据规则优先级进行匹配 (#8672) ... * perf: 优化用户登录ACL根据规则优先级进行匹配 * perf: 修改冲突 Co-authored-by: Jiangjie.Bai <bugatti_it@163.com> Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>	2 years ago
ibuler	93a89509d6	perf: merge with dev	2 years ago
fit2bot	7e2f81a418	perf: 重构 ticket (#8281) ... * perf: 重构 ticket * perf: 优化 tickets * perf: 暂存 * perf: 建立 ticket model * perf: 暂存一下 * perf: 修改 tickets * perf: 修改 import * perf: 修改model * perf: 暂存一波 * perf: 修改... * del process_map field * 工单重构 * 资产 应用对接前端 * perf: 修改 ticket * fix: bug * 修改迁移文件 * 添加其他api * 去掉process_map * perf: 优化去掉 signal * perf: 修改这里 * 修改一点 * perf: 修改工单 * perf: 修改状态 * perf: 修改工单流转 * step 状态切换 * perf: 修改 ticket open * perf: 修改流程 * perf: stash it * 改又改 * stash it * perf: stash * stash * migrate * perf migrate * 调整一下 * 修复bug * 修改一点 * 修改一点 * 优化一波 * perf: ticket migrations Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
feng626	14710e9c9e	feat: 工单审批人中去除申请人	3 years ago
ibuler	d418c28e98	perf: 修改 base	3 years ago
fit2bot	ab1024fbf4	perf: 优化 super ticket 的状态 (#7714) ... * fix: token 系统用户增加 protocol * fix: 修复清除orphan session时同时清除对应的 session_task * perf: 修改 connection token api * fix: 修复无法获取系统角色绑定的问题 * perf: 增加 db terminal 及 magnus 组件 * perf: 修改 migrations * fix: 修复AUTHENTICATION_BACKENDS相关的逻辑 * fix: 修改判断backend认证逻辑 * fix: 修复资产账号查看密码跳过mfa * fix: 修复用户组授权权限错误 * feat: 支持COS对象存储 * feat: 升级依赖 jms_storage==0.0.42 * fix: 修复 koko api 问题 * feat: 修改存储翻译信息 * perf: 修改 ticket 权限 * fix: 修复获取资产授权系统用户 get_queryset * perf: 抽取 ticket * perf: 修改 cmd filter 的权限 * fix: 修改 ticket perm * perf: 修改工单的api Co-authored-by: Eric <xplzv@126.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com> Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local> Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
Jiangjie.Bai	03afa4f974	Fix rbac (#7713) ... * fix: token 系统用户增加 protocol * fix: 修复清除orphan session时同时清除对应的 session_task * perf: 修改 connection token api * fix: 修复无法获取系统角色绑定的问题 * perf: 增加 db terminal 及 magnus 组件 * perf: 修改 migrations * fix: 修复AUTHENTICATION_BACKENDS相关的逻辑 * fix: 修改判断backend认证逻辑 * fix: 修复资产账号查看密码跳过mfa * fix: 修复用户组授权权限错误 * feat: 支持COS对象存储 * feat: 升级依赖 jms_storage==0.0.42 * fix: 修复 koko api 问题 * feat: 修改存储翻译信息 * perf: 修改 ticket 权限 * fix: 修复获取资产授权系统用户 get_queryset * perf: 抽取 ticket * perf: 修改 cmd filter 的权限 * fix: 修改 ticket perm * fix: 修复oidc依赖问题 Co-authored-by: Eric <xplzv@126.com> Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local> Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
ibuler	db050e405d	fix: 修改 migrations	3 years ago
fit2bot	e259d2a9e9	fix: fix rbac to dev (#7636) ... * feat: 添加 RBAC 应用模块 * feat: 添加 RBAC Model、API * feat: 添加 RBAC Model、API 2 * feat: 添加 RBAC Model、API 3 * feat: 添加 RBAC Model、API 4 * feat: RBAC * feat: RBAC * feat: RBAC * feat: RBAC * feat: RBAC * feat: RBAC 整理权限位 * feat: RBAC 整理权限位2 * feat: RBAC 整理权限位2 * feat: RBAC 整理权限位 * feat: RBAC 添加默认角色 * feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定 * feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定 * feat: RBAC 修改用户模块API * feat: RBAC 添加组织模块迁移文件 & 修改组织模块API * feat: RBAC 添加组织模块迁移文件 & 修改组织模块API * feat: RBAC 修改用户角色属性的使用 * feat: RBAC No.1 * xxx * perf: 暂存 * perf: ... * perf(rbac): 添加 perms 到 profile serializer 中 * stash * perf: 使用init * perf: 修改migrations * perf: rbac * stash * stash * pref: 修改rbac * stash it * stash: 先去修复其他bug * perf: 修改 role 添加 users * pref: 修改 RBAC Model * feat: 添加权限的 tree api * stash: 暂存一下 * stash: 暂存一下 * perf: 修改 model verbose name * feat: 添加model各种 verbose name * perf: 生成 migrations * perf: 优化权限位 * perf: 添加迁移脚本 * feat: 添加组织角色迁移 * perf: 添加迁移脚本 * stash * perf: 添加migrateion * perf: 暂存一下 * perf: 修改rbac * perf: stash it * fix: 迁移冲突 * fix: 迁移冲突 * perf: 暂存一下 * perf: 修改 rbac 逻辑 * stash: 暂存一下 * perf: 修改内置角色 * perf: 解决 root 组织的问题 * perf: stash it * perf: 优化 rbac * perf: 优化 rolebinding 处理 * perf: 完成用户离开组织的问题 * perf: 暂存一下 * perf: 修改翻译 * perf: 去掉了 IsSuperUser * perf: IsAppUser 去掉完成 * perf: 修改 connection token 的权限 * perf: 去掉导入的问题 * perf: perms define 格式，修改 app 用户 的全新啊 * perf: 修改 permission * perf: 去掉一些 org admin * perf: 去掉部分 org admin * perf: 再去掉点 org admin role * perf: 再去掉部分 org admin * perf: user 角色搜索 * perf: 去掉很多 js * perf: 添加权限位 * perf: 修改权限 * perf: 去掉一个 todo * merge: with dev * fix: 修复冲突 Co-authored-by: Bai <bugatti_it@163.com> Co-authored-by: Michael Bai <baijiangjie@gmail.com> Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
xinwen	bd84edea62	feat: 资产登录工单页面增加监控与中断	3 years ago
feng626	67d084fc43	perf: ip list 优化	3 years ago
feng626	8071f45f92	fix: 修复xpack引入包问题	3 years ago
feng626	d44f90ea3d	fix: acl xpack	3 years ago
ibuler	6cf2bc4baf	pref: 优化工单验证	3 years ago
feng626	0eedda748a	perf: acl username unified	3 years ago
feng626	c93ab15351	fix: acl migrate bug	3 years ago
Michael Bai	1eb59b11da	fix: 添加Model的verbose_name属性	3 years ago
feng626	0b67c7a953	fix: 修复登陆复合acl时 未添加规则bug	3 years ago
feng626	526928518d	perf: acl filter	3 years ago
fit2bot	00d434ceea	perf: 优化消息通知 (#7024) ... * perf: 优化系统用户列表 * stash * perf: 优化消息通知 * perf: 修改钉钉 * perf: 修改优化消息通知 * perf: 修改requirements * perf: 优化datetime Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	9acfd461b4	feat: user login acl (#6963) ... * feat: user login acl * 添加分时登陆 * acl 部分还原 * 简化acl判断逻辑 Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>	3 years ago
feng626	c5f4ecc8cc	fix: 修复工单消息推送bug	3 years ago
feng626	ad592fa504	fix: 修复工单与koko相关接口bug	3 years ago
fit2bot	0f87f05b3f	feat: 工单多级审批 + 模版创建 (#6640) ... * feat: 工单多级审批 + 模版创建 * feat: 工单权限处理 * fix: 工单关闭后 再审批bug * perf: 修改一点 Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
Bai	689bd093be	云管中心同步任务支持设置同步IP网段和协议组（修改特权用户文案）	3 years ago
fit2bot	ec8dca90d6	refactor: 整合系统用户和管理用户 (#6236) ... * perf: 整合系统用户和管理用户 * stash stash perf: 优化系统用户和资产的表结构 * perf: 添加信号 * perf: 添加算法 * perf: 去掉 asset user backends * perf: 整理系统用户api * perfF: 暂存一下 * stash * perf: 暂存一下 * perf: 暂存 * xxx * perf: ... * stash it * xxx * xxx * xxx * xxx * xxx * stash it * 修改Protocols * perf: 修改创建authbook信号 * perf: 添加auth info * .stash * perf: 基本完成 * perf: 修复完成 * perf: 修复更改的id * perf: 修复迁移过去数量不对的问题 * perf: 修改systemuser * fix: 修复批量编辑近期的问题 * fix: 修复authbook加载的问题 * xxx Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fghbng@qq.com	9a92e24e50	serializer优化&&授权导入优化	4 years ago
Bai	50918a3dd2	feat: 添加命令复核逻辑; 添加命令复核工单;	4 years ago
Bai	ce8143c2ec	fix: 修改ACL提示支持的协议为: ssh、telnet	4 years ago
Bai	65ad63272c	fix: 修复操作应用/应用授权/acl等未记录日志的问题2	4 years ago
xinwen	73b67da4c0	fix: 修复 acl 一些翻译	4 years ago
Jiangjie.Bai	64641a18e6	feat: ACL (#5696) ... * feature: acl (v0.1) * feature: acl (v0.2) * feature: acl (v0.3) * feature: acl (v0.4) * feature: acl (v0.5) * feature: acl (v0.6) * feature: acl (v0.7) * feature: acl (v0.8) * feature: acl (v0.9) * feature: acl (v1.0) * feature: acl (v1.1) * feature: acl (v1.2) * feature: acl (v1.3) * feature: acl (v1.4) * feature: acl (v1.5) * feature: acl (v1.6) * feature: acl (v1.7) * feature: acl (v1.8) * feature: acl (v1.9) * feature: acl (v2.0) * feature: acl (v2.1) * feature: acl (v2.2) * feature: acl (v2.3) * feature: acl (v2.4) * feature: acl (v2.5) * feature: acl (v2.6) * feature: acl (v2.7) * feature: acl (v2.8) * feature: acl (v2.9) * feature: acl (v3.0) * feature: acl (v3.1) * feature: acl (v3.2) * feature: acl (v3.3) * feature: acl (v3.4) * feature: acl (v3.5) * feature: acl (v3.6) * feature: acl (v3.7) * feature: acl (v3.8) * feature: acl (v3.9) * feature: acl (v4.0) * feature: acl (v4.1) * feature: acl (v4.2) * feature: acl (v4.3) * feature: acl (v4.4)	4 years ago