From fe6f036abea331ae02e48835b1c4b35b4877b549 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Tue, 17 Apr 2018 03:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=BF=9C=E7=A8=8B=E8=B4=A6=E5=8F=B7=E7=BB=84?=
 =?UTF-8?q?=EF=BC=88web=E6=97=A5=E5=BF=97=E6=8F=90=E7=A4=BA=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89'ga=5Fid'=E5=AD=97=E6=AE=B5=EF=BC=89=EF=BC=9B=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=9A=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=B8=BB?=
 =?UTF-8?q?=E6=9C=BA=E5=92=8C=E8=B4=A6=E5=8F=B7=E6=97=B6=E4=BC=9A=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=EF=BC=88=E5=BF=98=E8=AE=B0=E5=A4=84=E7=90=86username?=
 =?UTF-8?q?=5Fprompt=E5=92=8Cpassword=5Fprompt=E5=AD=97=E6=AE=B5=EF=BC=89?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/www/teleport/webroot/app/controller/host.py | 3 +++
 server/www/teleport/webroot/app/model/group.py     | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/www/teleport/webroot/app/controller/host.py b/server/www/teleport/webroot/app/controller/host.py
index 417613b..c3047f9 100644
--- a/server/www/teleport/webroot/app/controller/host.py
+++ b/server/www/teleport/webroot/app/controller/host.py
@@ -476,6 +476,9 @@ class DoImportHandler(TPBaseHandler):
                     elif args['auth_type'] == TP_AUTH_TYPE_PRIVATE_KEY:
                         args['pri_key'] = hosts[ip]['acc'][i]['secret']
 
+                    args['username_prompt'] = _acc['username_prompt']
+                    args['password_prompt'] = _acc['password_prompt']
+
                     err, acc_id = account.add_account(self, host_id, args)
                     if err == TPE_EXISTS:
                         failed.append({'line': hosts[ip]['acc']['_line'], 'error': '增加账号{}@{}失败，账号已经存在。'.format(args['username'], ip)})
diff --git a/server/www/teleport/webroot/app/model/group.py b/server/www/teleport/webroot/app/model/group.py
index 4d89abc..18b3c88 100644
--- a/server/www/teleport/webroot/app/model/group.py
+++ b/server/www/teleport/webroot/app/model/group.py
@@ -132,8 +132,10 @@ def remove(handler, gtype, glist):
     # 将组从审计授权中移除
     sql = 'DELETE FROM `{}audit_auz` WHERE `rtype`={rtype} AND `rid` IN ({ids});'.format(db.table_prefix, rtype=gtype, ids=group_ids)
     sql_list.append(sql)
-    sql = 'DELETE FROM `{}audit_map` WHERE `{gname}_id` IN ({ids});'.format(db.table_prefix, gname=gname, ids=group_ids)
-    sql_list.append(sql)
+    # 注意，审计授权映射表中，没有远程账号相关信息，所以如果是远程账号组，则忽略
+    if gtype != TP_GROUP_ACCOUNT:
+        sql = 'DELETE FROM `{}audit_map` WHERE `{gname}_id` IN ({ids});'.format(db.table_prefix, gname=gname, ids=group_ids)
+        sql_list.append(sql)
 
     if not db.transaction(sql_list):
         return TPE_DATABASE