- ##
-
diff --git a/server/www/teleport/view/audit/record.html b/server/www/teleport/view/audit/record.html
index 3c32457..fab88d6 100644
--- a/server/www/teleport/view/audit/record.html
+++ b/server/www/teleport/view/audit/record.html
@@ -3,45 +3,183 @@
{% set page_icon_class_ = 'fa fa-eye fa-fw' %}
{% set page_id_ = ['audit', 'record'] %}
+{% block block_extend_css_file %}
+
+{% endblock %}
+
{% block block_extend_js_file %}
+
+
+{% endblock %}
+
+{% block block_embed_css %}
+
{% endblock %}
{% block block_body %}
-
- ##
- ##
-
+{# ##
- ##
-
- ##
-
- ##
- #}
+{# ## #}
+{# ##
#}
#}
+{# ## #}
+{# ##
#}
+{# ##
@@ -308,7 +303,7 @@
diff --git a/server/www/teleport/view/audit/record-sftp-cmd.html b/server/www/teleport/view/audit/record-sftp-cmd.html
index f322685..d085319 100644
--- a/server/www/teleport/view/audit/record-sftp-cmd.html
+++ b/server/www/teleport/view/audit/record-sftp-cmd.html
@@ -104,9 +104,7 @@
- ##
+{# ## #}
图例说明：
- ##
- YYYY-mm-dd HH:MM:SS 此记录可能是被复制粘贴到SSH客户端的，有可能是批量执行命令，也可能是在做文本编辑，详情见录像回放。
-
+{# YYYY-mm-dd HH:MM:SS 此记录可能是被复制粘贴到SSH客户端的，有可能是批量执行命令，也可能是在做文本编辑，详情见录像回放。
#}
YYYY-mm-dd HH:MM:SS 此命令可能是危险操作。
+
-
-
-
-
-
-
-
-
- 会话列表
-
-
-
-
- 存储空间：
-
-
-
-
-
-
-
-
{% endblock %}
diff --git a/server/www/teleport/view/ops/auz-list.html b/server/www/teleport/view/ops/auz-list.html
index 2b8f585..8608fb5 100644
--- a/server/www/teleport/view/ops/auz-list.html
+++ b/server/www/teleport/view/ops/auz-list.html
@@ -48,8 +48,7 @@
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+ 会话列表
+
+
+
+
+
存储空间：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ##
-
+{# #}
diff --git a/server/www/teleport/webroot/app/controller/audit.py b/server/www/teleport/webroot/app/controller/audit.py
index 3701c2e..bb7a079 100644
--- a/server/www/teleport/webroot/app/controller/audit.py
+++ b/server/www/teleport/webroot/app/controller/audit.py
@@ -453,15 +453,18 @@ class DoGetRecordsHandler(TPBaseJsonHandler):
sql_exclude = args['exclude'] if 'exclude' in args else {}
try:
- tmp = list()
_filter = args['filter']
+ tmp = list()
for i in _filter:
if i == 'user_id' and _filter[i] == 0:
tmp.append(i)
continue
- if i == 'user_name':
- if len(_filter[i].strip()) == 0:
- tmp.append(i)
+ elif i == 'user_name' and len(_filter[i].strip()) == 0:
+ tmp.append(i)
+ continue
+ elif i == 'protocol' and _filter[i] == 0:
+ tmp.append(i)
+ continue
for i in tmp:
del _filter[i]
diff --git a/server/www/teleport/webroot/app/model/record.py b/server/www/teleport/webroot/app/model/record.py
index 599943d..afe00ce 100644
--- a/server/www/teleport/webroot/app/model/record.py
+++ b/server/www/teleport/webroot/app/model/record.py
@@ -79,6 +79,23 @@ def get_records(handler, sql_filter, sql_order, sql_limit, sql_restrict, sql_exc
for k in sql_filter:
if k == 'state':
_where.append('r.state={}'.format(sql_filter[k]))
+ elif k == 'user_name':
+ _where.append('(r.user_username LIKE "%{k}%" OR r.user_surname LIKE "%{k}%")'.format(k=sql_filter[k]))
+ elif k == 'client_ip':
+ _where.append('r.client_ip LIKE "%{k}%"'.format(k=sql_filter[k]))
+ elif k == 'remote_addr':
+ _where.append('r.host_ip LIKE "%{k}%"'.format(k=sql_filter[k]))
+ elif k == 'sid':
+ _where.append('r.sid LIKE "%{k}%"'.format(k=sql_filter[k]))
+ elif k == 'remote_acc':
+ _where.append('r.acc_username LIKE "%{k}%"'.format(k=sql_filter[k]))
+ elif k == 'protocol':
+ _where.append('r.protocol_sub_type={k}'.format(k=sql_filter[k]))
+ elif k == 'time_from':
+ _where.append('r.time_begin>={k}'.format(k=sql_filter[k]))
+ elif k == 'time_to':
+ _where.append('r.time_end<={k}'.format(k=sql_filter[k]))
+
# elif k == 'search_record':
# _where.append('(h.name LIKE "%{}%" OR h.ip LIKE "%{}%" OR h.router_addr LIKE "%{}%" OR h.desc LIKE "%{}%" OR h.cid LIKE "%{}%")'.format(sql_filter[k], sql_filter[k], sql_filter[k], sql_filter[k], sql_filter[k]))