github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,855 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

454 Commits (8b351f49e530f366c3a4371f5288ec55c83adfd1)

Author SHA1 Message Date
ibuler f6e403fd8b pref: 修改 asset permission 2022-11-11 15:04:31 +08:00
Jiangjie.Bai cd93de4c00 perf: 优化 Connection Token API 逻辑处理 2022-11-08 14:30:07 +08:00
ibuler 0fb96091cc perf: 优化代码速度 2022-11-04 20:15:31 +08:00
ibuler 4405064e78 pref: 添加 api debug timer 2022-11-04 20:14:19 +08:00
Jiangjie.Bai 2797baa4e5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-31 20:16:21 +08:00
feng 5bd40fcd22 fix: swagger 2022-10-31 19:27:45 +08:00
Jiangjie.Bai 81e3809435 refactor: 修改 ConnectionToken API 结构 2022-10-31 18:47:12 +08:00
Jiangjie.Bai bcd1d5585b refactor: ConnectionToken 修改 Model 和序列类 2022-10-28 15:58:05 +08:00
Jiangjie.Bai 2b5b4ad605 refactor: ConnectionToken 修改表字段名称 account -> account_username 2022-10-28 15:01:17 +08:00
Jiangjie.Bai 3d616b01b0 refactor: ConnectionToken 添加 protocol 字段 2022-10-27 20:01:50 +08:00
Jiangjie.Bai bb01a60fc1 refactor: 修改 authentication models 目录 2022-10-27 17:20:31 +08:00
Jiangjie.Bai 5d37d1b7b1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 15:48:02 +08:00
Jiangjie.Bai a260da6cec refactor: 修改 ConnectionToken 关联的逻辑(1) 2022-10-27 15:47:05 +08:00
ibuler 1239247b5a pref: 修改删掉 connection token type 2022-10-26 17:56:37 +08:00
Jiangjie.Bai bd001bb262 refactor: 修改 ConnectionToken 表结构 2022-10-26 16:16:12 +08:00
Jiangjie.Bai fb6f51b9cb merge: dev 2022-10-26 16:15:22 +08:00
Jiangjie.Bai 13279c9d2a refactor: 修改 ConnectionToken 表结构 2022-10-26 16:09:07 +08:00
ibuler c018055d5f pref: 修改migrations 2022-10-25 19:58:14 +08:00
Jiangjie.Bai 11eb505c78 refactor: 修改 ConnectionToken 表结构 2022-10-25 19:10:12 +08:00
ibuler 1b0195cb82 perf: 修改 asset 结构 2022-09-21 11:17:14 +08:00
feng626 615f36c6f6 perf: 收集账号 2022-09-20 16:18:23 +08:00
Jiangjie.Bai a27aeca2fd refactor: 修改授权相关Model,Serializer,API结构 2022-09-07 17:35:23 +08:00
ibuler d9663036f8 perf: revert csrf token project 2022-09-05 13:07:20 +08:00
ibuler 2354650b82 perf: 暂时去掉 csrf token 2022-09-05 12:47:01 +08:00
ibuler 951d4e4e0d perf: 合并冲突 2022-08-30 10:07:03 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
ibuler 1e57a0eb1f perf: merge v3 2022-08-23 10:26:43 +08:00
ibuler ab46194039 perf: 修改 导入 2022-08-23 10:23:48 +08:00
feng626 97c6e2c0b2 修复migrate bug 2022-08-22 18:48:07 +08:00
feng626 fe4df4b179 fix: 修复swagger 2022-08-19 19:01:26 +08:00
feng626 37b150bc04 fix: 表单提交csrftoken问题 2022-08-19 17:22:59 +08:00
Jiangjie.Bai 8ae98887ee
Revert "fix: 修复服务端渲染请求缺少csrf token 问题" (#8780) 
This reverts commit 24a1738e73.
 2022-08-19 14:19:47 +08:00
feng626 24a1738e73 fix: 修复服务端渲染请求缺少csrf token 问题 2022-08-19 10:52:59 +08:00
Jiangjie.Bai 867ad94a30 fix: 修改认证重定向地址 scheme 取值逻辑 2022-08-17 15:23:35 +08:00
fit2bot 7d0a19635a
fix: 修复登录符合拒绝时 登录日志类型异常问题 (#8758) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-17 14:45:02 +08:00
ibuler 3f47e63080 perf: remove system user 2022-08-17 11:54:18 +08:00
fit2bot d405bae205
fix: 修复认证失败后错误信息总是 IP block 的问题 (#8755) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-08-16 17:46:17 +08:00
fit2bot 68841d1f15
fix: 配置仅已存在用户登录后 cas用户首次登录报403 (#8752) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-16 17:24:58 +08:00
ibuler 2948d5af7f perf: 删除一部分 system user 2022-08-16 16:34:16 +08:00
fit2bot 5559f112db
fix: 用户登录复合500 (#8743) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-15 16:21:27 +08:00
feng626 0eaaa7b4f6 fix: 用户异地登陆bug 2022-08-15 10:45:22 +08:00
fit2bot 18af5e8c4a
fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】 (#8739) 
* fix: 【登录】第三方用户登录复核，拒绝状态，未真正拦截

* fix: 【登录日志】登录复核用户被拒绝，登录日志无登录日志记录】

* fix: 【登录日志】用户设置登录复核，登录。此时不处理工单，管理员全局组织下查看登录日志，日志无限新增，且无记录用户名】

Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>
 2022-08-12 18:01:04 +08:00
ibuler d402ba5d92 perf: 修改资产名称 2022-08-11 15:45:03 +08:00
huangzhiwen a14ebc5f0f fix: 解决第三方登录无限重定向问题 2022-08-10 19:32:39 +08:00
Eric acf8b5798b perf: 优化rdp文件名的显示 2022-08-10 18:41:38 +08:00
fit2bot 30fe5214c7
fix: 增加上了第三方用户登录失败的原因 (#8714) 
* feat: OAuth2.0登录方式加上用户登录规则校验

* fix: 修复第三方用户登录规则（复核）问题

* fix: 增加上了第三方用户登录失败的原因

* fix: 修改变量名称

Co-authored-by: huangzhiwen <zhiwen.huang@fit2cloud.com>
 2022-08-10 11:03:51 +08:00
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>
 2022-08-09 11:24:28 +08:00
Jiangjie.Bai c295f1451a fix: 修复登录失败日志的原因信息 2022-08-08 15:49:03 +08:00
Jiangjie.Bai c4a94876cc fix: 增加配置项 SECURE_PROXY_SSL_HEADER request build url 时获取对应的 scheme 2022-08-08 15:00:26 +08:00
ibuler 196e38897f perf: 修改 protcols 2022-08-05 15:46:36 +08:00