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
d9d009ab
Commit
d9d009ab
authored
9 years ago
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
parents
4e5c5010
34e8b321
master
auditor_jym
audits
dev
dev_beta
dev_beta_db
gengmei
lagacy-0.4.0
node_service
password
rbac
restrict_access
test
v52
wph
1.5.2
1.5.1
1.5.0
1.4.10
1.4.9
1.4.8
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.3
1.3.2
1.3.1
1.3.0
1.2.1
1.2.0
1.1.1
1.1.0
1.0.0
0.3.3
0.3.2
0.3.2-rc2
0.3.1
0.3.0-beta
v1.4.10
v1.4.7
v1.4.4
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
15 deletions
+24
-15
views.py
jperm/views.py
+7
-1
perm_role_add.html
templates/jperm/perm_role_add.html
+4
-10
perm_role_edit.html
templates/jperm/perm_role_edit.html
+12
-3
perm_role_list.html
templates/jperm/perm_role_list.html
+1
-1
No files found.
jperm/views.py
View file @
d9d009ab
...
@@ -277,7 +277,7 @@ def perm_role_add(request):
...
@@ -277,7 +277,7 @@ def perm_role_add(request):
if
request
.
method
==
"POST"
:
if
request
.
method
==
"POST"
:
# 获取参数: name, comment
# 获取参数: name, comment
name
=
request
.
POST
.
get
(
"role_name"
,
""
)
name
=
request
.
POST
.
get
(
"role_name"
,
""
)
.
strip
()
comment
=
request
.
POST
.
get
(
"role_comment"
,
""
)
comment
=
request
.
POST
.
get
(
"role_comment"
,
""
)
password
=
request
.
POST
.
get
(
"role_password"
,
""
)
password
=
request
.
POST
.
get
(
"role_password"
,
""
)
key_content
=
request
.
POST
.
get
(
"role_key"
,
""
)
key_content
=
request
.
POST
.
get
(
"role_key"
,
""
)
...
@@ -286,6 +286,8 @@ def perm_role_add(request):
...
@@ -286,6 +286,8 @@ def perm_role_add(request):
try
:
try
:
if
get_object
(
PermRole
,
name
=
name
):
if
get_object
(
PermRole
,
name
=
name
):
raise
ServerError
(
u'已经存在该用户
%
s'
%
name
)
raise
ServerError
(
u'已经存在该用户
%
s'
%
name
)
if
name
==
"root"
:
raise
ServerError
(
u'禁止使用root用户作为系统用户,这样非常危险!'
)
default
=
get_object
(
Setting
,
name
=
'default'
)
default
=
get_object
(
Setting
,
name
=
'default'
)
if
password
:
if
password
:
...
@@ -423,6 +425,9 @@ def perm_role_edit(request):
...
@@ -423,6 +425,9 @@ def perm_role_edit(request):
if
not
role
:
if
not
role
:
raise
ServerError
(
'该系统用户不能存在'
)
raise
ServerError
(
'该系统用户不能存在'
)
if
role_name
==
"root"
:
raise
ServerError
(
u'禁止使用root用户作为系统用户,这样非常危险!'
)
if
role_password
:
if
role_password
:
encrypt_pass
=
CRYPTOR
.
encrypt
(
role_password
)
encrypt_pass
=
CRYPTOR
.
encrypt
(
role_password
)
role
.
password
=
encrypt_pass
role
.
password
=
encrypt_pass
...
@@ -473,6 +478,7 @@ def perm_role_push(request):
...
@@ -473,6 +478,7 @@ def perm_role_push(request):
for
asset_group
in
asset_groups_obj
:
for
asset_group
in
asset_groups_obj
:
group_assets_obj
.
extend
(
asset_group
.
asset_set
.
all
())
group_assets_obj
.
extend
(
asset_group
.
asset_set
.
all
())
calc_assets
=
list
(
set
(
assets_obj
)
|
set
(
group_assets_obj
))
calc_assets
=
list
(
set
(
assets_obj
)
|
set
(
group_assets_obj
))
push_resource
=
gen_resource
(
calc_assets
)
push_resource
=
gen_resource
(
calc_assets
)
# 调用Ansible API 进行推送
# 调用Ansible API 进行推送
...
...
This diff is collapsed.
Click to expand it.
templates/jperm/perm_role_add.html
View file @
d9d009ab
...
@@ -93,15 +93,14 @@ $('#roleForm').validator({
...
@@ -93,15 +93,14 @@ $('#roleForm').validator({
theme
:
"yellow_right_effect"
,
theme
:
"yellow_right_effect"
,
rules
:
{
rules
:
{
check_name
:
[
/^
\w{2,20}
$/
,
'大小写字母数字和下划线,2-20位'
],
check_name
:
[
/^
\w{2,20}
$/
,
'大小写字母数字和下划线,2-20位'
],
check_name_root
:
[
/
[^
rR
][^
oO
][^
oO
][^
tT
]
/
,
'禁止使用root用户作为系统用户,这样非常危险!'
],
check_begin
:
[
/^
[\-]
+BEGIN RSA PRIVATE KEY
[\-]
+/gm
,
'RSA Key填写有误,请检查'
],
check_begin
:
[
/^
[\-]
+BEGIN RSA PRIVATE KEY
[\-]
+/gm
,
'RSA Key填写有误,请检查'
],
{
#
either
:
function
(){
#
}
{
#
return
$
(
'#role_password'
).
val
()
==
''
#
}
{
#
}
#
}
},
},
fields
:
{
fields
:
{
"role_name"
:
{
"role_name"
:
{
rule
:
"required;check_name"
,
rule
:
"required;check_name
;check_name_root
"
,
tip
:
"输入系统用户名称"
,
tip
:
"输入系统用户名称"
,
ok
:
""
,
ok
:
""
,
msg
:
{
required
:
"系统用户名称必填"
}
msg
:
{
required
:
"系统用户名称必填"
}
...
@@ -111,12 +110,7 @@ $('#roleForm').validator({
...
@@ -111,12 +110,7 @@ $('#roleForm').validator({
ok
:
""
,
ok
:
""
,
empty
:
true
empty
:
true
},
},
{
#
"role_key"
:
{
#
}
{
#
rule
:
"required(either)"
,
#
}
{
#
tip
:
"输入密钥"
,
#
}
{
#
ok
:
""
,
#
}
{
#
msg
:
{
required
:
"密码和密钥必填一个!"
}
#
}
{
#
}
#
}
},
},
valid
:
function
(
form
)
{
valid
:
function
(
form
)
{
form
.
submit
();
form
.
submit
();
...
...
This diff is collapsed.
Click to expand it.
templates/jperm/perm_role_edit.html
View file @
d9d009ab
...
@@ -94,16 +94,25 @@ $('#roleForm').validator({
...
@@ -94,16 +94,25 @@ $('#roleForm').validator({
timely
:
2
,
timely
:
2
,
theme
:
"yellow_right_effect"
,
theme
:
"yellow_right_effect"
,
rules
:
{
rules
:
{
check_name
:
[
/^
\w{2,20}
$/
,
'大小写字母数字和下划线,2-20位'
]
check_name
:
[
/^
\w{2,20}
$/
,
'大小写字母数字和下划线,2-20位'
],
check_name_root
:
[
/
[^
rR
][^
oO
][^
oO
][^
tT
]
/
,
'禁止使用root用户作为系统用户,这样非常危险!'
],
check_begin
:
[
/^
[\-]
+BEGIN RSA PRIVATE KEY
[\-]
+/gm
,
'RSA Key填写有误,请检查'
],
},
},
fields
:
{
fields
:
{
"role_name"
:
{
"role_name"
:
{
rule
:
"required;check_name"
,
rule
:
"required;check_name
;check_name_root
"
,
tip
:
"输入系统用户名称"
,
tip
:
"输入系统用户名称"
,
ok
:
""
,
ok
:
""
,
msg
:
{
required
:
"系统用户名称必填"
}
msg
:
{
required
:
"系统用户名称必填"
}
}
},
"role_key"
:
{
rule
:
"check_begin"
,
ok
:
""
,
empty
:
true
},
},
},
valid
:
function
(
form
)
{
valid
:
function
(
form
)
{
form
.
submit
();
form
.
submit
();
...
...
This diff is collapsed.
Click to expand it.
templates/jperm/perm_role_list.html
View file @
d9d009ab
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
<script>
<script>
function
remove_role
(
role_id
){
function
remove_role
(
role_id
){
if
(
confirm
(
"
确认删除
"
))
{
if
(
confirm
(
"
对应资产上已推送的系统用户会被删除,包括其家目录,请谨慎操作!
"
))
{
$
.
ajax
({
$
.
ajax
({
type
:
"POST"
,
type
:
"POST"
,
url
:
"{% url 'role_del' %}"
,
url
:
"{% url 'role_del' %}"
,
...
...
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