fixed perm page

jperm/ansible_api.py

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

jperm/views.py

@@ -448,7 +448,6 @@ def perm_role_push(request):
             group_assets_obj.extend(asset_group.asset_set.all())
         calc_assets = list(set(assets_obj) | set(group_assets_obj))
         push_resource = gen_resource(calc_assets)
-        logger.debug('Push role res: %s' % push_resource)
 
         # 调用Ansible API 进行推送
         password_push = True if request.POST.get("use_password") else False
@@ -469,6 +468,7 @@ def perm_role_push(request):
         # 3. 推送sudo配置文件
         if password_push or key_push:
             sudo_list = set([sudo for sudo in role.sudo.all()])  # set(sudo1, sudo2, sudo3)
+            if sudo_list:
                 ret['sudo'] = task.push_sudo_file([role], sudo_list)
 
         logger.debug('推送role结果: %s' % ret)

jumpserver.conf

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

jumpserver/api.py

@@ -491,7 +491,6 @@ def defend_attack(func):
             return HttpResponse('Forbidden', status=403)
         request.session['visit'] = request.session.get('visit', 1) + 1
         request.session.set_expiry(300)
-        logger.debug(request.session.get('visit'))
         return func(request, *args, **kwargs)
     return _deco
 

templates/jasset/asset_list.html

@@ -229,9 +229,10 @@
                 data: {},
                 success: function(data){
                     var dataArray = data.split(',');
-                    console.log(data+'a');
-                    console.log(dataArray);
-                    if (dataArray.length == 1 && data != 'error'){
+                    if (data == 'error' || data == '' || data == null || data == undefined){
+                        layer.alert('没有授权角色')
+                    }
+                    else if (dataArray.length == 1 && data != 'error'){
                         var title = 'Jumpserver Web Terminal' + '<span class="text-info"> '+ hostname +'</span>';
                         console.log(new_url+data);
                         layer.open({
@@ -242,9 +243,6 @@
                             area: ['628px', '452px'],
                             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 {
                         aUrl = '';
                         $.each(dataArray, function(index, value){