Commit cb12b83e authored by ibuler's avatar ibuler

bug fix

parent cd798daf
...@@ -237,7 +237,7 @@ def key_exist(username): ...@@ -237,7 +237,7 @@ def key_exist(username):
""" """
ssh key is exist or not 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 return True
else: else:
return False return False
......
...@@ -458,15 +458,13 @@ def regen_ssh_key(request): ...@@ -458,15 +458,13 @@ def regen_ssh_key(request):
@require_role(role='user') @require_role(role='user')
def down_key(request): def down_key(request):
user_id = ''
if is_role_request(request, 'super'): if is_role_request(request, 'super'):
user_id = request.GET.get('id') uuid_r = request.GET.get('uuid', '')
else:
if is_role_request(request, 'user'): uuid_r = request.user.uuid
user_id = request.user.id
if user_id: if uuid_r:
user = get_object(User, id=user_id) user = get_object(User, uuid=uuid_r)
if user: if user:
username = user.username username = user.username
private_key_file = os.path.join(KEY_DIR, 'user', username) private_key_file = os.path.join(KEY_DIR, 'user', username)
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<td class="text-center">{{ user.is_active | bool2str }}</td> <td class="text-center">{{ user.is_active | bool2str }}</td>
<td class="text-center"> <td class="text-center">
{% if user.username|key_exist %} {% if user.username|key_exist %}
<a href="/juser/down_key/?id={{ user.id }}" >下载</a> <a href="/juser/down_key/?uuid={{ user.uuid }}" >下载</a>
{% else %} {% else %}
<span style="color: #586b7d">下载</span> <span style="color: #586b7d">下载</span>
{% endif %} {% endif %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment