test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复登陆信息加密问题

This commit is contained in:
shiziyuan9527 2021-03-18 17:04:13 +08:00
parent 613555101e
commit ecc33663ec
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/controller/request/LoginRequest.java
View File

@ -20,7 +20,7 @@ public class LoginRequest {
try { try {
RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class); RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
return RsaUtil.privateDecrypt(username, rsaKey.getPrivateKey()); return RsaUtil.privateDecrypt(username, rsaKey.getPrivateKey());
} catch (NoSuchAlgorithmException e) { } catch (Exception e) {
return username; return username;
} }
} }
@ -29,7 +29,7 @@ public class LoginRequest {
try { try {
RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class); RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class);
return RsaUtil.privateDecrypt(password, rsaKey.getPrivateKey()); return RsaUtil.privateDecrypt(password, rsaKey.getPrivateKey());
} catch (NoSuchAlgorithmException e) { } catch (Exception e) {
return password; return password;
} }
} }

10
backend/src/main/java/io/metersphere/ldap/controller/LdapController.java
View File

@ -4,9 +4,6 @@ import io.metersphere.base.domain.User;
import io.metersphere.commons.constants.ParamConstants; import io.metersphere.commons.constants.ParamConstants;
import io.metersphere.commons.constants.UserSource; import io.metersphere.commons.constants.UserSource;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.RsaKey;
import io.metersphere.commons.utils.RsaUtil;
import io.metersphere.controller.ResultHolder; import io.metersphere.controller.ResultHolder;
import io.metersphere.controller.request.LoginRequest; import io.metersphere.controller.request.LoginRequest;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
@ -17,9 +14,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.core.DirContextOperations;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.security.NoSuchAlgorithmException;
@RestController @RestController
@RequestMapping("/ldap") @RequestMapping("/ldap")
@ -33,7 +28,7 @@ public class LdapController {
private SystemParameterService systemParameterService; private SystemParameterService systemParameterService;
@PostMapping(value = "/signin") @PostMapping(value = "/signin")
public ResultHolder login(@RequestBody LoginRequest request) throws NoSuchAlgorithmException { public ResultHolder login(@RequestBody LoginRequest request) {
String isOpen = systemParameterService.getValue(ParamConstants.LDAP.OPEN.getValue()); String isOpen = systemParameterService.getValue(ParamConstants.LDAP.OPEN.getValue());
if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) { if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) {
@ -75,8 +70,7 @@ public class LdapController {
// 执行 ShiroDBRealm 中 LDAP 登录逻辑 // 执行 ShiroDBRealm 中 LDAP 登录逻辑
LoginRequest loginRequest = new LoginRequest(); LoginRequest loginRequest = new LoginRequest();
RsaKey rsaKey = CommonBeanFactory.getBean(RsaKey.class); loginRequest.setUsername(userId);
loginRequest.setUsername(RsaUtil.publicEncrypt(userId,rsaKey.getPublicKey()));
return userService.login(loginRequest); return userService.login(loginRequest);
} }