667 Commits (ce63ea7528e1b632be3b47aa7c27dc3fddd72124)

Author	SHA1	Message	Date
Jiangjie.Bai	cd93de4c00	perf: 优化 Connection Token API 逻辑处理	2 years ago
ibuler	0fb96091cc	perf: 优化代码速度	2 years ago
ibuler	4405064e78	pref: 添加 api debug timer	2 years ago
Jiangjie.Bai	8abf954015	fix: 处理一波迁移文件	2 years ago
fit2bot	13ae50f5d0	feat: 自定义MFA认证逻辑 (#8891) ... * feat: 自定义MFA认证 * feat: 修改翻译信息 Co-authored-by: halo <wuyihuangw@gmail.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
jiangweidong	2029e9f8df	feat: 重构操作日志 (#8941) ... * feat：重构操作日志模块 * feat: 改密计划增加操作日志记录 * feat: 支持操作日志接入ES，且接口limit支持自定义限制大小 * feat：翻译 * feat: 生成迁移文件 * feat: 优化迁移文件 * feat: 优化多对多日志记录 * feat: 命令存储ES部分和日志存储ES部分代码优化 * feat: 优化敏感字段脱敏 Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
jiangweidong	1e97a23bc5	feat: 忘记密码支持手机短信找回，并修改邮箱方式和手机方式统一 (#8960) ... * feat: 忘记密码支持通过手机找回，邮箱方式修改为和手机方式一致 * feat: 翻译 * feat: 修改翻译 * fix: 还原 Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
Jiangjie.Bai	2797baa4e5	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2 years ago
feng	5bd40fcd22	fix: swagger	2 years ago
Jiangjie.Bai	81e3809435	refactor: 修改 ConnectionToken API 结构	2 years ago
halo	50be7c6fc8	fix: rdp客户端拉起后窗口标题中文乱码	2 years ago
Jiangjie.Bai	bcd1d5585b	refactor: ConnectionToken 修改 Model 和序列类	2 years ago
Jiangjie.Bai	2b5b4ad605	refactor: ConnectionToken 修改表字段名称 account -> account_username	2 years ago
Jiangjie.Bai	3d616b01b0	refactor: ConnectionToken 添加 protocol 字段	2 years ago
Jiangjie.Bai	bb01a60fc1	refactor: 修改 authentication models 目录	2 years ago
Jiangjie.Bai	5d37d1b7b1	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2 years ago
Jiangjie.Bai	a260da6cec	refactor: 修改 ConnectionToken 关联的逻辑(1)	2 years ago
ibuler	1239247b5a	pref: 修改删掉 connection token type	2 years ago
Jiangjie.Bai	bd001bb262	refactor: 修改 ConnectionToken 表结构	2 years ago
Jiangjie.Bai	fb6f51b9cb	merge: dev	2 years ago
Jiangjie.Bai	13279c9d2a	refactor: 修改 ConnectionToken 表结构	2 years ago
ibuler	c018055d5f	pref: 修改migrations	2 years ago
Jiangjie.Bai	11eb505c78	refactor: 修改 ConnectionToken 表结构	2 years ago
Jiangjie.Bai	188a2846ed	fix: 修复 OAuth2 用户本地被禁用后,页面一直跳转的问题.	2 years ago
Jiangjie.Bai	57e12256e7	feat: 修改 Endpoint 获取 Manugs DB listen port 的逻辑	2 years ago
ibuler	1b0195cb82	perf: 修改 asset 结构	2 years ago
feng626	615f36c6f6	perf: 收集账号	2 years ago
Quentin Machu	61ff3db0f1	fix: address issue #8287 with blank SAML's RelayState	2 years ago
Jiangjie.Bai	a27aeca2fd	refactor: 修改授权相关Model,Serializer,API结构	2 years ago
jiangweidong	b25404cac1	feat: 支持OAuth2协议自定义注销功能	2 years ago
ibuler	d9663036f8	perf: revert csrf token project	2 years ago
ibuler	2354650b82	perf: 暂时去掉 csrf token	2 years ago
ibuler	951d4e4e0d	perf: 合并冲突	2 years ago
feng626	ca3d2271a8	merge v3	2 years ago
Jiangjie.Bai	1819083a25	perf: 优化 custom 认证模块加载逻辑，判断MD5值，启动时只加载一次	2 years ago
Jiangjie.Bai	8fc5c4cf9e	feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；通过配置文件控制	2 years ago
Jiangjie.Bai	89051b2c67	feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；	2 years ago
Jiangjie.Bai	9123839b48	feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；	2 years ago
Jiangjie.Bai	7151201d58	feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；	2 years ago
ibuler	1e57a0eb1f	perf: merge v3	2 years ago
ibuler	ab46194039	perf: 修改 导入	2 years ago
feng626	97c6e2c0b2	修复migrate bug	2 years ago
feng626	fe4df4b179	fix: 修复swagger	2 years ago
feng626	37b150bc04	fix: 表单提交csrftoken问题	2 years ago
Jiangjie.Bai	8ae98887ee	Revert "fix: 修复服务端渲染请求缺少csrf token 问题" (#8780) ... This reverts commit 24a1738e73.	2 years ago
feng626	24a1738e73	fix: 修复服务端渲染请求缺少csrf token 问题	2 years ago
Jiangjie.Bai	867ad94a30	fix: 修改认证重定向地址 scheme 取值逻辑	2 years ago
fit2bot	7d0a19635a	fix: 修复登录符合拒绝时 登录日志类型异常问题 (#8758) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
ibuler	3f47e63080	perf: remove system user	2 years ago
fit2bot	d405bae205	fix: 修复认证失败后错误信息总是 IP block 的问题 (#8755) ... Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
fit2bot	68841d1f15	fix: 配置仅已存在用户登录后 cas用户首次登录报403 (#8752) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
ibuler	2948d5af7f	perf: 删除一部分 system user	2 years ago
fit2bot	5559f112db	fix: 用户登录复合500 (#8743) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
feng626	0eaaa7b4f6	fix: 用户异地登陆bug	2 years ago
fit2bot	18af5e8c4a	fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】 (#8739) ... * fix: 【登录】第三方用户登录复核，拒绝状态，未真正拦截 * fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】 * fix: 【登录日志】用户设置登录复核，登录。此时不处理工单，管理员全局组织下查看登录日志，日志无限新增，且无记录用户名】 Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>	2 years ago
ibuler	d402ba5d92	perf: 修改资产名称	2 years ago
huangzhiwen	a14ebc5f0f	fix: 解决第三方登录无限重定向问题	2 years ago
Eric	acf8b5798b	perf: 优化rdp文件名的显示	2 years ago
fit2bot	30fe5214c7	fix: 增加上了第三方用户登录失败的原因 (#8714) ... * feat: OAuth2.0登录方式加上用户登录规则校验 * fix: 修复第三方用户登录规则（复核）问题 * fix: 增加上了第三方用户登录失败的原因 * fix: 修改变量名称 Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>	2 years ago
fit2bot	3951b8b080	fix(auth): 第三方用户（saml2）登录规则设置无效 (#8648) ... * fix: 修复 OpenID、CAS、SAML2登录规则设置无效 * refactor: auth_third_party_required写到一个地方和优化代码结构 * refactor: 优化代码结构 * refactor: 修改变量名称 Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>	2 years ago
Jiangjie.Bai	c295f1451a	fix: 修复登录失败日志的原因信息	2 years ago
Jiangjie.Bai	c4a94876cc	fix: 增加配置项 SECURE_PROXY_SSL_HEADER request build url 时获取对应的 scheme	2 years ago
ibuler	196e38897f	perf: 修改 protcols	2 years ago
fit2bot	4ecb0b760f	perf: 支持配置文件加密 (#8699) ... * crypto * perf: 暂存一下 * perf: 支持配置文件加密 * perf: 修改位置 * perf: 优化拆分出去 * stash * perf: js 强制 key 最大 16 * pref: 修改语法 * fix: 修复启用 gm 后，又关闭导致的用户无法登录 Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
jiangweidong	2099baaaff	feat: 认证方式支持OAuth2.0协议 (#8686) ... * feat: 认证方式支持OAuth2.0协议 * perf: 优化 OAuth2 认证逻辑和Logo (对接 Github) * perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标 * perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标 * perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标 * perf: 优化 OAuth2 认证逻辑和Logo，支持上传图标 Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
Jiangjie.Bai	9319c4748c	perf: 修改用户登录 ACL 翻译信息	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
fit2bot	cb8690dd63	fix: 处理组件获取connection token获取不到的问题 (#8629) ... * fix: 处理组件获取connection token获取不到的问题 * fix: ViewSet 显示获取资源用户 * fix: ViewSet 显示获取资源用户 Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
ibuler	2b2aa8f072	perf: 优化 换行	2 years ago
ibuler	772e540527	perf: 修改 connect token 换行	2 years ago
Jiangjie.Bai	29656b1630	fix: 修改获取 rdp-file / client-url / smart-endpoint 时endpoint host后台处理为当前请求的host	2 years ago
fit2bot	cc2b858769	fix: 修复获取令牌信息的remote app资产信息 (#8619) ... * fix: 修复连接令牌只获取自己的令牌信息；修复连接令牌系统用户角色权限问题（普通用户看不到）； * fix: 修复获取令牌信息的remote app资产信息 * fix: 修复获取用户个人信息时使用连接令牌 * fix: 修复获取profile时的连接令牌问题 * fix: 修复连接令牌问题 * fix: 修复连接令牌问题 Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
feng626	5055d140fd	fix: 修复host为空情况	2 years ago
ibuler	93a89509d6	perf: merge with dev	2 years ago
fit2bot	4fd82b9946	fix: 修改翻译 (#8602) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
Jiangjie.Bai	395636296d	fix: 修改连接token secret长度为16	2 years ago
Jiangjie.Bai	b262643f0a	fix: 连接令牌添加 expire_time 和 is_valid 字段	2 years ago
fit2bot	d789810984	fix: condirm (#8572) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	c7c0374c78	perf: 修改主题 (#8569) ... * perf: 优化登录 backend * perf: 修改主题 Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
Jiangjie.Bai	f3cf071362	feat: 修改connection token secret不显示	2 years ago
fit2bot	27cbbfbc79	refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑) (#8559) ... * refactor: 重构 Connection Token 模块 (完成 Model 设计和创建 Token 的API逻辑) * refactor: 重构 Connection Token 模块 (完成获取 Token 详细信息的 API 逻辑) * refactor: 重构 Connection Token 模块 (完成获取 RDP 文件 API 逻辑) * refactor: 重构 Connection Token 模块 (完成获取 Client url API 逻辑) * refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑) * refactor: 重构 Connection Token 模块 (完成删除原 Connection token 逻辑) * refactor: 重构 Connection Token 模块 (完成删除原 Connection) * refactor: 重构 Connection Token 模块 (完善序列类字段) * refactor: 重构 Connection Token 模块 (完善expire API) * refactor: 重构 Connection Token 模块 (完善迁移文件) * refactor: 重构 Connection Token 模块 (完善翻译文件) * refactor: 重构 Connection Token 模块 (拆分Connection ViewSet) * refactor: 重构 Connection Token 模块 (修改翻译) * refactor: 重构 Connection Token 模块 （优化) Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	2 years ago
fit2bot	06375110b9	fix: 修改mfa check 判断 (#8561) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	bf7c05f753	fix: 调整confirm (#8554) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	001e5d857f	pref: debug toolbar 太费时间 先禁用 (#8528) ... * perf: 修改主题色 * pref: debug toolbar 太费时间 先禁用 * perf: 修改颜色 * perf: 优化 interface * perf: 修改 avartar * perf: css color Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
fit2bot	75aacd0da6	fix: 用户登录错误处理bug (#8531) ... Co-authored-by: feng626 <1304903146@qq.com>	2 years ago
fit2bot	a6cc8a8b05	perf: 优化confirm接口 (#8451) ... * perf: 优化confirm接口 * perf: 修改 校验 * perf: 优化 confirm API 逻辑 * Delete django.po Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com> Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>	2 years ago
fit2bot	3cbce63c54	perf: 拆分登录 View (#8502) ... * perf: 拆分登录 View * perf: 修改 code Co-authored-by: ibuler <ibuler@qq.com>	2 years ago
ibuler	b619ebf423	perf: 修改 jumpserver 版本号，避免缓存	2 years ago
ibuler	3749a0c6a1	perf: 修复 middleware 导致的内存增长	2 years ago
ibuler	ac20bc05ba	perf: 优化 css	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
ibuler	fa51465485	perf: 修改去掉 导入 certs	2 years ago
ibuler	8f59bb2a48	perf: 优化登陆	2 years ago
ibuler	2366da1485	perf: redis AND login page	2 years ago
ibuler	f1a22575d3	perf: 优化登录页面	2 years ago
ibuler	7c1882bb53	perf: login	2 years ago
ibuler	8b819f3779	perf: 优化登录	2 years ago
feng626	75a72fb182	fix: user confirm bug	2 years ago
Jiangjie.Bai	9e16b79abe	fix: 修复openid用户登录时默认邮件后缀使用配置项	2 years ago
ibuler	10adb4e6b7	perf: 优化签名认证	2 years ago
ibuler	c6949b4f68	perf: 去掉 remote app 的加密	3 years ago
fit2bot	a5acdb9f60	perf: 统一校验当前用户api (#8324) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
Jiangjie.Bai	810c500402	feat: 添加配置项 CONNECTION_TOKEN_EXPIRATION	3 years ago
Jiangjie.Bai	af1150bb86	feat: OIDC 用户添加属性映射值	3 years ago
Jiangjie.Bai	15423291cc	fix: 修复ldap用户登录时用户组不设置	3 years ago
fit2bot	c8d7c7c56f	fix: 修复oidc认证不区分大小写 (#8267) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
ibuler	aa7540045b	feat: 添加 session guard	3 years ago
ibuler	e5f4b8000e	stash	3 years ago
Jiangjie.Bai	0fc5a33983	fix: 修复企业微信、钉钉、飞书登录跳转问题	3 years ago
fit2bot	aff5b0035d	perf: 优化加密 (#8206) ... * perf: 优化加密 * perf: 优化加密 * perf: 优化加密传输 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	031077c298	perf: password 等使用 rsa 加密传输 (#8188) ... * perf: 修改 model fields 路径 * stash it * pref: 统一加密方式，密码字段采用 rsa 加密 * pref: 临时密码使用 rsa * perf: 去掉 debug msg * perf: 去掉 Debug * perf: 去掉 debug * perf: 抽出来 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
jiangweidong	c56179e9e4	feat: 支持企业微信、钉钉直接审批工单 (#8115)	3 years ago
feng626	d23953932f	perf: connection token 分api权限	3 years ago
Jiangjie.Bai	00ed7bb025	perf: 优化 OIDC 支持选择认证方式	3 years ago
xiaziheng	b1aadf1ee9	Fix oidc (#8165)	3 years ago
jiangweidong	3a3f7eaf71	feat: 优化SAML2生成的metadata文件内容及属性映射	3 years ago
fit2bot	af9248ef7c	fix: 还原connection token 逻辑 (#8101) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
feng626	611a00a5fa	fix: 修复super user perm bug	3 years ago
Jiangjie.Bai	5f370c1c04	perf: 优化内置系统用户角色权限	3 years ago
ibuler	3e3835dc28	perf: 修改用户权限	3 years ago
ibuler	f4ed4e1176	perf: 添加 temp token 排序	3 years ago
fit2bot	a647e73c02	feat: 设置SessionCookieNamePrefix (#8071) ... * feat: 设置SessionCookieNamePrefix * feat: 设置SessionCookieNamePrefix Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	3 years ago
Jiangjie.Bai	97e59384e0	fix: connection token API 返回有效时间	3 years ago
fit2bot	b610d71e11	feat: 添加 临时 password (#8035) ... * perf: 添加 template password * perf: 修改id * perf: 修改 翻译 * perf: 修改 tmp token * perf: 修改 token Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	c630b11bd5	fix: port str (#8055) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
fit2bot	f481463c64	feat: 添加Endpoint (#8041) ... * feat: add Endpoint EndpointRule EndpointProtocol model * feat: add Endpoint EndpointRule EndpointProtocol API * feat: modify protocols field * feat: 修改序列类 * feat: 获取connect-url连接地址 * feat: 获取connect-url连接地址 * feat: 优化后台获取smart-endpoint逻辑 * feat: 优化后台获取smart-endpoint逻辑 * feat: 删除配置KOKO、XRDP、MAGNUS * feat: 删除配置KOKO、XRDP、MAGNUS * feat: 修改翻译 * feat: 修改smart endpoint * feat: 修改翻译 * feat: smart API 添加token解析 * feat: 删除 smart serializer * feat: 修改迁移逻辑 * feat: 解决冲突 * feat: 修改匹配 endpoint Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>	3 years ago
ibuler	ffd98c6e3f	fix: 修改 import	3 years ago
fit2bot	1f8ded49fa	feat: 工作台区分组织 (#8040) ... * perf: 工作台受组织角色控制 * perf: workspace => workbench * perf: 修改 workspace codename Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
ibuler	d418c28e98	perf: 修改 base	3 years ago
Jiangjie.Bai	54d1996507	feat: 支持续期Connection Token	3 years ago
feng626	d856f1364a	feat: 拉起ssh api	3 years ago
fit2bot	52709d2efa	feat: 企业微信、钉钉 工作台免密登录(飞书已实现) (#7855) ... * feat: 添加oauth接口 * feat: 企业微信支持OAuth认证，工作台免密登录 * feat: 钉钉支持OAuth认证，工作台免密登录 * fix: 修复参数错误 Co-authored-by: halo <wuyihuangw@gmail.com>	3 years ago
jiangweidong	03fdaa03e4	feat: 支持日语	3 years ago
Eric	fc06295d04	perf: 优化 windows rdp 窗口显示	3 years ago
fit2bot	ec9e5da653	fix: 修复apikey perm (#7918) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
fit2bot	08ff8fa285	fix: login confirm bug (#7914) ... Co-authored-by: feng626 <1304903146@qq.com>	3 years ago
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>	3 years ago
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>	3 years ago
Jiangjie.Bai	efb26132f6	fix: 修复sso用户登录失败的问题	3 years ago
ibuler	8839e6293b	perf: 修改 mfa 地址	3 years ago
feng626	ca5708988a	fix: 修复saml2 auth	3 years ago
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)	3 years ago
ibuler	5081fb5fe7	perf: 优化perm tree, 并添加缓存	3 years ago
fit2bot	a20884e2ad	perf: 修改 rbac tree (#7743) ... * perf: 修改 rbac tree * perf: 修改verbose name * fix: 修复系统用户 * fix: 还原 xpack Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
Jiangjie.Bai	8a8ed90eef	fix: 保留之前的jms_oidc_rp包	3 years ago
Jiangjie.Bai	75825f5baa	fix: 删除jms_oidc_rp包中的表jms_oidc_rp_oidcuser	3 years ago
fit2bot	dafc416783	Fix rbac (#7728) ... * perf: 重命名 signal handlers * fix: 修复 ticket processor 问题 * perf: 修改 ticket 处理人api * fix: 修复创建系统账号bug * fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序 * perf: 修改 authentication token * fix: 修复上传权限bug * fix: 登录页面增加i18n切换; * fix: 系统角色删除限制 * perf: 修改一下 permissions tree * perf: 生成 i18n * perf: 修改一点点 Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.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
Jiangjie.Bai	edfca5eb24	Fix rbac (#7699) ... * perf: 优化 suggesstion * perf: 修改 migrations * feat: 添加OIDC认证逻辑 * perf: 修改 backend * perf: 优化认证backends * perf: 优化认证backends * perf: 优化CAS认证, 用户多域名进行访问时回调到各自域名 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	63de4e1806	perf: 添加 is_org_admin (#7644) ... * fix: 修复 org members 的问题 * perf: 修改 org member * perf: 修改 is sa * perf: 修改 active * perf: 修复写法 * perf: is_sa to is_service_account Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
ibuler	20cc8a124f	perf: 修改connection token domain ... perf: 添加 org_id	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	35c6b581e2	feat: 远程应用支持磁盘挂载	3 years ago
ibuler	824d10ce93	pref: connection token 添加 secret	3 years ago
jiangweidong	ab34b9906e	perf: 切割一次就可以了	3 years ago
jiangweidong	755fa8efa8	perf: 兼容不同版本间JumpServer获取的SAML2协议用户属性	3 years ago
Michael Bai	8085db7acc	feat: 增加系统设置(安全)控制第三方认证用户是否进行MFA认证	3 years ago
xinwen	1faba95a48	fix: 修复 xrdp 连接资产时会生成用户登录日志	3 years ago
fit2bot	c43ad981bd	perf: 优化写法 (#7498) ... * fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示 fix tapd 1145454465001008371 * perf: 优化 send code api，避免暴力常识 * perf: 优化写法 * Update mfa.py Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>	3 years ago
jiangweidong	106bb9b63d	perf: SAML2属性映射去掉域名前缀	3 years ago
xinwen	cce34f4939	fix: 用户登录失败时，登陆日志中的认证方式不准确	3 years ago
fit2bot	4343b6487d	fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示 (#7495) ... * fix: 修复登录页输入 mfa 时不支持 某 mfa 的错误提示 fix tapd 1145454465001008371 * perf: 优化 send code api，避免暴力常识 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
xinwen	414137cd73	fix: 三方认证绑定发通知文案	3 years ago
xinwen	1e3a15a3d0	feat: 三方认证绑定发通知	3 years ago
Michael Bai	de9516dee5	feat: 应用授权增加Action动作控制	3 years ago
xinwen	89cad224c5	fix: SSO 限制用户删除	3 years ago
Michael Bai	5aed04d58b	fix: 修改SAML2.0 Logo	3 years ago
ibuler	b92530f0b9	perf: 优化通知，对支持 markdown 的发 markdown	3 years ago
ibuler	eb3165f8e7	perf: 优化 saml	3 years ago
Michael Bai	4cbf6dd5e6	fix: 修复获取系统用户认证信息API	3 years ago
jiangweidong	5139f9c4b9	feat: saml2认证支持https协议	3 years ago
ibuler	330917df4c	fix: 修复 saml2 登陆的问题	3 years ago
ibuler	5024d0d739	perf: 优化 saml2 log	3 years ago
jiangweidong	c5013dcbd6	feat: saml2协议单点登录支持在页面上配置saml2协议的高级配置 (#7362)	3 years ago
ibuler	b6249e9a63	fix: 修复登录时跳转问题	3 years ago
ibuler	ade3f3ae6c	fix: 修复需要设置 mfa 的 bug	3 years ago
fit2bot	3962af7c4f	feat: 支持saml2协议的单点登录，合并代码 (#7347) ... * fix: 支持saml2协议的单点登录 * feat: 支持saml2协议的单点登录，合并代码 Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>	3 years ago
xinwen	16fae00e0e	feat: xrdp 远程应用	3 years ago
ibuler	84bce19a92	perf: 去掉登录页面更好	3 years ago
ibuler	7f0ad7e27f	fix: 修复 oidc cas 登录时跳转问题 ... perf: 优化一波，容易debug perf: 还原回来的世界	3 years ago
ibuler	5ace5a752e	fix: 修复 cas/oidc 登录 MFA 产生的bug ... perf: 优化更严谨	3 years ago
ibuler	1132c6a4e4	fix: 修复 mfa radius 登录的bug	3 years ago
feng626	24d0d52a0a	perf: 优化ip黑白名单	3 years ago
fit2bot	086ecfc046	perf: 优化全局ip限制逻辑 (#7220) ... * perf: 优化全局ip限制逻辑 * perf: 优化全局ip限制逻辑 2 * perf: 优化全局ip限制逻辑 3 Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: Michael Bai <baijiangjie@gmail.com>	3 years ago
fit2bot	8af88cd2c6	fix: 修复otp verify msg引起的500 (#7210) ... Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
ibuler	cc2d47e6dc	perf: 修复首页登录mfa错误提示	3 years ago
fit2bot	ed01f2f1fb	fix: 修复xrdp连接时报错 (#7202) ... * fix: 修复xrdp连接时报错 perf: 添加注释 * perf: 去掉import Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
ibuler	cb1c906db4	fix: 修复登录时没有绑定mfa，没有跳转的问题 ... fix: 首页登录如果没有则后续登录	3 years ago
xinwen	9a7919f3ac	fix: 更新公钥消息不对	3 years ago
feng626	90477146ed	feat: 添加全局ip黑名单	3 years ago
ibuler	353b66bf8f	fix: 修复创建token的问题	3 years ago
xinwen	b28ce9de7a	feat: xrdp session bpp 读取环境变量	3 years ago
fit2bot	17303c0550	pref: 优化MFA (#7153) ... * perf: 优化mfa 和登录 * perf: stash * stash * pref: 基本完成 * perf: remove init function * perf: 优化命名 * perf: 优化backends * perf: 基本完成优化 * perf: 修复首页登录时没有 toastr 的问题 Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>	3 years ago
xinwen	bac974b4f2	feat: 异地登录提醒可配置是否启用	3 years ago
feng626	55775f0deb	perf: 异地登陆去掉本地判断	3 years ago
feng626	2e4b6d150a	fix: 登录复合浏览器不兼容	3 years ago
feng626	380226a7d2	fix: 用户登陆mfa code为空限制	3 years ago
xinwen	7d56678a8e	fix: 修复登录次数出现 0	3 years ago
ibuler	cd5094f10d	perf: 优化通知中的连接点击	3 years ago
fit2bot	c244cf5f43	pref: 修改使用的消息内容 (#7061) ... * perf: 再次优化通知 * pref: 修改使用的消息内容 * perf: 修复url地址 Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
feng626	d1a3d31d3f	feat: 客户端协议内容添加rdp文件名	3 years ago
ibuler	10f4ff4eec	fix: 修复工单通知内容bug	3 years ago
ibuler	25ea3ba01d	perf: 修改sdk位置	3 years ago
ibuler	072865f3e5	perf: 优化修改 sdk 位置	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	9424929dde	fix: sms bug	3 years ago
Michael Bai	af2a9bb1e6	fix: 修复用户登录失败未记录日志的问题	3 years ago
fit2bot	63638ed1ce	feat: 首页的 chanlege 和 MFA 统一 (#6989) ... * feat: 首页的 chanlege 和 MFA 统一 * 登陆样式调整 * mfa bug * q * m * mfa封装组件 前端可修改配置 * perf: 添加翻译 * login css bug * perf: 修改一些风格 * perf: 修改命名 * perf: 修改 mfa code 不是必填 * mfa 前端统一组件 * stash * perf: 统一验证码 Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
fit2bot	fa68389028	perf: 去掉单独的flash msg (#7013) ... * perf: 去掉单独的flash msg perf: 修改使用库 * fix: guangbug * pref: 修改 context Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: xinwen <coderWen@126.com>	3 years ago
fit2bot	5d8818e69e	feat: 添加资产授权用户API、资产授权用户的授权规则API (#7008) ... * feat: 添加资产授权用户API、资产授权用户的授权规则API * feat: 添加资产授权用户组API、资产授权用户组的授权规则API * feat: 抽象API类 Co-authored-by: Michael Bai <baijiangjie@gmail.com>	3 years ago
xinwen	77521119b9	fix: 修改 oauth 认证提示信息	3 years ago
xinwen	63ca2ab182	fix: 修复 traceback 问题	3 years ago
xinwen	6e0341b7b1	feat: xrdp挂载受授权的上传下载控制	3 years ago
halo	87dcd2dcb7	feat: 增加关闭第三方登录跳转配置参数	3 years ago
feng626	5588eab57e	feat: 用户异地登陆	3 years ago
ibuler	cafbd08986	perf: 修改啊	3 years ago
ibuler	b436fc9b44	perf: 优化登录	3 years ago
ibuler	26fc56b4be	perf: 优化登录html	3 years ago
ibuler	da2dea5003	perf: 登录错误提示颜色	3 years ago
ibuler	2c46072db2	fix: 修复serializer问题	3 years ago
xinwen	a784a33203	fix: 去掉手动系统用户提示输入密码	3 years ago
ibuler	ef7b2b7980	perf: 优化登录错误提示	3 years ago
feng626	0f7c8c2570	fix: 工单复核bug	3 years ago
xinwen	b30123054b	fix: xrdp 手动登录系统用户仍然不需要输入密码	3 years ago
xinwen	1c4b4951dc	fix: 一些提示	3 years ago
feng626	6507f0982c	fix: 登陆复核返回后 删除工单	3 years ago
feng626	f762fe73ff	fix: 工单拒绝清除mfa	3 years ago
xinwen	d49d1ba055	perf: oauth2 登录不再限制只能本地用户	3 years ago
ibuler	8ac7d4b682	perf: 优化登录backends	3 years ago
xinwen	29645768a0	fix: 登录复核没有日志	3 years ago
feng626	17a5e919d5	fix: ticket bug	3 years ago
xinwen	09d51fd5be	fix: OTP_IN_RADIUS 与 mfa 冲突	3 years ago
xinwen	58a10778cd	fix: 修复短信问题	3 years ago
feng626	345c0fcf4f	fix: 修复工单流bug 添加登陆审核配置	3 years ago
Michael Bai	42c3c85863	fix: 修改翻译	3 years ago
fit2bot	81000953e2	fix: 修改消息订阅 (#6789) ... Co-authored-by: xinwen <coderWen@126.com>	3 years ago
xinwen	b1fceca8a6	feat: 添加短信服务和用户消息通知	3 years ago
xinwen	dac3f7fc71	refactor: 修改 xrdp 挂载磁盘参数名称	3 years ago
fit2bot	07179a4d22	feat: 页面配置serializer版 (#6750) ... * feat: 页面配置serializer版 * perf: 优化配置 * perf: 优化设置 * perf: 优化设置 * perf: 优化配置页面 * perf: 基本完成设置优化 Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: ibuler <ibuler@qq.com>	3 years ago
xinwen	3fb368c741	fix: 修复 xrdp domain 不生效	3 years ago
fit2bot	fca3a8fbca	perf: 绑定MFA认证密码时对密码进行加密传输 (#6776) ... * perf: 绑定MFA认证密码时对密码进行加密传输 * perf: 绑定MFA认证密码时对密码进行加密传输 Co-authored-by: Michael Bai <baijiangjie@gmail.com>	3 years ago
xinwen	c1375ed7cb	feat: xrdp 支持挂载本地磁盘(仅适用于 win)	3 years ago
健健	0b1a1591f8	从 __all__ 中删除 RDPFileSerializer (#6727) ... * 从 __all__ 中删除 RDPFileSerializer RDPFileSerializer 已经被删除 Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com> Co-authored-by: 老广 <ibuler@qq.com> Co-authored-by: xinwen <coderWen@126.com> Co-authored-by: Eric_Lee <xplzv@126.com>	3 years ago
ibuler	6241238b45	feat: sso支持验证mfa	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
xinwen	7d123ff8c5	fix: 登录时验证码卡住	3 years ago
xinwen	7b4faccf05	fix: 飞书没有翻译	3 years ago
fit2bot	54751a715c	feat: 添加 飞书 (#6602) ... * feat: 添加 飞书 Co-authored-by: xinwen <coderWen@126.com> Co-authored-by: wenyann <64353056+wenyann@users.noreply.github.com>	3 years ago