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
23051a4a
Commit
23051a4a
authored
Dec 10, 2015
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
e117cd00
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
views.py
jperm/views.py
+2
-2
api.py
jumpserver/api.py
+0
-1
No files found.
jperm/views.py
View file @
23051a4a
...
@@ -430,7 +430,6 @@ def perm_role_push(request):
...
@@ -430,7 +430,6 @@ def perm_role_push(request):
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
)
logger
.
debug
(
'Push role res:
%
s'
%
push_resource
)
# 调用Ansible API 进行推送
# 调用Ansible API 进行推送
password_push
=
True
if
request
.
POST
.
get
(
"use_password"
)
else
False
password_push
=
True
if
request
.
POST
.
get
(
"use_password"
)
else
False
...
@@ -451,7 +450,8 @@ def perm_role_push(request):
...
@@ -451,7 +450,8 @@ def perm_role_push(request):
# 3. 推送sudo配置文件
# 3. 推送sudo配置文件
if
password_push
or
key_push
:
if
password_push
or
key_push
:
sudo_list
=
set
([
sudo
for
sudo
in
role
.
sudo
.
all
()])
# set(sudo1, sudo2, sudo3)
sudo_list
=
set
([
sudo
for
sudo
in
role
.
sudo
.
all
()])
# set(sudo1, sudo2, sudo3)
ret
[
'sudo'
]
=
task
.
push_sudo_file
([
role
],
sudo_list
)
if
sudo_list
:
ret
[
'sudo'
]
=
task
.
push_sudo_file
([
role
],
sudo_list
)
logger
.
debug
(
'推送role结果:
%
s'
%
ret
)
logger
.
debug
(
'推送role结果:
%
s'
%
ret
)
success_asset
=
{}
success_asset
=
{}
...
...
jumpserver/api.py
View file @
23051a4a
...
@@ -491,7 +491,6 @@ def defend_attack(func):
...
@@ -491,7 +491,6 @@ def defend_attack(func):
return
HttpResponse
(
'Forbidden'
,
status
=
403
)
return
HttpResponse
(
'Forbidden'
,
status
=
403
)
request
.
session
[
'visit'
]
=
request
.
session
.
get
(
'visit'
,
1
)
+
1
request
.
session
[
'visit'
]
=
request
.
session
.
get
(
'visit'
,
1
)
+
1
request
.
session
.
set_expiry
(
300
)
request
.
session
.
set_expiry
(
300
)
logger
.
debug
(
request
.
session
.
get
(
'visit'
))
return
func
(
request
,
*
args
,
**
kwargs
)
return
func
(
request
,
*
args
,
**
kwargs
)
return
_deco
return
_deco
...
...
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