github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

.

pull/105/head
Apex Liu 2017-12-22 18:20:31 +08:00
parent 38a8d245c5
commit a1fc08892c
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/tp_assist_win/ts_http_rpc.cpp
View File

@ -869,13 +869,13 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf)
cy = 0; cy = 0;
} }
char* sz_console = "0"; int console_mode = 0;
if (rdp_console) if (rdp_console)
sz_console = "1"; console_mode = 1;
char sz_rdp_file_content[4096] = { 0 }; char sz_rdp_file_content[4096] = { 0 };
sprintf_s(sz_rdp_file_content, rdp_content.c_str(), 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 , cx, cy, cx + width + 100, cy + higth + 100
, teleport_ip.c_str(), teleport_port , teleport_ip.c_str(), teleport_port
, sid.c_str() , sid.c_str()

4
server/www/teleport/static/js/tp-utils.js
View File

@ -40,8 +40,10 @@ if (!String.prototype.realLength) {
//=================================================== //===================================================
// input field validation check // input field validation check
//=================================================== //===================================================
// http://jsfiddle.net/ghvj4gy9/embedded/result,js/
function tp_check_email(email) { 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); return re.test(email);
} }

2
server/www/teleport/webroot/app/controller/audit.py
View File

@ -233,7 +233,7 @@ class DoGetAuditorsHandler(TPBaseJsonHandler):
except: except:
return self.write_json(TPE_JSON_FORMAT) return self.write_json(TPE_JSON_FORMAT)
print('---get operator:', args) # print('---get operator:', args)
sql_filter = {} sql_filter = {}
sql_order = dict() sql_order = dict()

8
server/www/teleport/webroot/app/controller/ops.py
View File

@ -136,7 +136,7 @@ class DoGetSessionIDHandler(TPBaseJsonHandler):
err, acc_info = account.get_account_info(acc_id) err, acc_info = account.get_account_info(acc_id)
if err != TPE_OK: if err != TPE_OK:
return self.write_json(err) 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 len(args) == 2 and 'acc_id' in args and 'host_id' in args:
elif args['mode'] == 2: elif args['mode'] == 2:
@ -229,7 +229,7 @@ class DoGetSessionIDHandler(TPBaseJsonHandler):
tmp_conn_id_base += 1 tmp_conn_id_base += 1
conn_id = tmp_conn_id_base 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) tp_session().set('tmp-conn-info-{}'.format(conn_id), conn_info, 10)
req = {'method': 'request_session', 'param': {'conn_id': conn_id}} req = {'method': 'request_session', 'param': {'conn_id': conn_id}}
@ -482,7 +482,7 @@ class DoGetOperatorsHandler(TPBaseJsonHandler):
except: except:
return self.write_json(TPE_JSON_FORMAT) return self.write_json(TPE_JSON_FORMAT)
print('---get operator:', args) # print('---get operator:', args)
sql_filter = {} sql_filter = {}
sql_order = dict() sql_order = dict()
@ -548,7 +548,7 @@ class DoGetAssetHandler(TPBaseJsonHandler):
except: except:
return self.write_json(TPE_JSON_FORMAT) return self.write_json(TPE_JSON_FORMAT)
print('---get asset:', args) # print('---get asset:', args)
sql_filter = {} sql_filter = {}
sql_order = dict() sql_order = dict()

2
server/www/teleport/webroot/app/controller/rpc.py
View File

@ -41,6 +41,8 @@ class RpcHandler(TPBaseJsonHandler):
except: except:
return self.write_json(TPE_JSON_FORMAT) return self.write_json(TPE_JSON_FORMAT)
log.d('WEB-JSON-RPC, method=`{}`\n'.format(_req['method']))
if 'get_conn_info' == _req['method']: if 'get_conn_info' == _req['method']:
return self._get_conn_info(_req['param']) return self._get_conn_info(_req['param'])
elif 'session_begin' == _req['method']: elif 'session_begin' == _req['method']:

2
server/www/teleport/webroot/app/model/audit.py
View File

@ -343,7 +343,7 @@ def get_auth(auth_id):
if len(s.recorder) != 1: if len(s.recorder) != 1:
return None, TPE_FAILED return None, TPE_FAILED
log.v(s.recorder[0]) # log.v(s.recorder[0])
return s.recorder[0], TPE_OK return s.recorder[0], TPE_OK

2
server/www/teleport/webroot/app/model/ops.py
View File

@ -492,7 +492,7 @@ def get_auth(auth_id):
if len(s.recorder) != 1: if len(s.recorder) != 1:
return None, TPE_FAILED return None, TPE_FAILED
log.v(s.recorder[0]) # log.v(s.recorder[0])
return s.recorder[0], TPE_OK return s.recorder[0], TPE_OK