From 9770920100b3e2d014672f8a460de69bb1de6424 Mon Sep 17 00:00:00 2001 From: horizonlin Date: Wed, 22 Apr 2020 08:53:27 +0800 Subject: [PATCH 1/3] Update login.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理重置过期密码时用户名有特殊字符情况下无法正确获取用户名的情况 --- server/www/teleport/static/js/auth/login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/www/teleport/static/js/auth/login.js b/server/www/teleport/static/js/auth/login.js index 79eb638..bc4f9fc 100644 --- a/server/www/teleport/static/js/auth/login.js +++ b/server/www/teleport/static/js/auth/login.js @@ -242,7 +242,7 @@ $app.do_account_login = function (username, password, captcha, oath, is_remember if (ret.code === TPE_EXPIRED) { // must change password before login. - window.location.href = '/user/change-expired-password?username=' + username; + window.location.href = '/user/change-expired-password?username=' + encodeURIComponent(username); } $app.show_op_box('error', '登录失败：' + tp_error_msg(ret.code, ret.message)); From 6b12da5eb85cb01cb217da27849be1331b46bff9 Mon Sep 17 00:00:00 2001 From: horizonlin Date: Wed, 22 Apr 2020 09:02:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E5=AF=86=E7=A0=81=E9=A1=B5=E9=9D=A2=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=8E=B7=E5=8F=96=E5=B8=A6=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=AD=97=E7=AC=A6=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/www/teleport/webroot/app/controller/user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/www/teleport/webroot/app/controller/user.py b/server/www/teleport/webroot/app/controller/user.py index 5965293..ba49f1b 100755 --- a/server/www/teleport/webroot/app/controller/user.py +++ b/server/www/teleport/webroot/app/controller/user.py @@ -4,6 +4,7 @@ import csv import json import os import time +from urllib import parse import tornado.gen from app.base import mail @@ -116,7 +117,7 @@ class ResetPasswordHandler(TPBaseHandler): class ChangeExpiredPasswordHandler(TPBaseHandler): def get(self): - _username = self.get_argument('username', None) + _username = parse.unquote(self.get_argument('username', None)) if _username is None: return self.redirect('/') From edd6c1ecdfd24ebbc92dd3993f1831b703d8c4d9 Mon Sep 17 00:00:00 2001 From: horizonlin Date: Wed, 22 Apr 2020 11:17:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E5=B8=A6=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=9C=9F=E5=AF=86=E7=A0=81=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/www/teleport/webroot/app/controller/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/www/teleport/webroot/app/controller/user.py b/server/www/teleport/webroot/app/controller/user.py index ba49f1b..262ed22 100755 --- a/server/www/teleport/webroot/app/controller/user.py +++ b/server/www/teleport/webroot/app/controller/user.py @@ -4,7 +4,7 @@ import csv import json import os import time -from urllib import parse +import urllib import tornado.gen from app.base import mail @@ -117,7 +117,7 @@ class ResetPasswordHandler(TPBaseHandler): class ChangeExpiredPasswordHandler(TPBaseHandler): def get(self): - _username = parse.unquote(self.get_argument('username', None)) + _username = urllib.unquote(self.get_argument('username', None)) if _username is None: return self.redirect('/')