admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-08 09:58:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

password fix

Browse Source
This commit is contained in:
shimingxy 2019-12-08 19:39:29 +08:00
parent f01a82c13d
commit 5bb59b7a99
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java
View File

@ -3,6 +3,7 @@ package org.maxkey.dao.service;
import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.apache.mybatis.jpa.persistence.JpaBaseService;
import org.maxkey.constants.STATUS; import org.maxkey.constants.STATUS;
import org.maxkey.crypto.ReciprocalUtils;
import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.crypto.password.PasswordReciprocal;
import org.maxkey.dao.persistence.UserInfoMapper; import org.maxkey.dao.persistence.UserInfoMapper;
import org.maxkey.domain.ChangePassword; import org.maxkey.domain.ChangePassword;
@ -109,7 +110,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
} }
String password = passwordEncoder.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())); String password = passwordEncoder.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword()));
userInfo.setDecipherable(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())); userInfo.setDecipherable(ReciprocalUtils.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())));
_logger.debug("decipherable : "+userInfo.getDecipherable()); _logger.debug("decipherable : "+userInfo.getDecipherable());
userInfo.setPassword(password); userInfo.setPassword(password);
userInfo.setPasswordLastSetTime(DateUtils.getCurrentDateTimeAsString()); userInfo.setPasswordLastSetTime(DateUtils.getCurrentDateTimeAsString());

5
maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java
View File

@ -93,7 +93,7 @@ public class SafeController {
String confirmPassword){ String confirmPassword){
UserInfo userInfo =WebContext.getUserInfo(); UserInfo userInfo =WebContext.getUserInfo();
_logger.debug("decipherable old : "+userInfo.getDecipherable()); _logger.debug("decipherable old : "+userInfo.getDecipherable());
_logger.debug("decipherable new : "+PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())); _logger.debug("decipherable new : "+ReciprocalUtils.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), newPassword)));
if(newPassword.equals(confirmPassword)){ if(newPassword.equals(confirmPassword)){
if(oldPassword==null || if(oldPassword==null ||
passwordEncoder.matches(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(),oldPassword), userInfo.getPassword())){ passwordEncoder.matches(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(),oldPassword), userInfo.getPassword())){
@ -123,7 +123,8 @@ public class SafeController {
@RequestParam("confirmPassword") String confirmPassword) { @RequestParam("confirmPassword") String confirmPassword) {
UserInfo userInfo =WebContext.getUserInfo(); UserInfo userInfo =WebContext.getUserInfo();
_logger.debug("App Login Password : "+ReciprocalUtils.decoder(userInfo.getAppLoginPassword())); _logger.debug("App Login Password : "+userInfo.getAppLoginPassword());
_logger.debug("App Login new Password : "+ReciprocalUtils.encode(newPassword));
if(newPassword.equals(confirmPassword)){ if(newPassword.equals(confirmPassword)){
if(StringUtils.isNullOrBlank(userInfo.getAppLoginPassword())||userInfo.getAppLoginPassword().equals(ReciprocalUtils.encode(oldPassword))){ if(StringUtils.isNullOrBlank(userInfo.getAppLoginPassword())||userInfo.getAppLoginPassword().equals(ReciprocalUtils.encode(oldPassword))){
userInfo.setAppLoginPassword(ReciprocalUtils.encode(newPassword)); userInfo.setAppLoginPassword(ReciprocalUtils.encode(newPassword));

3
maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl
View File

@ -14,7 +14,8 @@
<td colspan="2"><@locale code="login.totp.title" /></td> <td colspan="2"><@locale code="login.totp.title" /></td>
</tr> </tr>
<tr> <tr>
<td> <img id="captchaimg" src="<@base/>/image/${id}" /></td> <td> <img id="captchaimg" src="<@base/>/image/${id}" /><br>
支持<b>Google Authenticator等</b></td>
<td style="width:75%;"> <td style="width:75%;">
<table class="table" style="width:100%;"> <table class="table" style="width:100%;">
<tr> <tr>