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

1. 去掉在rdp的sid前填写的两个字节；2. 格式化部分代码。

feature/assist-websocket
Apex Liu 2022-06-01 11:25:49 +08:00
parent e82eecfd04
commit e9de6513eb
11 changed files with 675 additions and 609 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/builder/build-external.py
View File

@ -692,8 +692,8 @@ class BuilderMacOS(BuilderBase):
cc.w('already exists, skip.') cc.w('already exists, skip.')
def _build_openssl(self, file_name): def _build_openssl(self, file_name):
cc.w('skip build openssl again.') # cc.w('skip build openssl again.')
return # return
if not self._download_openssl(file_name): if not self._download_openssl(file_name):
return return
@ -943,6 +943,7 @@ def main():
builder.build_jsoncpp() builder.build_jsoncpp()
builder.build_mongoose() builder.build_mongoose()
builder.build_zlib() builder.build_zlib()
builder.build_mbedtls()
builder.build_openssl() builder.build_openssl()
elif command == 'ext-server': elif command == 'ext-server':
builder.prepare_python() builder.prepare_python()

136
client/tp_assist_macos/src/csrc/ts_cfg.cpp
View File

@ -3,44 +3,47 @@
TsCfg g_cfg; TsCfg g_cfg;
TsCfg::TsCfg() TsCfg::TsCfg() {}
{}
TsCfg::~TsCfg() TsCfg::~TsCfg() {}
{}
bool TsCfg::init(void) { bool TsCfg::init(void)
ex_astr file_content; {
if(!ex_read_text_file(g_env.m_cfg_file, file_content)) { ex_astr file_content;
EXLOGE("can not load config file.\n"); if (!ex_read_text_file(g_env.m_cfg_file, file_content))
return false; {
} EXLOGE("can not load config file.\n");
return false;
if(!_load(file_content)) }
return false;
if(!m_root.isObject()) { if (!_load(file_content))
return false;
if (!m_root.isObject())
{
EXLOGE("invalid config file, not in json format?\n"); EXLOGE("invalid config file, not in json format?\n");
return false; return false;
} }
if(m_root["file_version"].isNull()) { if (m_root["file_version"].isNull())
{
EXLOGE("invalid config file, maybe need create new one?\n"); EXLOGE("invalid config file, maybe need create new one?\n");
return false; return false;
} }
if(!m_root["file_version"].isInt()) { if (!m_root["file_version"].isInt())
{
} }
return true; return true;
} }
bool TsCfg::save(const ex_astr& new_value) bool TsCfg::save(const ex_astr& new_value)
{ {
if(!_load(new_value)) if (!_load(new_value))
return false; return false;
Json::StreamWriterBuilder jwb; Json::StreamWriterBuilder jwb;
jwb["indentation"] = " "; jwb["indentation"] = " ";
jwb["emitUTF8"] = true; jwb["emitUTF8"] = true;
@ -49,67 +52,78 @@ bool TsCfg::save(const ex_astr& new_value)
jwriter->write(m_root, &os); jwriter->write(m_root, &os);
ex_astr val = os.str(); ex_astr val = os.str();
if(!ex_write_text_file(g_env.m_cfg_file, val)) { if (!ex_write_text_file(g_env.m_cfg_file, val))
EXLOGE("can not save config file.\n"); {
return false; EXLOGE("can not save config file.\n");
} return false;
}
return true; return true;
} }
bool TsCfg::_parse_app(const Json::Value& m_root, const ex_astr& str_app, APP_CONFIG& cfg) { bool TsCfg::_parse_app(const Json::Value& m_root, const ex_astr& str_app, APP_CONFIG& cfg)
{
const Json::Value& jApp = m_root[str_app.c_str()]; const Json::Value& jApp = m_root[str_app.c_str()];
if(!jApp.isObject()) if (!jApp.isObject())
return false; return false;
if (!jApp["selected"].isString()) { if (!jApp["selected"].isString())
{
EXLOGE("invalid config, error 2.\n"); EXLOGE("invalid config, error 2.\n");
return false; return false;
} }
ex_astr _selected = jApp["selected"].asCString();; ex_astr _selected = jApp["selected"].asCString();;
if (!jApp["available"].isArray() || jApp["available"].size() == 0) { if (!jApp["available"].isArray() || jApp["available"].size() == 0)
{
EXLOGE("invalid config, error 3.\n"); EXLOGE("invalid config, error 3.\n");
return false; return false;
} }
const Json::Value& jAppList = jApp["available"]; const Json::Value& jAppList = jApp["available"];
int i = 0; int i = 0;
for (i = 0; i < jAppList.size(); ++i) { for (i = 0; i < jAppList.size(); ++i)
{
if ( if (
!jAppList[i]["name"].isString() !jAppList[i]["name"].isString()
|| !jAppList[i]["app"].isString() || !jAppList[i]["app"].isString()
|| !jAppList[i]["cmdline"].isString() || !jAppList[i]["cmdline"].isString()
|| !jAppList[i]["desc"].isArray() || !jAppList[i]["desc"].isArray()
) { )
{
EXLOGE("invalid config, error 4.\n"); EXLOGE("invalid config, error 4.\n");
return false; return false;
} }
if(jAppList[i]["name"].asString().empty()) { if (jAppList[i]["name"].asString().empty())
{
EXLOGE("invalid config, need name.\n"); EXLOGE("invalid config, need name.\n");
return false; return false;
} }
if (jAppList[i]["display"].isNull() || jAppList[i]["display"].asString().empty()) { if (jAppList[i]["display"].isNull() || jAppList[i]["display"].asString().empty())
{
cfg.display = jAppList[i]["name"].asCString(); cfg.display = jAppList[i]["name"].asCString();
} else }
else
cfg.display = jAppList[i]["display"].asCString(); cfg.display = jAppList[i]["display"].asCString();
if (jAppList[i]["name"].asCString() != _selected) if (jAppList[i]["name"].asCString() != _selected)
continue; continue;
cfg.name = jAppList[i]["name"].asCString(); cfg.name = jAppList[i]["name"].asCString();
cfg.display = jAppList[i]["display"].asCString(); cfg.display = jAppList[i]["display"].asCString();
cfg.application = jAppList[i]["app"].asCString(); cfg.application = jAppList[i]["app"].asCString();
cfg.cmdline = jAppList[i]["cmdline"].asCString(); cfg.cmdline = jAppList[i]["cmdline"].asCString();
if(jAppList[i]["desc"].size() > 0) { if (jAppList[i]["desc"].size() > 0)
{
const Json::Value& jAppDescList = jAppList[i]["desc"]; const Json::Value& jAppDescList = jAppList[i]["desc"];
int j = 0; int j = 0;
for(j = 0; j < jAppDescList.size(); ++j) { for (j = 0; j < jAppDescList.size(); ++j)
if(!jAppDescList[j].isString()) {
if (!jAppDescList[j].isString())
return false; return false;
cfg.description.push_back(jAppDescList[j].asCString()); cfg.description.push_back(jAppDescList[j].asCString());
} }
@ -122,28 +136,30 @@ bool TsCfg::_parse_app(const Json::Value& m_root, const ex_astr& str_app, APP_CO
} }
bool TsCfg::_load(const ex_astr& str_json) { bool TsCfg::_load(const ex_astr& str_json)
{
Json::CharReaderBuilder jcrb; Json::CharReaderBuilder jcrb;
std::unique_ptr<Json::CharReader> const jreader(jcrb.newCharReader()); std::unique_ptr<Json::CharReader> const jreader(jcrb.newCharReader());
const char *str_json_begin = str_json.c_str(); const char* str_json_begin = str_json.c_str();
ex_astr err; ex_astr err;
if (!jreader->parse(str_json_begin, str_json_begin + str_json.length(), &m_root, &err)) { if (!jreader->parse(str_json_begin, str_json_begin + str_json.length(), &m_root, &err))
{
EXLOGE("can not parse new config data, not in json format? %s\n", err.c_str()); EXLOGE("can not parse new config data, not in json format? %s\n", err.c_str());
return false; return false;
} }
//=================================== //===================================
// check config // check config
//=================================== //===================================
if(!_parse_app(m_root, "ssh", ssh)) if (!_parse_app(m_root, "ssh", ssh))
return false; return false;
if(!_parse_app(m_root, "sftp", sftp)) if (!_parse_app(m_root, "sftp", sftp))
return false; return false;
if(!_parse_app(m_root, "telnet", telnet)) if (!_parse_app(m_root, "telnet", telnet))
return false; return false;
if(!_parse_app(m_root, "rdp", rdp)) if (!_parse_app(m_root, "rdp", rdp))
return false; return false;
return true; return true;
} }

22
client/tp_assist_macos/src/csrc/ts_cfg.h
View File

@ -6,36 +6,40 @@
#include <json/json.h> #include <json/json.h>
typedef struct APP_CONFIG { typedef struct APP_CONFIG
{
ex_astr name; ex_astr name;
ex_astr display; ex_astr display;
ex_astr application; ex_astr application;
ex_astr cmdline; ex_astr cmdline;
ex_astrs description; ex_astrs description;
}APP_CONFIG; } APP_CONFIG;
class TsCfg class TsCfg
{ {
public: public:
TsCfg(); TsCfg();
virtual ~TsCfg();
virtual ~TsCfg();
bool init(void);
bool init(void);
bool save(const ex_astr& new_value); bool save(const ex_astr& new_value);
Json::Value& get_root() {return m_root;} Json::Value& get_root() { return m_root; }
APP_CONFIG ssh; APP_CONFIG ssh;
APP_CONFIG sftp; APP_CONFIG sftp;
APP_CONFIG telnet; APP_CONFIG telnet;
APP_CONFIG rdp; APP_CONFIG rdp;
protected: protected:
bool _load(const ex_astr& str_json); bool _load(const ex_astr& str_json);
bool _parse_app(const Json::Value& m_root, const ex_astr& str_app, APP_CONFIG& cfg); bool _parse_app(const Json::Value& m_root, const ex_astr& str_app, APP_CONFIG& cfg);
protected: protected:
Json::Value m_root; Json::Value m_root;
}; };
extern TsCfg g_cfg; extern TsCfg g_cfg;

26
client/tp_assist_macos/src/csrc/ts_env.cpp
View File

@ -1,6 +1,7 @@
#include "ts_env.h" #include "ts_env.h"
#include <time.h> #include <time.h>
#ifdef EX_OS_WIN32 #ifdef EX_OS_WIN32
# include <direct.h> # include <direct.h>
//# include <ShlObj.h> //# include <ShlObj.h>
@ -12,34 +13,33 @@ TsEnv g_env;
// //
//======================================================= //=======================================================
TsEnv::TsEnv() TsEnv::TsEnv() {}
{}
TsEnv::~TsEnv() TsEnv::~TsEnv() {}
{}
bool TsEnv::init(const char* bundle_path, const char* cfg_file, const char* res_path, const char* log_path) bool TsEnv::init(const char* bundle_path, const char* cfg_file, const char* res_path, const char* log_path)
{ {
ex_astr2wstr(bundle_path, m_bundle_path); ex_astr2wstr(bundle_path, m_bundle_path);
ex_astr2wstr(cfg_file, m_cfg_file); ex_astr2wstr(cfg_file, m_cfg_file);
ex_astr2wstr(res_path, m_res_path); ex_astr2wstr(res_path, m_res_path);
ex_astr2wstr(log_path, m_log_path); ex_astr2wstr(log_path, m_log_path);
#ifdef EX_DEBUG #ifdef EX_DEBUG
m_site_path = L"/Users/apex/work/tp4a/teleport/client/tp_assist_macos/site"; m_site_path = L"/Users/apex/work/tp4a/teleport/client/tp_assist_macos/site";
//m_bundle_path = L"/Users/apex/work/tp4a/teleport/out/client/x64/release"; //m_bundle_path = L"/Users/apex/work/tp4a/teleport/out/client/x64/release";
#else #else
m_site_path = m_res_path; m_site_path = m_res_path;
ex_path_join(m_site_path, false, L"site", NULL); ex_path_join(m_site_path, false, L"site", NULL);
#endif #endif
return true; return true;
} }
extern "C" { extern "C" {
int mg_ssl_if_mbed_random(void *ctx, unsigned char *buf, size_t len) { int mg_ssl_if_mbed_random(void* ctx, unsigned char* buf, size_t len)
(void) ctx; {
while (len--) *buf++ = (arc4random() % 255); (void)ctx;
return 0; while (len--) { *buf++ = (arc4random() % 255); }
return 0;
} }
} }

31
client/tp_assist_macos/src/csrc/ts_env.h
View File

@ -6,25 +6,26 @@
class TsEnv class TsEnv
{ {
public: public:
TsEnv(); TsEnv();
~TsEnv();
bool init(const char* bundle_path, const char* cfg_file, const char* res_path, const char* log_path); ~TsEnv();
bool init(const char* bundle_path, const char* cfg_file, const char* res_path, const char* log_path);
public: public:
ex_wstr m_bundle_path; ex_wstr m_bundle_path;
ex_wstr m_cfg_file; ex_wstr m_cfg_file;
ex_wstr m_res_path; ex_wstr m_res_path;
// ex_wstr m_exec_file; // ex_wstr m_exec_file;
// ex_wstr m_exec_path; // ex_wstr m_exec_path;
// //
// ex_wstr m_ssh_client_conf_file; // ex_wstr m_ssh_client_conf_file;
// ex_wstr m_scp_client_conf_file; // ex_wstr m_scp_client_conf_file;
// ex_wstr m_telnet_client_conf_file; // ex_wstr m_telnet_client_conf_file;
ex_wstr m_log_path; ex_wstr m_log_path;
ex_wstr m_site_path; ex_wstr m_site_path;
// ex_wstr m_tools_path; // ex_wstr m_tools_path;
}; };
extern TsEnv g_env; extern TsEnv g_env;

470
client/tp_assist_macos/src/csrc/ts_http_rpc.cpp
View File

@ -17,23 +17,26 @@ TsHttpRpc g_http_interface;
TsHttpRpc::TsHttpRpc() : ExThreadBase("http-rpc-thread") TsHttpRpc::TsHttpRpc() : ExThreadBase("http-rpc-thread")
{ {
mg_mgr_init(&m_mg_mgr, NULL); mg_mgr_init(&m_mg_mgr, NULL);
} }
TsHttpRpc::~TsHttpRpc() TsHttpRpc::~TsHttpRpc()
{ {
mg_mgr_free(&m_mg_mgr); mg_mgr_free(&m_mg_mgr);
} }
bool TsHttpRpc::init() { bool TsHttpRpc::init()
{
struct mg_connection* nc = NULL; struct mg_connection* nc = NULL;
for(int port = TS_HTTP_RPC_PORT_MIN; port < TS_HTTP_RPC_PORT_MAX; ++port) { for (int port = TS_HTTP_RPC_PORT_MIN; port < TS_HTTP_RPC_PORT_MAX; ++port)
char addr[128] = { 0 }; {
char addr[128] = {0};
ex_strformat(addr, 128, "tcp://127.0.0.1:%d", port); ex_strformat(addr, 128, "tcp://127.0.0.1:%d", port);
nc = mg_bind(&m_mg_mgr, addr, _mg_event_handler); nc = mg_bind(&m_mg_mgr, addr, _mg_event_handler);
if (!nc) { if (!nc)
{
EXLOGW("[WRN] can not start HTTP-RPC listener, maybe port %d is already in use.\n", port); EXLOGW("[WRN] can not start HTTP-RPC listener, maybe port %d is already in use.\n", port);
continue; continue;
} }
@ -41,8 +44,9 @@ bool TsHttpRpc::init() {
m_port = port; m_port = port;
break; break;
} }
if(m_port == 0) { if (m_port == 0)
{
EXLOGE("[rpc] can not listen on port %d~%d\n", TS_HTTP_RPC_PORT_MIN, TS_HTTP_RPC_PORT_MAX); EXLOGE("[rpc] can not listen on port %d~%d\n", TS_HTTP_RPC_PORT_MIN, TS_HTTP_RPC_PORT_MAX);
return false; return false;
} }
@ -54,7 +58,8 @@ bool TsHttpRpc::init() {
return _on_init(); return _on_init();
} }
bool TsHttpRpc::_on_init() { bool TsHttpRpc::_on_init()
{
m_content_type_map[".js"] = "application/javascript"; m_content_type_map[".js"] = "application/javascript";
m_content_type_map[".png"] = "image/png"; m_content_type_map[".png"] = "image/png";
m_content_type_map[".jpeg"] = "image/jpeg"; m_content_type_map[".jpeg"] = "image/jpeg";
@ -73,258 +78,262 @@ bool TsHttpRpc::_on_init() {
void TsHttpRpc::_thread_loop(void) void TsHttpRpc::_thread_loop(void)
{ {
while (!m_need_stop) while (!m_need_stop)
{ {
mg_mgr_poll(&m_mg_mgr, 500); mg_mgr_poll(&m_mg_mgr, 500);
} }
EXLOGV("[core] rpc main loop end.\n"); EXLOGV("[core] rpc main loop end.\n");
} }
void TsHttpRpc::_mg_event_handler(struct mg_connection *nc, int ev, void *ev_data) void TsHttpRpc::_mg_event_handler(struct mg_connection* nc, int ev, void* ev_data)
{ {
struct http_message *hm = (struct http_message*)ev_data; struct http_message* hm = (struct http_message*)ev_data;
TsHttpRpc* _this = (TsHttpRpc*)nc->user_data; TsHttpRpc* _this = (TsHttpRpc*)nc->user_data;
if (NULL == _this) if (NULL == _this)
{ {
EXLOGE("[ERROR] invalid http request.\n"); EXLOGE("[ERROR] invalid http request.\n");
return; return;
} }
switch (ev) switch (ev)
{ {
case MG_EV_HTTP_REQUEST: case MG_EV_HTTP_REQUEST:
{ {
ex_astr uri; ex_astr uri;
ex_chars _uri; ex_chars _uri;
_uri.resize(hm->uri.len + 1); _uri.resize(hm->uri.len + 1);
memset(&_uri[0], 0, hm->uri.len + 1); memset(&_uri[0], 0, hm->uri.len + 1);
memcpy(&_uri[0], hm->uri.p, hm->uri.len); memcpy(&_uri[0], hm->uri.p, hm->uri.len);
uri = &_uri[0]; uri = &_uri[0];
#ifdef EX_DEBUG #ifdef EX_DEBUG
const char* dbg_method = NULL; const char* dbg_method = NULL;
if (hm->method.len == 3 && 0 == memcmp(hm->method.p, "GET", hm->method.len)) if (hm->method.len == 3 && 0 == memcmp(hm->method.p, "GET", hm->method.len))
dbg_method = "GET"; dbg_method = "GET";
else if (hm->method.len == 4 && 0 == memcmp(hm->method.p, "POST", hm->method.len)) else if (hm->method.len == 4 && 0 == memcmp(hm->method.p, "POST", hm->method.len))
dbg_method = "POST"; dbg_method = "POST";
else else
dbg_method = "UNSUPPORTED-HTTP-METHOD"; dbg_method = "UNSUPPORTED-HTTP-METHOD";
EXLOGV("[rpc] got %s request: %s\n", dbg_method, uri.c_str()); EXLOGV("[rpc] got %s request: %s\n", dbg_method, uri.c_str());
#endif #endif
ex_astr ret_buf; ex_astr ret_buf;
bool b_is_html = false; bool b_is_html = false;
if (uri == "/") { if (uri == "/")
{
uri = "/status.html"; uri = "/status.html";
b_is_html = true; b_is_html = true;
} }
else if (uri == "/config") { else if (uri == "/config")
{
uri = "/index.html"; uri = "/index.html";
b_is_html = true; b_is_html = true;
} }
ex_astr temp; ex_astr temp;
size_t offset = uri.find("/", 1); size_t offset = uri.find("/", 1);
if (offset > 0) if (offset > 0)
{ {
temp = uri.substr(1, offset-1); temp = uri.substr(1, offset - 1);
if(temp == "api") { if (temp == "api")
ex_astr method; {
ex_astr json_param; ex_astr method;
int rv = _this->_parse_request(hm, method, json_param); ex_astr json_param;
if (0 != rv) int rv = _this->_parse_request(hm, method, json_param);
{ if (0 != rv)
EXLOGE("[ERROR] http-rpc got invalid request.\n"); {
_this->_create_json_ret(ret_buf, rv); EXLOGE("[ERROR] http-rpc got invalid request.\n");
} _this->_create_json_ret(ret_buf, rv);
else }
{ else
_this->_process_js_request(method, json_param, ret_buf); {
} _this->_process_js_request(method, json_param, ret_buf);
}
mg_printf(nc, "HTTP/1.0 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %ld\r\nContent-Type: application/json\r\n\r\n%s", ret_buf.length(), ret_buf.c_str()); mg_printf(nc, "HTTP/1.0 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %ld\r\nContent-Type: application/json\r\n\r\n%s", ret_buf.length(), ret_buf.c_str());
nc->flags |= MG_F_SEND_AND_CLOSE; nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
} }
ex_astr file_suffix; ex_astr file_suffix;
offset = uri.rfind("."); offset = uri.rfind(".");
if (offset > 0) if (offset > 0)
{ {
file_suffix = uri.substr(offset, uri.length()); file_suffix = uri.substr(offset, uri.length());
} }
ex_wstr2astr(g_env.m_site_path, temp); ex_wstr2astr(g_env.m_site_path, temp);
ex_astr index_path = temp + uri; ex_astr index_path = temp + uri;
FILE* file = ex_fopen(index_path.c_str(), "rb"); FILE* file = ex_fopen(index_path.c_str(), "rb");
if (file) if (file)
{ {
unsigned long file_size = 0; unsigned long file_size = 0;
char* buf = 0; char* buf = 0;
size_t ret = 0; size_t ret = 0;
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
file_size = ftell(file); file_size = ftell(file);
buf = new char[file_size]; buf = new char[file_size];
memset(buf, 0, file_size); memset(buf, 0, file_size);
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
ret = fread(buf, 1, file_size, file); ret = fread(buf, 1, file_size, file);
fclose(file); fclose(file);
ex_astr content_type = _this->get_content_type(file_suffix); ex_astr content_type = _this->get_content_type(file_suffix);
mg_printf(nc, "HTTP/1.0 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %ld\r\nContent-Type: %s\r\n\r\n", file_size, content_type.c_str()); mg_printf(nc, "HTTP/1.0 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %ld\r\nContent-Type: %s\r\n\r\n", file_size, content_type.c_str());
mg_send(nc, buf, (int)file_size); mg_send(nc, buf, (int)file_size);
delete []buf; delete[]buf;
nc->flags |= MG_F_SEND_AND_CLOSE; nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} else if (b_is_html) { }
ex_wstr page = L"<html lang=\"zh_CN\"><html><head><title>404 Not Found</title></head><body bgcolor=\"white\"><center><h1>404 Not Found</h1></center><hr><center><p>Teleport Assistor configuration page not found.</p></center></body></html>"; else if (b_is_html)
ex_wstr2astr(page, ret_buf, EX_CODEPAGE_UTF8); {
ex_wstr page = L"<html lang=\"zh_CN\"><html><head><title>404 Not Found</title></head><body bgcolor=\"white\"><center><h1>404 Not Found</h1></center><hr><center><p>Teleport Assistor configuration page not found.</p></center></body></html>";
ex_wstr2astr(page, ret_buf, EX_CODEPAGE_UTF8);
mg_printf(nc, "HTTP/1.0 404 File Not Found\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %ld\r\nContent-Type: text/html\r\n\r\n%s", ret_buf.length(), ret_buf.c_str()); mg_printf(nc, "HTTP/1.0 404 File Not Found\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %ld\r\nContent-Type: text/html\r\n\r\n%s", ret_buf.length(), ret_buf.c_str());
nc->flags |= MG_F_SEND_AND_CLOSE; nc->flags |= MG_F_SEND_AND_CLOSE;
return; return;
} }
} }
break; break;
default: default: break;
break; }
}
} }
int TsHttpRpc::_parse_request(struct http_message* req, ex_astr& func_cmd, ex_astr& func_args) int TsHttpRpc::_parse_request(struct http_message* req, ex_astr& func_cmd, ex_astr& func_args)
{ {
if (NULL == req) if (NULL == req)
return TPE_FAILED; return TPE_FAILED;
bool is_get = true; bool is_get = true;
if (req->method.len == 3 && 0 == memcmp(req->method.p, "GET", req->method.len)) if (req->method.len == 3 && 0 == memcmp(req->method.p, "GET", req->method.len))
is_get = true; is_get = true;
else if (req->method.len == 4 && 0 == memcmp(req->method.p, "POST", req->method.len)) else if (req->method.len == 4 && 0 == memcmp(req->method.p, "POST", req->method.len))
is_get = false; is_get = false;
else else
return TPE_HTTP_METHOD; return TPE_HTTP_METHOD;
ex_astrs strs; ex_astrs strs;
size_t pos_start = 1; // skip first charactor, it must be '/' size_t pos_start = 1; // skip first charactor, it must be '/'
size_t i = 0; size_t i = 0;
for (i = pos_start; i < req->uri.len; ++i) for (i = pos_start; i < req->uri.len; ++i)
{ {
if (req->uri.p[i] == '/') if (req->uri.p[i] == '/')
{ {
if (i - pos_start > 0) if (i - pos_start > 0)
{ {
ex_astr tmp_uri; ex_astr tmp_uri;
tmp_uri.assign(req->uri.p + pos_start, i - pos_start); tmp_uri.assign(req->uri.p + pos_start, i - pos_start);
strs.push_back(tmp_uri); strs.push_back(tmp_uri);
} }
pos_start = i + 1; // skip current split chactor. pos_start = i + 1; // skip current split chactor.
} }
} }
if (pos_start < req->uri.len) if (pos_start < req->uri.len)
{ {
ex_astr tmp_uri; ex_astr tmp_uri;
tmp_uri.assign(req->uri.p + pos_start, req->uri.len - pos_start); tmp_uri.assign(req->uri.p + pos_start, req->uri.len - pos_start);
strs.push_back(tmp_uri); strs.push_back(tmp_uri);
} }
if (0 == strs.size() || strs[0] != "api") if (0 == strs.size() || strs[0] != "api")
return TPE_PARAM; return TPE_PARAM;
if (is_get) if (is_get)
{ {
if (2 == strs.size()) if (2 == strs.size())
{ {
func_cmd = strs[1]; func_cmd = strs[1];
} }
else if (3 == strs.size()) else if (3 == strs.size())
{ {
func_cmd = strs[1]; func_cmd = strs[1];
func_args = strs[2]; func_args = strs[2];
} }
else else
{ {
return TPE_PARAM; return TPE_PARAM;
} }
} }
else else
{ {
if (2 == strs.size()) if (2 == strs.size())
{ {
func_cmd = strs[1]; func_cmd = strs[1];
} }
else else
{ {
return TPE_PARAM; return TPE_PARAM;
} }
if (req->body.len > 0) if (req->body.len > 0)
{ {
func_args.assign(req->body.p, req->body.len); func_args.assign(req->body.p, req->body.len);
} }
} }
if (func_args.length() > 0) if (func_args.length() > 0)
{ {
// decode param with url-decode. // decode param with url-decode.
size_t len = func_args.length() * 2; size_t len = func_args.length() * 2;
ex_chars sztmp; ex_chars sztmp;
sztmp.resize(len); sztmp.resize(len);
memset(&sztmp[0], 0, len); memset(&sztmp[0], 0, len);
if (-1 == ex_url_decode(func_args.c_str(), (int)func_args.length(), &sztmp[0], (int)len, 0)) if (-1 == ex_url_decode(func_args.c_str(), (int)func_args.length(), &sztmp[0], (int)len, 0))
return TPE_HTTP_URL_ENCODE; return TPE_HTTP_URL_ENCODE;
func_args = &sztmp[0]; func_args = &sztmp[0];
} }
EXLOGV("[rpc] method=%s, json_param=%s\n", func_cmd.c_str(), func_args.c_str()); EXLOGV("[rpc] method=%s, json_param=%s\n", func_cmd.c_str(), func_args.c_str());
return TPE_OK; return TPE_OK;
} }
void TsHttpRpc::_process_js_request(const ex_astr& func_cmd, const ex_astr& func_args, ex_astr& buf) void TsHttpRpc::_process_js_request(const ex_astr& func_cmd, const ex_astr& func_args, ex_astr& buf)
{ {
if (func_cmd == "get_version") if (func_cmd == "get_version")
{ {
_rpc_func_get_version(func_args, buf); _rpc_func_get_version(func_args, buf);
} }
else if (func_cmd == "get_config") else if (func_cmd == "get_config")
{ {
_rpc_func_get_config(func_args, buf); _rpc_func_get_config(func_args, buf);
} }
else if (func_cmd == "set_config") else if (func_cmd == "set_config")
{ {
_rpc_func_set_config(func_args, buf); _rpc_func_set_config(func_args, buf);
} }
else if (func_cmd == "file_action") else if (func_cmd == "file_action")
{ {
_rpc_func_file_action(func_args, buf); _rpc_func_file_action(func_args, buf);
} }
else else
{ {
EXLOGE("[rpc] got unknown command: %s\n", func_cmd.c_str()); EXLOGE("[rpc] got unknown command: %s\n", func_cmd.c_str());
_create_json_ret(buf, TPE_UNKNOWN_CMD); _create_json_ret(buf, TPE_UNKNOWN_CMD);
} }
} }
void TsHttpRpc::_create_json_ret(ex_astr& buf, int errcode) void TsHttpRpc::_create_json_ret(ex_astr& buf, int errcode)
{ {
// return {"code":123} // return {"code":123}
Json::Value jr_root; Json::Value jr_root;
jr_root["code"] = errcode; jr_root["code"] = errcode;
Json::StreamWriterBuilder jwb; Json::StreamWriterBuilder jwb;
std::unique_ptr<Json::StreamWriter> jwriter(jwb.newStreamWriter()); std::unique_ptr<Json::StreamWriter> jwriter(jwb.newStreamWriter());
ex_aoss os; ex_aoss os;
@ -341,31 +350,35 @@ void TsHttpRpc::_create_json_ret(ex_astr& buf, Json::Value& jr_root)
buf = os.str(); buf = os.str();
} }
void TsHttpRpc::_rpc_func_get_config(const ex_astr& func_args, ex_astr& buf) { void TsHttpRpc::_rpc_func_get_config(const ex_astr& func_args, ex_astr& buf)
Json::Value jr_root; {
jr_root["code"] = 0; Json::Value jr_root;
jr_root["data"] = g_cfg.get_root(); jr_root["code"] = 0;
_create_json_ret(buf, jr_root); jr_root["data"] = g_cfg.get_root();
_create_json_ret(buf, jr_root);
} }
void TsHttpRpc::_rpc_func_set_config(const ex_astr& func_args, ex_astr& buf) { void TsHttpRpc::_rpc_func_set_config(const ex_astr& func_args, ex_astr& buf)
{
Json::CharReaderBuilder jcrb; Json::CharReaderBuilder jcrb;
std::unique_ptr<Json::CharReader> const jreader(jcrb.newCharReader()); std::unique_ptr<Json::CharReader> const jreader(jcrb.newCharReader());
const char *str_json_begin = func_args.c_str(); const char* str_json_begin = func_args.c_str();
Json::Value jsRoot; Json::Value jsRoot;
ex_astr err; ex_astr err;
if (!jreader->parse(str_json_begin, str_json_begin + func_args.length(), &jsRoot, &err)) { if (!jreader->parse(str_json_begin, str_json_begin + func_args.length(), &jsRoot, &err))
{
_create_json_ret(buf, TPE_JSON_FORMAT); _create_json_ret(buf, TPE_JSON_FORMAT);
return; return;
} }
if(!g_cfg.save(func_args)) if (!g_cfg.save(func_args))
_create_json_ret(buf, TPE_FAILED); _create_json_ret(buf, TPE_FAILED);
else else
_create_json_ret(buf, TPE_OK); _create_json_ret(buf, TPE_OK);
} }
void TsHttpRpc::_rpc_func_file_action(const ex_astr& func_args, ex_astr& buf) { void TsHttpRpc::_rpc_func_file_action(const ex_astr& func_args, ex_astr& buf)
{
_create_json_ret(buf, TPE_FAILED); _create_json_ret(buf, TPE_FAILED);
#if 0 #if 0
Json::Reader jreader; Json::Reader jreader;
@ -406,13 +419,14 @@ void TsHttpRpc::_rpc_func_file_action(const ex_astr& func_args, ex_astr& buf) {
#endif #endif
} }
void TsHttpRpc::_rpc_func_get_version(const ex_astr& func_args, ex_astr& buf) { void TsHttpRpc::_rpc_func_get_version(const ex_astr& func_args, ex_astr& buf)
Json::Value root_ret; {
ex_wstr w_version = TP_ASSIST_VER; Json::Value root_ret;
ex_astr version; ex_wstr w_version = TP_ASSIST_VER;
ex_wstr2astr(w_version, version, EX_CODEPAGE_UTF8); ex_astr version;
root_ret["version"] = version; ex_wstr2astr(w_version, version, EX_CODEPAGE_UTF8);
root_ret["code"] = TPE_OK; root_ret["version"] = version;
_create_json_ret(buf, root_ret); root_ret["code"] = TPE_OK;
return; _create_json_ret(buf, root_ret);
return;
} }

85
client/tp_assist_macos/src/csrc/ts_http_rpc.h
View File

@ -16,13 +16,13 @@
//================================================================= //=================================================================
# HTTP-RPC-INTERFACE: # HTTP-RPC-INTERFACE:
listen on http://localhost:50022. listen on http://localhost:50022.
---------------- ----------------
GET method: GET method:
http://127.0.0.1:50022/method/json_param http://127.0.0.1:50022/method/json_param
here `json_param` is string in json format and encoded by url_encode(). here `json_param` is string in json format and encoded by url_encode().
---------------- ----------------
@ -30,22 +30,22 @@
http://127.0.0.1:50022/method http://127.0.0.1:50022/method
here the data field of POST should be json_param. here the data field of POST should be json_param.
## URI detail: ## URI detail:
- method the method to request to execute. - method the method to request to execute.
- json_param param of the method and it is optional. - json_param param of the method and it is optional.
## RESULT ## RESULT
A string in json format should returned with following format: A string in json format should returned with following format:
{"code":0,"data":varb} {"code":0,"data":varb}
`code` field always exists and 0 means success. `code` field always exists and 0 means success.
`data` field is optional. `data` field is optional.
*/ */
@ -54,47 +54,54 @@ typedef std::map<ex_astr, ex_astr> content_type_map;
class TsHttpRpc : public ExThreadBase class TsHttpRpc : public ExThreadBase
{ {
public: public:
TsHttpRpc(); TsHttpRpc();
~TsHttpRpc();
~TsHttpRpc();
bool init(); bool init();
int get_port() {return m_port;} int get_port() { return m_port; }
ex_astr get_content_type(ex_astr file_suffix) ex_astr get_content_type(ex_astr file_suffix)
{ {
content_type_map::iterator it = m_content_type_map.find(file_suffix); content_type_map::iterator it = m_content_type_map.find(file_suffix);
if (it != m_content_type_map.end()) if (it != m_content_type_map.end())
{ {
return it->second; return it->second;
} }
else else
{ {
return "application/octet-stream"; return "application/octet-stream";
} }
}; };
protected: protected:
void _thread_loop(void); void _thread_loop(void);
bool _on_init(); bool _on_init();
private:
int _parse_request(struct http_message* req, ex_astr& func_cmd, ex_astr& func_args);
void _process_js_request(const ex_astr& func_cmd, const ex_astr& func_args, ex_astr& buf);
void _create_json_ret(ex_astr& buf, int errcode);
void _create_json_ret(ex_astr& buf, Json::Value& jr_root);
void _rpc_func_get_config(const ex_astr& func_args, ex_astr& buf);
void _rpc_func_set_config(const ex_astr& func_args, ex_astr& buf);
void _rpc_func_file_action(const ex_astr& func_args, ex_astr& buf);
void _rpc_func_get_version(const ex_astr& func_args, ex_astr& buf);
static void _mg_event_handler(struct mg_connection *nc, int ev, void *ev_data);
private: private:
content_type_map m_content_type_map; int _parse_request(struct http_message* req, ex_astr& func_cmd, ex_astr& func_args);
struct mg_mgr m_mg_mgr;
void _process_js_request(const ex_astr& func_cmd, const ex_astr& func_args, ex_astr& buf);
void _create_json_ret(ex_astr& buf, int errcode);
void _create_json_ret(ex_astr& buf, Json::Value& jr_root);
void _rpc_func_get_config(const ex_astr& func_args, ex_astr& buf);
void _rpc_func_set_config(const ex_astr& func_args, ex_astr& buf);
void _rpc_func_file_action(const ex_astr& func_args, ex_astr& buf);
void _rpc_func_get_version(const ex_astr& func_args, ex_astr& buf);
static void _mg_event_handler(struct mg_connection* nc, int ev, void* ev_data);
private:
content_type_map m_content_type_map;
struct mg_mgr m_mg_mgr;
int m_port; int m_port;
}; };

489
client/tp_assist_macos/src/csrc/ts_ws_client.cpp
View File

File diff suppressed because it is too large Load Diff

6
client/tp_assist_macos/src/csrc/ts_ws_client.h
View File

@ -34,6 +34,7 @@ public:
~TsWsClient(); ~TsWsClient();
void init(); void init();
void stop_all_client(); void stop_all_client();
void url_scheme_handler(const std::string& url); void url_scheme_handler(const std::string& url);
@ -57,7 +58,7 @@ private:
void _rpc_func_select_file(ex_astr& buf, AssistMessage& msg_req, Json::Value& js_root); void _rpc_func_select_file(ex_astr& buf, AssistMessage& msg_req, Json::Value& js_root);
void _rpc_func_replay_rdp(ex_astr& buf, AssistMessage& msg_req, Json::Value& js_root); void _rpc_func_replay_rdp(ex_astr& buf, AssistMessage& msg_req, Json::Value& js_root);
void _send_result(int err_code, Json::Value& jr_root); void _send_result(int err_code, Json::Value& jr_root);
void _create_response(ex_astr& buf, const AssistMessage& msg_ret, int err_code); void _create_response(ex_astr& buf, const AssistMessage& msg_ret, int err_code);
@ -69,8 +70,9 @@ private:
static void _mg_event_handler(struct mg_connection* nc, int ev, void* ev_data); static void _mg_event_handler(struct mg_connection* nc, int ev, void* ev_data);
void _process_register(const std::string& param, Json::Value& js_root); void _process_register(const std::string& param, Json::Value& js_root);
void _process_run(const std::string& param, Json::Value& js_root); void _process_run(const std::string& param, Json::Value& js_root);
void _process_replay_rdp(const std::string& param, Json::Value& js_root); void _process_replay_rdp(const std::string& param, Json::Value& js_root);
private: private:

6
server/tp_core/core/ts_session.cpp
View File

@ -161,9 +161,9 @@ bool TsSessionManager::request_session(ex_astr& sid, TS_CONNECT_INFO* info)
if (info->protocol_type == TP_PROTOCOL_TYPE_RDP) if (info->protocol_type == TP_PROTOCOL_TYPE_RDP)
{ {
info->ref_count = 1; // 因为RDP连接之前可能会有很长时间用于确认是否连接、是否信任证书，所以很容易超时，我们认为将引用计数+1，防止因超时被清除。 info->ref_count = 1; // 因为RDP连接之前可能会有很长时间用于确认是否连接、是否信任证书，所以很容易超时，我们认为将引用计数+1，防止因超时被清除。
char szTmp[8] = {0}; // char szTmp[8] = {0};
snprintf(szTmp, 8, "%02X", (unsigned char)(info->acc_username.length() + info->acc_secret.length())); // snprintf(szTmp, 8, "%02X", (unsigned char)(info->acc_username.length() + info->acc_secret.length()));
sid += szTmp; // sid += szTmp;
} }
return true; return true;

8
server/www/teleport/static/js/ops/remote-list.js
View File

@ -518,11 +518,9 @@ $app.connect_remote = function (uni_id, acc_id, host_id, protocol_type, protocol
is_interactive: false, is_interactive: false,
}; };
if (protocol_type === TP_PROTOCOL_TYPE_RDP) { if (protocol_type === TP_PROTOCOL_TYPE_RDP) {
args.extends({ args.rdp_width = $app.dlg_rdp_options.rdp_w;
rdp_width: $app.dlg_rdp_options.rdp_w, args.rdp_height = $app.dlg_rdp_options.rdp_h;
rdp_height: $app.dlg_rdp_options.rdp_h, args.rdp_console = $app.dlg_rdp_options.rdp_console;
rdp_console: $app.dlg_rdp_options.rdp_console
});
} }
if (uni_id === 'none') if (uni_id === 'none')