github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-04 08:55:40 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 解决下载导入模版时KeyError的问题（数据为空时） (#3017)

Browse Source 
* [Bugfix] 解决下载导入模版时KeyError的问题（数据为空时）

* [Bugfix] 解决下载导入模版时KeyError的问题（数据为空时）2

* [Bugfix] 解决下载导入模版时KeyError的问题（数据为空时）3

* [Update] 解决LDAP用户禁用后，终端还可以登录成功一次的问题

* [Update] 解决LDAP用户禁用后，终端还可以登录成功一次的问题2

* [Update] LDAP AD Server可以通过UserAccountControl映射is_active字段

* [Update] 限制只有local用户可以更新ssh key

* [Update] 限制只有local用户可以更新ssh key 2
This commit is contained in:
BaiJiangJie
2019-07-24 12:50:39 +08:00
committed by 老广
parent 421e98696c
commit c929c1a87e
19 changed files with 338 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/users/utils.py
View File

@@ -198,7 +198,7 @@ def check_user_valid(**kwargs):
if password and authenticate(username=username, password=password):
return user, ''
if public_key and user.public_key:
if public_key and user.public_key and user.is_local:
public_key_saved = user.public_key.split()
if len(public_key_saved) == 1:
if public_key == public_key_saved[0]: