Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
cb12b83e
Commit
cb12b83e
authored
9 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
cd798daf
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
mytags.py
jumpserver/templatetags/mytags.py
+1
-1
views.py
juser/views.py
+5
-7
user_list.html
templates/juser/user_list.html
+1
-1
No files found.
jumpserver/templatetags/mytags.py
View file @
cb12b83e
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
juser/views.py
View file @
cb12b83e
...
@@ -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
u
ser_id
:
if
u
uid_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
)
...
...
This diff is collapsed.
Click to expand it.
templates/juser/user_list.html
View file @
cb12b83e
...
@@ -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.uu
id }}"
>
下载
</a>
{% else %}
{% else %}
<span
style=
"color: #586b7d"
>
下载
</span>
<span
style=
"color: #586b7d"
>
下载
</span>
{% endif %}
{% endif %}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment