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

Merge pull request #205 from horizonlin/feature/mstsc 

处理重置过期密码页面无法正确获取带特殊字符的用户名
pull/236/head
Apex Liu 2020-05-19 09:57:47 +08:00 committed by GitHub
parent 35fd509c75 edd6c1ecdf
commit ddd01abeb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/www/teleport/static/js/auth/login.js
View File

@ -242,7 +242,7 @@ $app.do_account_login = function (username, password, captcha, oath, is_remember
if (ret.code === TPE_EXPIRED) { if (ret.code === TPE_EXPIRED) {
// must change password before login. // 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)); $app.show_op_box('error', '登录失败：' + tp_error_msg(ret.code, ret.message));

3
server/www/teleport/webroot/app/controller/user.py
View File

@ -4,6 +4,7 @@ import csv
import json import json
import os import os
import time import time
import urllib
import tornado.gen import tornado.gen
from app.base import mail from app.base import mail
@ -116,7 +117,7 @@ class ResetPasswordHandler(TPBaseHandler):
class ChangeExpiredPasswordHandler(TPBaseHandler): class ChangeExpiredPasswordHandler(TPBaseHandler):
def get(self): def get(self):
_username = self.get_argument('username', None) _username = urllib.unquote(self.get_argument('username', None))
if _username is None: if _username is None:
return self.redirect('/') return self.redirect('/')