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

修复：双因子认证添加界面和总览界面的时间显示不正常的问题。 

(#218)
dev
Apex Liu 2020-06-27 01:08:35 +08:00
parent fd9a6a15bf
commit 7d05421c8c
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.sh.in
View File

@ -46,7 +46,6 @@ function build_linux
fi
fi
${PYEXEC} -B "${PATH_ROOT}/build/build.py" $@
}
@ -57,9 +56,9 @@ function build_macos
SYSTEM=`uname -s`
if [ $SYSTEM = "Linux" ] ; then
build_linux
build_linux $@
elif [ $SYSTEM = "Darwin" ] ; then
build_macos
build_macos $@
else
echo "Unsupported platform."
fi

30
server/www/teleport/static/js/dashboard/dashboard.js
View File

@ -48,7 +48,7 @@ $app.init_sys_status_info = function (data) {
fontSize: 11,
fontFamily: 'Monaco, Lucida Console, Consolas, Courier',
formatter: function (value, index) {
return tp_format_datetime(value, 'HH:mm');
return tp_format_datetime_ms(value, 'HH:mm');
}
}
};
@ -95,8 +95,8 @@ $app.init_sys_status_info = function (data) {
$app.bar_cpu_user = [];
$app.bar_cpu_sys = [];
for (i = 0; i < data.length; i++) {
$app.bar_cpu_user.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].cpu.u]});
$app.bar_cpu_sys.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].cpu.s]});
$app.bar_cpu_user.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].cpu.u]});
$app.bar_cpu_sys.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].cpu.s]});
}
var clr_cpu_user = '#e2524c';
@ -191,7 +191,7 @@ $app.init_sys_status_info = function (data) {
$app.bar_mem_used = [];
for (i = 0; i < data.length; i++) {
$app.bar_mem_used.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, tp_digital_precision(data[i].mem.u * 100 / data[i].mem.t, 1)]});
$app.bar_mem_used.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, tp_digital_precision(data[i].mem.u * 100 / data[i].mem.t, 1)]});
}
var clr_mem = '#5671e2';
@ -269,8 +269,8 @@ $app.init_sys_status_info = function (data) {
$app.bar_net_recv = [];
$app.bar_net_sent = [];
for (i = 0; i < data.length; i++) {
$app.bar_net_recv.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].net.r]});
$app.bar_net_sent.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].net.s]});
$app.bar_net_recv.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].net.r]});
$app.bar_net_sent.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].net.s]});
}
var clr_net_sent = '#558c5a';
@ -342,8 +342,8 @@ $app.init_sys_status_info = function (data) {
$app.bar_disk_read = [];
$app.bar_disk_write = [];
for (i = 0; i < data.length; i++) {
$app.bar_disk_read.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].disk.r]});
$app.bar_disk_write.push({name: tp_format_datetime(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].disk.w]});
$app.bar_disk_read.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].disk.r]});
$app.bar_disk_write.push({name: tp_format_datetime_ms(data[i].t, 'HH:mm:ss'), value: [data[i].t, data[i].disk.w]});
}
var clr_disk_read = '#558c5a';
@ -489,31 +489,31 @@ $app.init_ws = function () {
if (t.method === 'subscribe' && t.param === 'sys_status') {
$app.bar_cpu_user.shift();
$app.bar_cpu_user.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.cpu.u]});
$app.bar_cpu_user.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.cpu.u]});
$app.bar_cpu_sys.shift();
$app.bar_cpu_sys.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.cpu.s]});
$app.bar_cpu_sys.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.cpu.s]});
$app.bar_cpu.setOption(
{series: [{data: $app.bar_cpu_sys}, {data: $app.bar_cpu_user}]}
);
$app.bar_mem_used.shift();
$app.bar_mem_used.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, Math.round(t.data.mem.u / t.data.mem.t * 100, 2)]});
$app.bar_mem_used.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, Math.round(t.data.mem.u / t.data.mem.t * 100, 2)]});
$app.bar_mem.setOption(
{series: [{data: $app.bar_mem_used}]}
);
$app.bar_net_recv.shift();
$app.bar_net_recv.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.net.r]});
$app.bar_net_recv.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.net.r]});
$app.bar_net_sent.shift();
$app.bar_net_sent.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.net.s]});
$app.bar_net_sent.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.net.s]});
$app.bar_net.setOption(
{series: [{data: $app.bar_net_sent}, {data: $app.bar_net_recv}]}
);
$app.bar_disk_read.shift();
$app.bar_disk_read.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.disk.r]});
$app.bar_disk_read.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.disk.r]});
$app.bar_disk_write.shift();
$app.bar_disk_write.push({name: tp_format_datetime(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.disk.w]});
$app.bar_disk_write.push({name: tp_format_datetime_ms(t.data.t, 'HH:mm:ss'), value: [t.data.t, t.data.disk.w]});
$app.bar_disk.setOption(
{series: [{data: $app.bar_disk_read}, {data: $app.bar_disk_write}]}
);

5
server/www/teleport/webroot/app/controller/system.py
View File

@ -23,12 +23,13 @@ from app.model import user
from app.base.core_server import core_service_async_post_http
from app.base.session import tp_session
from app.logic.auth.ldap import Ldap
from app.base.utils import tp_timestamp_sec
class DoGetTimeHandler(TPBaseJsonHandler):
def post(self):
time_now = int(datetime.datetime.utcnow().timestamp())
self.write_json(TPE_OK, data=time_now)
# time_now = int(datetime.datetime.timestamp())
self.write_json(TPE_OK, data=tp_timestamp_sec())
class ConfigHandler(TPBaseHandler):

2
server/www/teleport/webroot/app/logic/auth/oath.py
View File

@ -53,7 +53,7 @@ def _get_totp_token(secret, factor=None):
# 需要对padding符进行处理
_len = len(secret)
_pad = 8 - (_len % 8)
if _pad > 0:
if 0 < _pad < 8:
secret += '=' * _pad
key = base64.b32decode(secret)