diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index b7d7fde93..cca4deba3 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -237,7 +237,7 @@ def key_exist(username): """ ssh key is exist or not """ - if os.path.isfile(os.path.join(KEY_DIR, 'user', username)): + if os.path.isfile(os.path.join(KEY_DIR, 'user', username+'pem')): return True else: return False diff --git a/juser/views.py b/juser/views.py index 12febbf7e..3f75c46b8 100644 --- a/juser/views.py +++ b/juser/views.py @@ -458,15 +458,13 @@ def regen_ssh_key(request): @require_role(role='user') def down_key(request): - user_id = '' if is_role_request(request, 'super'): - user_id = request.GET.get('id') + uuid_r = request.GET.get('uuid', '') + else: + uuid_r = request.user.uuid - if is_role_request(request, 'user'): - user_id = request.user.id - - if user_id: - user = get_object(User, id=user_id) + if uuid_r: + user = get_object(User, uuid=uuid_r) if user: username = user.username private_key_file = os.path.join(KEY_DIR, 'user', username) diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html index e2f992409..01a62ccff 100644 --- a/templates/juser/user_list.html +++ b/templates/juser/user_list.html @@ -68,7 +68,7 @@