mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-08-31 23:20:37 +00:00
Fix pubkey auth bug
This commit is contained in:
@@ -140,4 +140,4 @@ class UserTokenApi(APIView):
|
||||
cache.set('%s_%s' % (user.id, remote_addr), token, self.expiration)
|
||||
return Response({'token': token, 'id': user.id, 'username': user.username, 'name': user.name})
|
||||
else:
|
||||
return Response({'msg': 'Invalid password or public key or user is not active or expired'})
|
||||
return Response({'msg': 'Invalid password or public key or user is not active or expired'}, status=401)
|
||||
|
@@ -187,8 +187,14 @@ def check_user_valid(**kwargs):
|
||||
return None
|
||||
if password and user.check_password(password):
|
||||
return user
|
||||
if public_key and user.public_key == public_key:
|
||||
return user
|
||||
if public_key:
|
||||
public_key_saved = user.public_key.split()
|
||||
if len(public_key_saved) == 1:
|
||||
if public_key == public_key_saved[0]:
|
||||
return user
|
||||
elif len(public_key_saved) > 1:
|
||||
if public_key == public_key_saved[1]:
|
||||
return user
|
||||
return None
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user