From a1fc08892c17654a03f5ef631c6bbcb53eae2720 Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Fri, 22 Dec 2017 18:20:31 +0800 Subject: [PATCH] . --- client/tp_assist_win/ts_http_rpc.cpp | 6 +++--- server/www/teleport/static/js/tp-utils.js | 4 +++- server/www/teleport/webroot/app/controller/audit.py | 2 +- server/www/teleport/webroot/app/controller/ops.py | 8 ++++---- server/www/teleport/webroot/app/controller/rpc.py | 2 ++ server/www/teleport/webroot/app/model/audit.py | 2 +- server/www/teleport/webroot/app/model/ops.py | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/client/tp_assist_win/ts_http_rpc.cpp b/client/tp_assist_win/ts_http_rpc.cpp index 6a581b8..26ad3f4 100644 --- a/client/tp_assist_win/ts_http_rpc.cpp +++ b/client/tp_assist_win/ts_http_rpc.cpp @@ -869,13 +869,13 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) cy = 0; } - char* sz_console = "0"; + int console_mode = 0; if (rdp_console) - sz_console = "1"; + console_mode = 1; char sz_rdp_file_content[4096] = { 0 }; sprintf_s(sz_rdp_file_content, rdp_content.c_str(), - sz_console, display, width, higth + console_mode, display, width, higth , cx, cy, cx + width + 100, cy + higth + 100 , teleport_ip.c_str(), teleport_port , sid.c_str() diff --git a/server/www/teleport/static/js/tp-utils.js b/server/www/teleport/static/js/tp-utils.js index d41bef7..465f3e9 100644 --- a/server/www/teleport/static/js/tp-utils.js +++ b/server/www/teleport/static/js/tp-utils.js @@ -40,8 +40,10 @@ if (!String.prototype.realLength) { //=================================================== // input field validation check //=================================================== +// http://jsfiddle.net/ghvj4gy9/embedded/result,js/ function tp_check_email(email) { - var re = /^(\w)+(\.\w+)*@(\w)+((\.\w+)+)$/; + //var re = /^(\w)+(\.\w+)*@(\w)+((\.\w+)+)$/; + var re = /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i; return re.test(email); } diff --git a/server/www/teleport/webroot/app/controller/audit.py b/server/www/teleport/webroot/app/controller/audit.py index 29eb656..f4a2d0f 100644 --- a/server/www/teleport/webroot/app/controller/audit.py +++ b/server/www/teleport/webroot/app/controller/audit.py @@ -233,7 +233,7 @@ class DoGetAuditorsHandler(TPBaseJsonHandler): except: return self.write_json(TPE_JSON_FORMAT) - print('---get operator:', args) + # print('---get operator:', args) sql_filter = {} sql_order = dict() diff --git a/server/www/teleport/webroot/app/controller/ops.py b/server/www/teleport/webroot/app/controller/ops.py index e402b4b..7a4c298 100644 --- a/server/www/teleport/webroot/app/controller/ops.py +++ b/server/www/teleport/webroot/app/controller/ops.py @@ -136,7 +136,7 @@ class DoGetSessionIDHandler(TPBaseJsonHandler): err, acc_info = account.get_account_info(acc_id) if err != TPE_OK: return self.write_json(err) - log.v(acc_info) + # log.v(acc_info) # elif len(args) == 2 and 'acc_id' in args and 'host_id' in args: elif args['mode'] == 2: @@ -229,7 +229,7 @@ class DoGetSessionIDHandler(TPBaseJsonHandler): tmp_conn_id_base += 1 conn_id = tmp_conn_id_base - log.v(conn_info) + # log.v(conn_info) tp_session().set('tmp-conn-info-{}'.format(conn_id), conn_info, 10) req = {'method': 'request_session', 'param': {'conn_id': conn_id}} @@ -482,7 +482,7 @@ class DoGetOperatorsHandler(TPBaseJsonHandler): except: return self.write_json(TPE_JSON_FORMAT) - print('---get operator:', args) + # print('---get operator:', args) sql_filter = {} sql_order = dict() @@ -548,7 +548,7 @@ class DoGetAssetHandler(TPBaseJsonHandler): except: return self.write_json(TPE_JSON_FORMAT) - print('---get asset:', args) + # print('---get asset:', args) sql_filter = {} sql_order = dict() diff --git a/server/www/teleport/webroot/app/controller/rpc.py b/server/www/teleport/webroot/app/controller/rpc.py index d306af5..ef4632d 100644 --- a/server/www/teleport/webroot/app/controller/rpc.py +++ b/server/www/teleport/webroot/app/controller/rpc.py @@ -41,6 +41,8 @@ class RpcHandler(TPBaseJsonHandler): except: return self.write_json(TPE_JSON_FORMAT) + log.d('WEB-JSON-RPC, method=`{}`\n'.format(_req['method'])) + if 'get_conn_info' == _req['method']: return self._get_conn_info(_req['param']) elif 'session_begin' == _req['method']: diff --git a/server/www/teleport/webroot/app/model/audit.py b/server/www/teleport/webroot/app/model/audit.py index ebf4e9c..2291d37 100644 --- a/server/www/teleport/webroot/app/model/audit.py +++ b/server/www/teleport/webroot/app/model/audit.py @@ -343,7 +343,7 @@ def get_auth(auth_id): if len(s.recorder) != 1: return None, TPE_FAILED - log.v(s.recorder[0]) + # log.v(s.recorder[0]) return s.recorder[0], TPE_OK diff --git a/server/www/teleport/webroot/app/model/ops.py b/server/www/teleport/webroot/app/model/ops.py index 3ffd0af..249e019 100644 --- a/server/www/teleport/webroot/app/model/ops.py +++ b/server/www/teleport/webroot/app/model/ops.py @@ -492,7 +492,7 @@ def get_auth(auth_id): if len(s.recorder) != 1: return None, TPE_FAILED - log.v(s.recorder[0]) + # log.v(s.recorder[0]) return s.recorder[0], TPE_OK