github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed perm page

pull/26/head
yumaojun 2015-12-10 22:58:04 +08:00
parent 4294ecaf26 014d0935ba
commit aa262d0430
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jperm/ansible_api.py
View File

@ -363,7 +363,6 @@ class MyTask(MyRunner):
self.run("user", module_args, become=True) self.run("user", module_args, become=True)
return self.results return self.results
@staticmethod @staticmethod
def gen_sudo_script(role_list, sudo_list): def gen_sudo_script(role_list, sudo_list):
# receive role_list = [role1, role2] sudo_list = [sudo1, sudo2] # receive role_list = [role1, role2] sudo_list = [sudo1, sudo2]

4
jperm/views.py
View File

@ -448,7 +448,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
@ -469,7 +468,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 = {}

2
jumpserver.conf
View File

@ -13,7 +13,7 @@ password = mysql234
database = jumpserver database = jumpserver
[websocket] [websocket]
web_socket_host = 127.0.0.1:3000 web_socket_host = j:3000
[mail] [mail]
mail_enable = 1 mail_enable = 1

1
jumpserver/api.py
View File

@ -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

10
templates/jasset/asset_list.html
View File

@ -229,9 +229,10 @@
data: {}, data: {},
success: function(data){ success: function(data){
var dataArray = data.split(','); var dataArray = data.split(',');
console.log(data+'a'); if (data == 'error' || data == '' || data == null || data == undefined){
console.log(dataArray); layer.alert('没有授权角色')
if (dataArray.length == 1 && data != 'error'){ }
else if (dataArray.length == 1 && data != 'error'){
var title = 'Jumpserver Web Terminal' + '<span class="text-info"> '+ hostname +'</span>'; var title = 'Jumpserver Web Terminal' + '<span class="text-info"> '+ hostname +'</span>';
console.log(new_url+data); console.log(new_url+data);
layer.open({ layer.open({
@ -242,9 +243,6 @@
area: ['628px', '452px'], area: ['628px', '452px'],
content: new_url+data content: new_url+data
}); });
//window.open(new_url + data, '', 'location=no, resizeable=no, height=410, width=625, top=89px, left=99px,toolbar=no,menubar=no,scrollbars=auto,status=no');
} else if (data == 'error' || data == '' || data == null || data == undefined){
layer.alert('没有授权角色')
} else { } else {
aUrl = ''; aUrl = '';
$.each(dataArray, function(index, value){ $.each(dataArray, function(index, value){