github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-18 00:41:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3035 from jumpserver/dev

Browse Source 
Dev
This commit is contained in:
BaiJiangJie 2019-07-26 10:50:30 +08:00 committed by GitHub
commit be59bff3d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/users/models/user.py
View File

@ -55,7 +55,10 @@ class AuthMixin:
return self.is_local return self.is_local
def can_update_ssh_key(self): def can_update_ssh_key(self):
return self.is_local return self.can_use_ssh_key_login()
def can_use_ssh_key_login(self):
return settings.TERMINAL_PUBLIC_KEY_AUTH
def check_otp(self, code): def check_otp(self, code):
from ..utils import check_otp_code from ..utils import check_otp_code

2
apps/users/utils.py
View File

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