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

Modify terminal reqject templatte

Browse Source
This commit is contained in:
ibuler
2017-01-03 00:11:44 +08:00
parent 0907f5021e
commit b670259ab6
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/utils.py
View File

@@ -195,10 +195,10 @@ def check_user_valid(**kwargs):
elif not user.is_valid:
return None, _('Disabled or expired')
if password and user.check_password(password):
if password and user.password and user.check_password(password):
return user, ''
if public_key:
if public_key and user.public_key:
public_key_saved = user.public_key.split()
if len(public_key_saved) == 1:
if public_key == public_key_saved[0]: