From a143797ac910b5056f398ed2678d5054e15a47c8 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 22 Nov 2015 17:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9gen=5Fresource=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jperm/perm_api.py                  | 22 +++++++++++++++++---
 jumpserver/api.py                  |  9 ++++++---
 templates/jasset/asset_add.html    |  1 +
 templates/jperm/perm_rule_add.html | 32 +++++++++++++++---------------
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/jperm/perm_api.py b/jperm/perm_api.py
index 856c13005..f79040c60 100644
--- a/jperm/perm_api.py
+++ b/jperm/perm_api.py
@@ -132,13 +132,29 @@ def get_group_asset_perm(ob):
     return perm
 
 
-def gen_resource(ob, perm=None):
+def gen_resource(ob, ex='', perm=None):
     """
-    ob为用户或资产列表或资产queryset
+    ob为用户或资产列表或资产queryset, 如果同时输入用户和资产，则获取用户在这些资产上的信息
     生成MyInventory需要的 resource文件
     """
     res = []
-    if isinstance(ob, User):
+    if isinstance(ob, User) and isinstance(ex, (list, QuerySet)):
+        if not perm:
+            perm = get_group_user_perm(ob)
+            for asset, asset_info in perm.get('asset').items():
+                if asset not in ex:
+                    continue
+                asset_info = get_asset_info(asset)
+                info = {'hostname': asset.hostname, 'ip': asset.ip, 'port': asset_info.get('port', 22)}
+                try:
+                    role = sorted(list(perm.get('asset').get(asset).get('role')))[0]
+                except IndexError:
+                    continue
+                info['username'] = role.name
+                info['password'] = role.password
+                info['ssh_key'] = get_role_key(ob, role)
+                res.append(info)
+    elif isinstance(ob, User):
         if not perm:
             perm = get_group_user_perm(ob)
 
diff --git a/jumpserver/api.py b/jumpserver/api.py
index 3ffa7566b..cbf7eebc8 100644
--- a/jumpserver/api.py
+++ b/jumpserver/api.py
@@ -96,9 +96,12 @@ def get_role_key(user, role):
 def chown(path, user, group=''):
     if not group:
         group = user
-    uid = pwd.getpwnam(user).pw_uid
-    gid = pwd.getpwnam(group).pwd_gid
-    os.chown(path, uid, gid)
+    try:
+        uid = pwd.getpwnam(user).pw_uid
+        gid = pwd.getpwnam(group).pw_gid
+        os.chown(path, uid, gid)
+    except KeyError:
+        pass
 
 
 def page_list_return(total, current=1):
diff --git a/templates/jasset/asset_add.html b/templates/jasset/asset_add.html
index 7ef74920a..35903a469 100644
--- a/templates/jasset/asset_add.html
+++ b/templates/jasset/asset_add.html
@@ -48,6 +48,7 @@
                                         {{ af.ip|bootstrap_horizontal }}
                                         <p class="col-sm-offset-2">Tips: 如果IP地址不填写, IP默认会设置与主机名一致</p>
 
+
                                         <div class="hr-line-dashed"></div>
                                         <div class="form-group">
                                             <label for="j_group" class="col-sm-2 control-label">管理账号<span class="red-fonts"> *</span></label>
diff --git a/templates/jperm/perm_rule_add.html b/templates/jperm/perm_rule_add.html
index 3eef4eb00..a6d0ce530 100644
--- a/templates/jperm/perm_rule_add.html
+++ b/templates/jperm/perm_rule_add.html
@@ -26,7 +26,7 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                        <form method="post" id="userForm" class="form-horizontal" action="">
+                        <form method="post" id="ruleForm" class="form-horizontal" action="">
                             {% if error %}
                                 <div class="alert alert-warning text-center">{{ error }}</div>
                             {% endif %}
@@ -34,7 +34,7 @@
                                 <div class="alert alert-success text-center">{{ msg }}</div>
                             {% endif %}
                             <div class="form-group">
-                                <label for="username" class="col-sm-2 control-label">授权名称<span class="red-fonts">*</span></label>
+                                <label for="rulename" class="col-sm-2 control-label">授权名称<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
                                     <input id="rulename" name="rulename" placeholder="Rule Name" type="text" class="form-control" {% if error %}value="{{ username }}" {% endif %}>
                                 </div>
@@ -48,11 +48,11 @@
                                             <option value="{{ user.name }}">{{ user.name }}</option>
                                         {% endfor %}
                                     </select>
+                                    <span class="help-block m-b-none">用户和用户组必选一个</span>
                                 </div>
                             </div>
-                            <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="usergroup" class="col-sm-2 control-label">用户组<span class="red-fonts">*</span></label>
+                                <label for="usergroup" class="col-sm-2 control-label">用户组</label>
                                 <div class="col-sm-8">
                                     <select name="usergroup" data-placeholder="请选择用户组" class="chosen-select form-control m-b" multiple  tabindex="2">
                                         {% for user_group in user_groups %}
@@ -70,11 +70,11 @@
                                             <option value="{{ asset.ip }}">{{ asset.ip }}</option>
                                         {% endfor %}
                                     </select>
+                                    <span class="help-block m-b-none">资产和资产组必选一个</span>
                                 </div>
                             </div>
-                            <div class="hr-line-dashed"></div>
                             <div class="form-group">
-                                <label for="assetgroup" class="col-sm-2 control-label">资产组<span class="red-fonts">*</span></label>
+                                <label for="assetgroup" class="col-sm-2 control-label">资产组</label>
                                 <div class="col-sm-8">
                                     <select name="assetgroup" data-placeholder="请选择资产组" class="chosen-select form-control m-b" multiple  tabindex="2">
                                         {% for asset_group in asset_groups %}
@@ -120,31 +120,31 @@
 <script>
 
 $('#ruleForm').submit(function() {
-    var result = {}
+    var result = {};
     var data = $(this).serializeArray();
-    $.each(data, function(i, field){
+    $.each(data, function (i, field) {
         result[field.name] = field.value;
     });
     if (result['user'] || result['usergroup'] || result['asset'] || result['assetgroup'] || result['rulename'] || result['role']) {
         if (result['rulename'] === '') {
-            alert("请添加授权名称")
+            alert("请添加授权名称");
             return false
         }
-        if (! result['user'] && ! result['usergroup']) {
-            alert("用户和用户组必选１个")
+        if (!result['user'] && !result['usergroup']) {
+            alert("用户和用户组必选１个");
             return false
         }
-        if (! result['asset'] && ! result['assetgroup']) {
-            alert("资产和资产组必选１个")
+        if (!result['asset'] && !result['assetgroup']) {
+            alert("资产和资产组必选１个");
             return false
         }
-        if (! result['role']) {
-            alert("请填写角色")
+        if (!result['role']) {
+            alert("请填写角色");
             return false
         }
         return true
     } else {
-        alert("请填必选项")
+        alert("请填必选项");
         return false;
     }
 });