github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,169 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

5169 Commits (4d4a10710184f611ede99c4bcf61921a8c717508)

Author SHA1 Message Date
Eric 79eb838250 [Update] setting fields automatically generated by serializer 2020-04-29 18:10:42 +08:00
Eric 82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 17:09:50 +08:00
Eric 2d18acf6f7 [Update] settings api 2020-04-29 17:04:58 +08:00
BaiJiangJie a860bed34f
[Update] 修改config_example配置（openid） (#3951) 
* [Update] 修改config_example配置（openid）

* [Update] 修改config_example配置（openid）2
 2020-04-29 16:57:10 +08:00
ibuler f8c323cf5c [Update] 优化user group serializer 2020-04-29 16:01:14 +08:00
ibuler b6f5b335bd Merge branch 'api_perf' into lina 2020-04-29 15:47:46 +08:00
Eric f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 14:33:22 +08:00
ibuler 5c4dfabc48 [Update] 修改settings 2020-04-29 14:32:51 +08:00
BaiJiangJie 72ccaf7b1c
Merge pull request #3949 from jumpserver/dev_openid 
Dev openid
 2020-04-29 14:25:32 +08:00
Bai e4b788a012 [Update] 修改依赖版本 jumpserver-dajngo-oidc-rp (0.3.7.2) 2020-04-29 14:07:54 +08:00
Bai 6eaba4e2fb [Update] openid配置分块 2020-04-29 14:03:48 +08:00
ibuler 0c0c0e6d6f Merge branch 'dev' into lina 2020-04-29 13:00:47 +08:00
Eric 20cf7c7c52 [Update] Add settings api 2020-04-29 11:09:35 +08:00
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-04-29 10:21:06 +08:00
ibuler aa9533eb5b [Update] Groups users字段可以显示 2020-04-29 10:19:25 +08:00
Bai 23f9454e5d [Update] 修改Url name (oidc => openi) 2020-04-29 01:12:00 +08:00
Bai 9eee79f7d4 [Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出 2020-04-29 00:43:54 +08:00
Bai c0089a98f4 [Update] 修改openid信号名称 2020-04-28 22:29:56 +08:00
Bai 87242c13a1 [Update] 修改信号监听kwargs 2020-04-28 21:06:13 +08:00
Bai 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听 2020-04-28 21:00:22 +08:00
BaiJiangJie 555861c319
Merge pull request #3943 from jumpserver/dev_conf 
[Update] 修改config_example(openid)
 2020-04-27 12:50:03 +08:00
Bai a505995f49 [Update] 修改config_example(openid) 2020-04-27 11:36:11 +08:00
BaiJiangJie b477b649f5
Merge pull request #3942 from jumpserver/dev_docker 
[Update] 修改Dockerfile pypi 镜像源(阿里=>清华)
 2020-04-26 22:41:49 +08:00
Michael Bai 6e18383531 [Update] 修改Dockerfile pypi 镜像源(阿里=>清华) 2020-04-26 22:40:56 +08:00
BaiJiangJie 7833ff6671
Dev oidc (#3941) 
* [Update] oidc_rp获取token添加headers base64编码

* [Update] 移除对oidc_rp的支持

* [Update] 移除对oidc_rp的支持2

* [Update] 修改OpenID配置（添加新配置项，并对旧配置项做兼容）

* [Update] 移除所有与Keycloak相关的模块

* [Update] 添加jumpserver-django-oidc-rp的使用

* [Update] 更新登录重定向地址(oidc)

* [Update] oidc添加一些配置参数；处理用户登录/创建/更新等信号

* [Update] 修改退出登录逻辑

* [Update] 添加oidc user登录成功的信号机制

* [Update] 修改mfa认证choices内容 (otp => code)

* [Update] 添加OpenID backend password 认证失败信号机制；修改引入common包问题

* [Update] 用户Token/Auth API 校验用户时，传入request参数（解决登录成功日志记录的问题）

* [Update] 添加依赖jumpserver-django-oidc-rp==0.3.7.1

* [Update] oidc认证模块说明
 2020-04-26 20:36:17 +08:00
BaiJiangJie 5d433456d4
Merge pull request #3937 from jumpserver/dev_index 
[Update] 更新仪表盘数据显示问题
 2020-04-24 11:30:30 +08:00
Bai fc5ec3f21c [Update] 更新仪表盘数据显示问题 2020-04-24 11:29:01 +08:00
ibuler efb5d4135a [Update] 优化api字段显示 2020-04-23 11:14:02 +08:00
ibuler 5f2c9c3801 [Update] 添加 authentication backend header 2020-04-22 15:13:04 +08:00
BaiJiangJie 56f38e57bc
Merge pull request #3932 from jumpserver/dev_oidc 
[Update] 添加oidc-op配置信息
 2020-04-22 11:11:47 +08:00
Bai 586c04cba6 [Update] 添加oidc-op配置信息 2020-04-22 11:09:13 +08:00
Bai 306605915c [Update] 添加依赖 django-oidc-rp==0.3.4 2020-04-22 00:31:59 +08:00
BaiJiangJie 272701a8fd
Dev oidc (#3930) 
* [Update] 添加django-oidc-rp支持

* [Update] 添加django-oidc-rp支持2

* [Update] 调试django-oidc-rp对keycloak的支持

* [Update] 调试django-oidc-rp对keycloak的支持2

* [Update] 修改oidc_rp创建用户/更新用户的功能

* [Update] oidc_rp添加支持password认证

* [Update] 重写oidc_rp end session view

* [Update] 优化 oidc_rp view backend url 等引用关系
 2020-04-22 00:22:24 +08:00
BaiJiangJie 9febe488b5
Merge pull request #3929 from jumpserver/lina_terminal 
[Update] add terminal model fileds
 2020-04-21 22:23:53 +08:00
Eric c8c6ba1c19 [Update] add terminal model fileds 2020-04-21 17:37:29 +08:00
老广 2df7bd8510
Merge pull request #3926 from jumpserver/fix_otp_error 
Fix otp error
 2020-04-20 17:00:54 +08:00
老广 c16a986c4b
Merge pull request #3925 from jumpserver/bugfix_many_sqlquery_perm_asset 
[Bugfix] 修复查询授权时额外查询platform的问题
 2020-04-20 16:58:14 +08:00
ibuler 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题 2020-04-20 16:56:47 +08:00
ibuler 91c994924f [Update] 修改报错文案 2020-04-20 10:44:45 +08:00
ibuler 61407331bc [Bugfix] 修复otp登录时导致的500 2020-04-20 10:37:07 +08:00
BaiJiangJie 1b1a686b96
Merge pull request #3922 from jumpserver/dev 
Dev
 2020-04-18 23:19:11 +08:00
BaiJiangJie cc30a20b7c
Merge pull request #3921 from jumpserver/dev 
Dev
 2020-04-18 23:15:42 +08:00
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2 (#3919) 
* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题3

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题4
 2020-04-18 23:14:25 +08:00
BaiJiangJie 386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity 
[Update] 修复资产页面可连接性
 2020-04-18 10:42:55 +08:00
BaiJiangJie 5677bf0995
Merge pull request #3915 from jumpserver/dev 
Dev
 2020-04-18 01:27:09 +08:00
BaiJiangJie c17dc26f8c
Merge pull request #3916 from jumpserver/dev_org 
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题
 2020-04-18 01:24:21 +08:00
Bai b4cc2bbff9 [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题 2020-04-18 01:22:48 +08:00
BaiJiangJie e74289b223
[Update] 修改用户密码重置页面错误信息提示2 (#3914) 2020-04-17 23:41:50 +08:00
ibuler 98afa032a7 [Update] 修复资产页面可连接性 2020-04-17 16:32:38 +08:00
BaiJiangJie 0d3fab216b
Merge pull request #3910 from jumpserver/dev_user 
[Update] 修改用户密码重置页面错误信息提示
 2020-04-17 11:27:26 +08:00