'];
@@ -290,32 +270,43 @@ $app.on_table_host_render_created = function (render) {
} else {
if (acc.protocol_type === TP_PROTOCOL_TYPE_RDP) {
if ((acc.policy_.flag_rdp & TP_FLAG_RDP_DESKTOP) !== 0) {
- act_btn.push('
');
- act_btn.push('');
- act_btn.push('');
+ act_btn.push('
');
}
} else if (acc.protocol_type === TP_PROTOCOL_TYPE_SSH) {
+ act_btn.push('
');
if ((acc.policy_.flag_ssh & TP_FLAG_SSH_SHELL) !== 0) {
- act_btn.push('
');
- act_btn.push('');
- act_btn.push('');
+ act_btn.push('');
}
if ((acc.policy_.flag_ssh & TP_FLAG_SSH_SFTP) !== 0) {
- act_btn.push('');
- act_btn.push('');
- act_btn.push('');
+ act_btn.push('');
}
+ act_btn.push('');
} else if (acc.protocol_type === TP_PROTOCOL_TYPE_TELNET) {
- act_btn.push('
');
- act_btn.push('');
- act_btn.push('');
+ act_btn.push('
');
}
}
- h.push('
');
}
return h.join('');
};
@@ -386,31 +377,126 @@ $app.on_table_host_header_created = function (header) {
.exec();
});
- // TODO: 褰撹繃婊ゅ櫒涓嶆槸榛樿鍊兼椂锛岃鈥滈噸缃繃婊ゅ櫒鎸夐挳鈥濇湁鍛煎惛鏁堟灉锛岄伩鍏嶇敤鎴锋贩娣 - 瀹為獙鎬ц川
- // var t1 = function(){
- // $app.dom.btn_table_host_reset_filter.fadeTo(1000, 1.0, function(){
- // $app.dom.btn_table_host_reset_filter.fadeTo(1000, 0.2, t1);
- // });
- // };
- // $app.dom.btn_table_host_reset_filter.fadeTo(1000, 0.2, t1);
-
// 琛ㄦ牸鍐呭祵杩囨护鍣ㄧ殑浜嬩欢缁戝畾鍦ㄨ繖鏃惰繘琛岋紙涔熷彲浠ュ欢鏈熷埌鏁翠釜琛ㄦ牸鍒涘缓瀹屾垚鏃惰繘琛岋級
header._table_ctrl.get_filter_ctrl('search').on_created();
- // header._table_ctrl.get_filter_ctrl('role').on_created();
- // header._table_ctrl.get_filter_ctrl('state').on_created();
};
-$app.get_selected_user = function (tbl) {
- var users = [];
- var _objs = $('#' + $app.table_host.dom_id + ' tbody tr td input[data-check-box]');
- $.each(_objs, function (i, _obj) {
- if ($(_obj).is(':checked')) {
- var _row_data = tbl.get_row(_obj);
- // _all_checked = false;
- users.push(_row_data.id);
+$app.create_dlg_rdp_options = function () {
+ var dlg = {};
+ dlg.dom_id = 'dlg-rdp-options';
+ dlg.uni_id = '';
+ dlg.protocol_type = TP_PROTOCOL_TYPE_RDP;
+ dlg.protocol_sub_type = TP_PROTOCOL_TYPE_RDP_DESKTOP;
+ dlg.rdp_w = 0;
+ dlg.rdp_h = 0;
+ dlg.rdp_console = false;
+
+ dlg.dom = {
+ dialog: $('#' + dlg.dom_id),
+ screen_size: $('#' + dlg.dom_id + ' [data-field="screen-size"]'),
+ console_mode: $('#' + dlg.dom_id + ' input[data-field="console-mode"]'),
+ btn_connect: $('#' + dlg.dom_id + ' [data-field="do-rdp-connect"]')
+ };
+ dlg.timer = null;
+
+ dlg.init = function (cb_stack) {
+ dlg.dom.dialog.mouseleave(function () {
+ dlg.timer = setTimeout(function () {
+ dlg.hide();
+ }, 800);
+ });
+ dlg.dom.dialog.mouseenter(function () {
+ if (dlg.timer !== null) {
+ clearTimeout(dlg.timer);
+ dlg.timer = null;
+ }
+ });
+
+ dlg.dom.btn_connect.click(function () {
+ dlg.hide();
+
+ var _size_obj = $('#' + dlg.dom_id + ' input[name="screen-size"]:checked');
+ var _console = dlg.dom.console_mode.is(':checked');
+ var _w = parseInt(_size_obj.attr('data-w'));
+ var _h = parseInt(_size_obj.attr('data-h'));
+
+ dlg.rdp_w = _w;
+ dlg.rdp_h = _h;
+ Cookies.set('rdp_options', {w: _w, h: _h, 'c': _console}, {path: '/ops/remote'});
+
+ $app.connect_remote(dlg.uni_id, dlg.protocol_type, dlg.protocol_sub_type);
+ });
+
+ var ops = Cookies.getJSON('rdp_options');
+ dlg.rdp_w = 0;
+ dlg.rdp_h = 0;
+ dlg.rdp_console = false;
+ if (!_.isUndefined(ops)) {
+ dlg.rdp_w = ops.w;
+ dlg.rdp_h = ops.h;
+ dlg.rdp_console = ops.c;
}
- });
- return users;
+ if (_.isUndefined(dlg.rdp_w) || _.isUndefined(dlg.rdp_h)) {
+ dlg.rdp_w = 0;
+ dlg.rdp_h = 0;
+ }
+ if (_.isUndefined(dlg.rdp_console))
+ dlg.rdp_console = false;
+
+ var ss = [
+ {w: 800, h: 600},
+ {w: 1024, h: 768},
+ {w: 1280, h: 1024},
+ {w: 1366, h: 768},
+ {w: 1440, h: 900}
+ ];
+
+ var h = [];
+ h.push('
');
+ dlg.dom.screen_size.html($(h.join('')));
+
+ if(dlg.rdp_console)
+ dlg.dom.console_mode.prop('checked', true);
+
+ cb_stack.exec();
+ };
+
+ dlg.show = function (x, y, uni_id, protocol_type, protocol_sub_type) {
+ if (dlg.timer !== null) {
+ clearTimeout(dlg.timer);
+ dlg.timer = null;
+ }
+
+ dlg.uni_id = uni_id;
+ dlg.protocol_type = protocol_type;
+ dlg.protocol_sub_type = protocol_sub_type;
+
+ var w = dlg.dom.dialog.width();
+ x -= w / 3;
+ y -= 12;
+ dlg.dom.dialog.css({left: x, top: y});
+ dlg.dom.dialog.fadeIn();
+ };
+
+ dlg.hide = function () {
+ dlg.dom.dialog.fadeOut();
+ };
+
+ return dlg;
};
$app.connect_remote = function (uni_id, protocol_type, protocol_sub_type) {
@@ -418,7 +504,10 @@ $app.connect_remote = function (uni_id, protocol_type, protocol_sub_type) {
{
auth_id: uni_id,
protocol_type: protocol_type,
- protocol_sub_type: protocol_sub_type
+ protocol_sub_type: protocol_sub_type,
+ rdp_width: $app.dlg_rdp_options.rdp_w,
+ rdp_height: $app.dlg_rdp_options.rdp_h,
+ rdp_console: $app.dlg_rdp_options.rdp_console
},
function () {
// func_success
diff --git a/server/www/teleport/static/js/tp-assist.js b/server/www/teleport/static/js/tp-assist.js
index 0587de8..eb635a2 100644
--- a/server/www/teleport/static/js/tp-assist.js
+++ b/server/www/teleport/static/js/tp-assist.js
@@ -104,12 +104,19 @@ $assist.do_teleport = function (args, func_success, func_error) {
teleport_port: teleport_port,
remote_host_ip: remote_host_ip,
// remote_host_port: args.host_port,
- size: 3, //parseInt(args.size),
- console: 0, //args.console,
+ // rdp_size: args.rdp_size,
+ // rdp_console: args.rdp_console,
session_id: session_id,
protocol_type: parseInt(args.protocol_type),
protocol_sub_type: parseInt(args.protocol_sub_type)
};
+
+ if(args.protocol_type === TP_PROTOCOL_TYPE_RDP) {
+ data.rdp_width = args.rdp_width;
+ data.rdp_height = args.rdp_height;
+ data.rdp_console = args.rdp_console;
+ }
+
// console.log('---', data);
var args_ = encodeURIComponent(JSON.stringify(data));
$.ajax({
diff --git a/server/www/teleport/static/less/_base.less b/server/www/teleport/static/less/_base.less
index 8f4f9dc..4467e44 100644
--- a/server/www/teleport/static/less/_base.less
+++ b/server/www/teleport/static/less/_base.less
@@ -126,217 +126,6 @@ ul.list {
}
}
-.remote-action-group {
- margin-bottom: 3px;
- height: 28px;
- //min-width: 390px;
-
- ul {
- display: block;
- height: 28px;
- margin: 0;
- padding: 0;
-
- li {
- float: left;
- position: relative;
- display: block;
- height: 28px;
- padding: 4px 5px;
-
- background-color: #eee;
- border-top: 1px solid #ccc;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-
- &.remote-action-btn {
- background: none;
- padding: 0;
- border: none;
- }
-
- &.remote-action-input {
- background: none;
- padding: 4px 0;
-
- select {
- border: none;
- }
- }
-
- &.remote-action-chk-protocol {
- width: 86px;
- }
-
- &.remote-action-state {
- //width: 64px;
- text-align: center;
- white-space: nowrap;
-
- &.state-disabled {
- background-color: @color-bg-ignore;
- color: #aaa;
- text-shadow: -1px -1px 1px #fff;
-
- & > i.fa {
- color: #b53a2f;
- }
- }
- }
-
- &.remote-action-username, &.remote-action-name, &.remote-action-protocol {
- width: 96px;
- text-align: center;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- &.remote-action-username {
- font-size: 90%;
- color: #999;
- }
- &.remote-action-name, &.remote-action-protocol, &.remote-action-chk-protocol {
- color: #000;
- }
- &.remote-action-name, &.remote-action-chk-protocol {
- font-weight: bold;
- }
-
- &.remote-action-password, &.remote-action-sshkey, &.remote-action-noauth {
- text-align: center;
- padding: 4px 8px;
- width: 45px;
- }
- &.remote-action-password {
- background-color: #e3ffe3;
- color: #999;
- }
- &.remote-action-sshkey {
- background-color: #fbe9c8;
- color: #666;
- }
- &.remote-action-noauth {
- background-color: #e0e0e0;
- color: #666;
- }
-
- .btn {
- line-height: 1.5;
- margin: 0;
- padding: 4px 8px;
- font-size: 12px;
- border-radius: 0;
- }
-
- label {
- padding: 0;
- display: block;
- float: left;
- margin-top: 1px;
- cursor: pointer;
- }
- input[type=checkbox] {
- display: block;
- float: left;
- margin: 3px 5px 0 0;
- }
- select {
- margin-top: -3px;
- }
-
- &:first-child {
- border-left: 1px solid #ccc;
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
- }
-
- &.remote-action-btn:first-child {
- border: none;
- .btn {
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
- }
- }
-
- &:last-child {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- }
-
- &.remote-action-btn:last-child {
- border: none;
- .btn {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- }
- }
-
- }
- }
-}
-
-.remote-info-group {
- margin-bottom: 3px;
- height: 28px;
-
- ul {
- display: inline-block;
- height: 28px;
- margin: 0;
- padding: 0;
-
- li {
- float: left;
- position: relative;
- display: block;
- height: 28px;
- padding: 4px 5px;
-
- //background-color: #efefef;
- border-top: 1px solid #ccc;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-
- &.remote-action-btn {
- background: none;
- padding: 0;
- border: none;
- }
-
- &.remote-action-input {
- background: none;
- padding: 4px 0;
-
- select {
- border: none;
- }
- }
-
- label {
- padding: 0;
- display: block;
- float: left;
- margin-top: 1px;
- cursor: pointer;
- }
- select {
- margin-top: -3px;
- }
-
- &:first-child {
- border-left: 1px solid #ccc;
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
- }
-
- &:last-child {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
- }
- }
- }
-}
-
hr.small {
margin: 5px 0;
}
diff --git a/server/www/teleport/static/less/_remote_action.less b/server/www/teleport/static/less/_remote_action.less
new file mode 100644
index 0000000..c149dc9
--- /dev/null
+++ b/server/www/teleport/static/less/_remote_action.less
@@ -0,0 +1,260 @@
+@charset "utf-8";
+
+.remote-action-group {
+ margin-bottom: 3px;
+ height: 28px;
+
+ .btn-group-sm > .btn {
+ margin: 0;
+ padding: 6px 6px;
+ font-size: 12px;
+ height: 28px;
+ min-width: 80px;
+
+ &.dropdown-toggle {
+ min-width: 0;
+ }
+ }
+
+ //& > ul {
+ // display: block;
+ // height: 28px;
+ // margin: 0;
+ // padding: 0;
+ //
+ // & > li {
+ // float: left;
+ // position: relative;
+ // display: block;
+ // height: 28px;
+ // padding: 4px 5px;
+ //
+ // background-color: #eee;
+ // border-top: 1px solid #ccc;
+ // border-right: 1px solid #ccc;
+ // border-bottom: 1px solid #ccc;
+ //
+ // &.remote-action-btn {
+ // background: none;
+ // padding: 0;
+ // border: none;
+ // }
+ //
+ // &.remote-action-input {
+ // background: none;
+ // padding: 4px 0;
+ //
+ // select {
+ // border: none;
+ // }
+ // }
+ //
+ // &.remote-action-chk-protocol {
+ // width: 86px;
+ // }
+ //
+ // &.remote-action-state {
+ // //width: 64px;
+ // text-align: center;
+ // white-space: nowrap;
+ //
+ // &.state-disabled {
+ // background-color: @color-bg-ignore;
+ // color: #aaa;
+ // text-shadow: -1px -1px 1px #fff;
+ //
+ // & > i.fa {
+ // color: #b53a2f;
+ // }
+ // }
+ // }
+ //
+ // &.remote-action-username, &.remote-action-name, &.remote-action-protocol {
+ // width: 96px;
+ // text-align: center;
+ // white-space: nowrap;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // }
+ // &.remote-action-username {
+ // font-size: 90%;
+ // color: #999;
+ // }
+ // &.remote-action-name, &.remote-action-protocol, &.remote-action-chk-protocol {
+ // color: #000;
+ // }
+ // &.remote-action-name, &.remote-action-chk-protocol {
+ // font-weight: bold;
+ // }
+ //
+ // &.remote-action-password, &.remote-action-sshkey, &.remote-action-noauth {
+ // text-align: center;
+ // padding: 4px 8px;
+ // width: 45px;
+ // }
+ // &.remote-action-password {
+ // background-color: #e3ffe3;
+ // color: #999;
+ // }
+ // &.remote-action-sshkey {
+ // background-color: #fbe9c8;
+ // color: #666;
+ // }
+ // &.remote-action-noauth {
+ // background-color: #e0e0e0;
+ // color: #666;
+ // }
+ //
+ // & > .btn {
+ // line-height: 1.5;
+ // margin: 0;
+ // padding: 4px 8px;
+ // font-size: 12px;
+ // border-radius: 0;
+ // }
+ //
+ // label {
+ // padding: 0;
+ // display: block;
+ // float: left;
+ // margin-top: 1px;
+ // cursor: pointer;
+ // }
+ // input[type=checkbox] {
+ // display: block;
+ // float: left;
+ // margin: 3px 5px 0 0;
+ // }
+ // select {
+ // margin-top: -3px;
+ // }
+ //
+ // &:first-child {
+ // border-left: 1px solid #ccc;
+ // border-top-left-radius: 4px;
+ // border-bottom-left-radius: 4px;
+ // }
+ //
+ // &.remote-action-btn:first-child {
+ // border: none;
+ // .btn {
+ // border-top-left-radius: 4px;
+ // border-bottom-left-radius: 4px;
+ // }
+ // }
+ //
+ // &:last-child {
+ // border-top-right-radius: 4px;
+ // border-bottom-right-radius: 4px;
+ // }
+ //
+ // &.remote-action-btn:last-child {
+ // border: none;
+ // .btn {
+ // border-top-right-radius: 4px;
+ // border-bottom-right-radius: 4px;
+ // }
+ // }
+ //
+ // }
+ //}
+}
+
+.remote-info-group {
+ margin-bottom: 3px;
+ height: 28px;
+
+ ul {
+ display: inline-block;
+ height: 28px;
+ margin: 0;
+ padding: 0;
+
+ li {
+ float: left;
+ position: relative;
+ display: block;
+ height: 28px;
+ padding: 4px 5px;
+
+ //background-color: #efefef;
+ border-top: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+
+ &.remote-action-btn {
+ background: none;
+ padding: 0;
+ border: none;
+ }
+
+ &.remote-action-input {
+ background: none;
+ padding: 4px 0;
+
+ select {
+ border: none;
+ }
+ }
+
+ label {
+ padding: 0;
+ display: block;
+ float: left;
+ margin-top: 1px;
+ cursor: pointer;
+ }
+ select {
+ margin-top: -3px;
+ }
+
+ &:first-child {
+ border-left: 1px solid #ccc;
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ }
+
+ &:last-child {
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
+ }
+ }
+}
+
+.rdp-options {
+ position: absolute;
+ display: none;
+ left: 10px;
+ top: 30px;
+ border: 1px solid rgba(0, 0, 0, .25);
+ z-index: 9999;
+ background-color: #fff;
+ border-radius: 4px;
+ box-shadow: 0 6px 12px rgba(0, 0, 0, .2);
+ font-size: 13px;
+
+ hr {
+ margin: 3px 0;
+ }
+
+ .title {
+ background-color: #eee;
+ padding: 3px 5px;
+ }
+
+ .item {
+ width: 100%;
+ padding: 3px 20px;
+
+ .radio, .checkbox {
+ // overwrite bootstrap.
+ margin:0;
+ font-family: @font-family-mono;
+ }
+
+ .center {
+ text-align: center;
+ }
+ }
+}
diff --git a/server/www/teleport/static/less/style.less b/server/www/teleport/static/less/style.less
index 2628449..0d53b97 100644
--- a/server/www/teleport/static/less/style.less
+++ b/server/www/teleport/static/less/style.less
@@ -2,9 +2,10 @@
@import "_color";
@import "_base";
+@import "_overwrite_bootstrap";
@import "_role";
@import "_table";
-@import "_overwrite_bootstrap";
+@import "_remote_action";
//@menu-admin-bg-color: #930;
diff --git a/server/www/teleport/view/ops/remote-list.mako b/server/www/teleport/view/ops/remote-list.mako
index a343ca3..cd4a09b 100644
--- a/server/www/teleport/view/ops/remote-list.mako
+++ b/server/www/teleport/view/ops/remote-list.mako
@@ -27,23 +27,24 @@
-##
-##
-##
-## ##
-##
-##
-##
-##
-##
-##
+ ##
+ ##
+ ##
+ ## ##
+ ##
+ ##
+ ##
+ ##
+ ##
+ ##
+
@@ -71,7 +72,45 @@
<%block name="extend_content">
+
+
RDP杩炴帴閫夐」
+
+ ## 灞忓箷灏哄锛
+ ##
+
+
+
+
+ ##
+ ##
+
+
+
+
+
+
## <%block name="embed_js">
diff --git a/server/www/teleport/webroot/app/model/user.py b/server/www/teleport/webroot/app/model/user.py
index c063e9b..d51b357 100644
--- a/server/www/teleport/webroot/app/model/user.py
+++ b/server/www/teleport/webroot/app/model/user.py
@@ -58,8 +58,6 @@ def login(handler, username, password=None, oath_code=None):
# syslog.sys_log({'username': username, 'surname': username}, handler.request.remote_ip, TPE_NOT_EXISTS, '鐢ㄦ埛韬唤楠岃瘉澶辫触锛岀敤鎴穈{}`涓嶅瓨鍦'.format(username))
return err, None
- print(user_info)
-
if user_info.privilege == 0:
# 灏氭湭涓烘鐢ㄦ埛璁剧疆瑙掕壊
return TPE_PRIVILEGE, None