mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2026-11-18 16:50:30 +00:00
fix(security): 登录防护加固,防止用户枚举、无限次猜密码和爆破短信验证码
- 登录(/sys/login、/sys/mLogin):用户不存在与密码错误统一提示"用户名或密码错误",不存在的用户也计入失败次数;密码正确后才提示冻结/注销 - 登录前查部门接口 /sys/loginGetUserDeparts(匿名可调):账号、手机两个分支增加失败计数与锁定(与登录接口共用,连错6次锁10分钟),密码错误时作废图形验证码;APP 端(无图形验证码)保留免验证码,手机分支兼容 captcha 参数名 - 失败计数逻辑移到 SysUserServiceImpl,供登录接口与查部门接口共用 - dev 及各数据库配置默认开启登录验证码(enableLoginCaptcha: true) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
1ccce9d6aa
commit
bdcae72c38
@ -102,23 +102,22 @@ public class LoginController {
|
||||
return result;
|
||||
}
|
||||
|
||||
// step.3 校验用户是否存在且有效
|
||||
//update-begin---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】先校验密码再校验用户状态,用户不存在与密码错误统一提示并计入失败次数,防止用户枚举-----------
|
||||
// step.3 校验用户名或密码是否正确
|
||||
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SysUser::getUsername,username);
|
||||
SysUser sysUser = sysUserService.getOne(queryWrapper);
|
||||
if (!sysUserService.verifyLoginPassword(sysUser, username, password)) {
|
||||
result.error500("用户名或密码错误");
|
||||
return result;
|
||||
}
|
||||
|
||||
// step.4 校验用户是否有效
|
||||
result = sysUserService.checkUserIsEffective(sysUser);
|
||||
if(!result.isSuccess()) {
|
||||
return result;
|
||||
}
|
||||
|
||||
// step.4 校验用户名或密码是否正确
|
||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||
String syspassword = sysUser.getPassword();
|
||||
if (!syspassword.equals(userpassword)) {
|
||||
addLoginFailOvertimes(username);
|
||||
result.error500("用户名或密码错误");
|
||||
return result;
|
||||
}
|
||||
//update-end---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】先校验密码再校验用户状态,用户不存在与密码错误统一提示并计入失败次数,防止用户枚举-----------
|
||||
|
||||
// step.5 登录成功获取用户信息
|
||||
String loginOrgCode = sysLoginModel.getLoginOrgCode();
|
||||
@ -705,21 +704,21 @@ public class LoginController {
|
||||
if(isLoginFailOvertimes(username)){
|
||||
return result.error500("该用户登录失败次数过多,请于10分钟后再次登录!");
|
||||
}
|
||||
// 2.校验用户是否有效
|
||||
//update-begin---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】先校验密码再校验用户状态,用户不存在与密码错误统一提示并计入失败次数,防止用户枚举-----------
|
||||
// 2.校验用户名或密码是否正确
|
||||
SysUser sysUser = sysUserService.getUserByName(username);
|
||||
if (!sysUserService.verifyLoginPassword(sysUser, username, password)) {
|
||||
result.error500("用户名或密码错误");
|
||||
return result;
|
||||
}
|
||||
String syspassword = sysUser.getPassword();
|
||||
|
||||
// 3.校验用户是否有效
|
||||
result = sysUserService.checkUserIsEffective(sysUser);
|
||||
if(!result.isSuccess()) {
|
||||
return result;
|
||||
}
|
||||
|
||||
// 3.校验用户名或密码是否正确
|
||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||
String syspassword = sysUser.getPassword();
|
||||
if (!syspassword.equals(userpassword)) {
|
||||
addLoginFailOvertimes(username);
|
||||
result.error500("用户名或密码错误");
|
||||
return result;
|
||||
}
|
||||
//update-end---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】先校验密码再校验用户状态,用户不存在与密码错误统一提示并计入失败次数,防止用户枚举-----------
|
||||
|
||||
//4.设置登录部门
|
||||
String orgCode = sysUser.getOrgCode();
|
||||
@ -849,16 +848,9 @@ public class LoginController {
|
||||
* @param username
|
||||
* @return
|
||||
*/
|
||||
//update-begin---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】失败计数逻辑移到service,与登录前查部门接口共用-----------
|
||||
private boolean isLoginFailOvertimes(String username){
|
||||
String key = CommonConstant.LOGIN_FAIL + username;
|
||||
Object failTime = redisUtil.get(key);
|
||||
if(failTime!=null){
|
||||
Integer val = Integer.parseInt(failTime.toString());
|
||||
if(val>5){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return sysUserService.isLoginFailOvertimes(username);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -866,15 +858,9 @@ public class LoginController {
|
||||
* @param username
|
||||
*/
|
||||
private void addLoginFailOvertimes(String username){
|
||||
String key = CommonConstant.LOGIN_FAIL + username;
|
||||
Object failTime = redisUtil.get(key);
|
||||
Integer val = 0;
|
||||
if(failTime!=null){
|
||||
val = Integer.parseInt(failTime.toString());
|
||||
}
|
||||
// 10分钟,一分钟为60s
|
||||
redisUtil.set(key, ++val, 600);
|
||||
sysUserService.addLoginFailOvertimes(username);
|
||||
}
|
||||
//update-end---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】失败计数逻辑移到service,与登录前查部门接口共用-----------
|
||||
|
||||
/**
|
||||
* 发送短信验证码接口(修改密码)
|
||||
|
||||
@ -248,6 +248,30 @@ public interface ISysUserService extends IService<SysUser> {
|
||||
*/
|
||||
Result checkUserIsEffective(SysUser sysUser);
|
||||
|
||||
//update-begin---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】登录失败计数与密码校验统一,用户不存在也计入失败次数,防止用户枚举-----------
|
||||
/**
|
||||
* 校验登录密码,用户不存在与密码错误统一视为失败并计入失败次数
|
||||
* @param sysUser 按用户名查到的用户,可为空
|
||||
* @param username 登录账号
|
||||
* @param password 明文密码
|
||||
* @return 密码正确返回true
|
||||
*/
|
||||
boolean verifyLoginPassword(SysUser sysUser, String username, String password);
|
||||
|
||||
/**
|
||||
* 登录失败次数是否超限(超限锁定10分钟)
|
||||
* @param key 用户名或手机号
|
||||
* @return
|
||||
*/
|
||||
boolean isLoginFailOvertimes(String key);
|
||||
|
||||
/**
|
||||
* 记录登录失败次数
|
||||
* @param key 用户名或手机号
|
||||
*/
|
||||
void addLoginFailOvertimes(String key);
|
||||
//update-end---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】登录失败计数与密码校验统一,用户不存在也计入失败次数,防止用户枚举-----------
|
||||
|
||||
/**
|
||||
* 查询被逻辑删除的用户
|
||||
* @return List<SysUser>
|
||||
|
||||
@ -40,7 +40,6 @@ import org.jeecg.modules.base.service.BaseCommonService;
|
||||
import org.jeecg.modules.message.handle.impl.SystemSendMsgHandle;
|
||||
import org.jeecg.modules.system.entity.*;
|
||||
import org.jeecg.modules.system.mapper.*;
|
||||
import org.jeecg.modules.system.model.SysLoginModel;
|
||||
import org.jeecg.modules.system.model.SysUserSysDepPostModel;
|
||||
import org.jeecg.modules.system.model.SysUserSysDepartModel;
|
||||
import org.jeecg.modules.system.service.*;
|
||||
@ -774,6 +773,38 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
||||
return result;
|
||||
}
|
||||
|
||||
//update-begin---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】登录失败计数与密码校验统一,用户不存在也计入失败次数,防止用户枚举-----------
|
||||
@Override
|
||||
public boolean verifyLoginPassword(SysUser sysUser, String username, String password) {
|
||||
if (sysUser == null) {
|
||||
baseCommonService.addLog("用户登录失败,用户不存在!", CommonConstant.LOG_TYPE_1, null);
|
||||
addLoginFailOvertimes(username);
|
||||
return false;
|
||||
}
|
||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||
if (!userpassword.equals(sysUser.getPassword())) {
|
||||
addLoginFailOvertimes(username);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isLoginFailOvertimes(String key) {
|
||||
Object failTime = redisUtil.get(CommonConstant.LOGIN_FAIL + key);
|
||||
return failTime != null && Integer.parseInt(failTime.toString()) > 5;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addLoginFailOvertimes(String key) {
|
||||
String redisKey = CommonConstant.LOGIN_FAIL + key;
|
||||
Object failTime = redisUtil.get(redisKey);
|
||||
int val = failTime != null ? Integer.parseInt(failTime.toString()) : 0;
|
||||
// 10分钟,一分钟为60s
|
||||
redisUtil.set(redisKey, ++val, 600);
|
||||
}
|
||||
//update-end---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】登录失败计数与密码校验统一,用户不存在也计入失败次数,防止用户枚举-----------
|
||||
|
||||
@Override
|
||||
public List<SysUser> queryLogicDeleted() {
|
||||
// 代码逻辑说明: 回收站查询未离职的------------
|
||||
@ -3055,70 +3086,83 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
||||
String loginType = jsonObject.getString("loginType");
|
||||
String username = jsonObject.getString("username");
|
||||
String source = oConvertUtils.getString(jsonObject.getString("source"),"PC");
|
||||
//update-begin---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】登录前查部门接口可匿名调用:增加失败计数与锁定,用户不存在与密码/验证码错误统一提示,防止无限次猜密码和爆破短信验证码;APP端(无图形验证码)保留跳过验证码,手机分支兼容captcha参数名-----------
|
||||
// 手机号登录校验
|
||||
if("phone".equalsIgnoreCase(loginType)){
|
||||
String phone = jsonObject.getString("mobile");
|
||||
//1.校验用户有效性
|
||||
if (oConvertUtils.isEmpty(phone)) {
|
||||
return Result.error("手机验证码错误");
|
||||
}
|
||||
if (isLoginFailOvertimes(phone)) {
|
||||
return Result.error("该用户登录失败次数过多,请于10分钟后再次登录!");
|
||||
}
|
||||
//1.校验验证码(APP端短信验证码参数名为captcha)
|
||||
SysUser sysUser = baseMapper.getUserByPhone(phone);
|
||||
String smscode = oConvertUtils.getString(jsonObject.getString("smscode"), jsonObject.getString("captcha"));
|
||||
Object code = redisUtil.get(CommonConstant.PHONE_REDIS_KEY_PRE + phone);
|
||||
if (sysUser == null || oConvertUtils.isEmpty(smscode) || !smscode.equals(code)) {
|
||||
addLoginFailOvertimes(phone);
|
||||
return Result.error("手机验证码错误");
|
||||
}
|
||||
//2.校验用户有效性
|
||||
result = this.checkUserIsEffective(sysUser);
|
||||
if(!result.isSuccess()) {
|
||||
return result;
|
||||
}
|
||||
//2.校验验证码
|
||||
String smscode = jsonObject.getString("smscode");
|
||||
String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone;
|
||||
Object code = redisUtil.get(redisKey);
|
||||
if (!smscode.equals(code)) {
|
||||
return Result.error("手机验证码错误");
|
||||
}
|
||||
//3.当前登录账号
|
||||
username = sysUser.getUsername();
|
||||
String orgCode = sysUser.getOrgCode();
|
||||
obj.put("currentOrgCode", orgCode);
|
||||
}else{
|
||||
if (oConvertUtils.isEmpty(username)) {
|
||||
return Result.error("用户名或密码错误");
|
||||
}
|
||||
if (isLoginFailOvertimes(username)) {
|
||||
return Result.error("该用户登录失败次数过多,请于10分钟后再次登录!");
|
||||
}
|
||||
String password = AesEncryptUtil.resolvePassword(jsonObject.getString("password"));
|
||||
log.debug("登录密码,原始密码:{},解密密码:{}" , jsonObject.getString("password"), password);
|
||||
// 手机端没有验证码,不做校验
|
||||
String realKey = null;
|
||||
// 手机端没有验证码,不做校验(靠失败计数与锁定防暴力破解,与/sys/mLogin一致)
|
||||
if(!"APP".equalsIgnoreCase(source)){
|
||||
// step.1 验证码check
|
||||
SysLoginModel sysLoginModel = new SysLoginModel();
|
||||
String inputCode = jsonObject.getString("inputCode");
|
||||
String checkKey = jsonObject.getString("checkKey");
|
||||
sysLoginModel.setCaptcha(inputCode);
|
||||
sysLoginModel.setCheckKey(checkKey);
|
||||
if (inputCode == null) {
|
||||
result.error500("验证码无效");
|
||||
return result;
|
||||
}
|
||||
String lowerCaseCaptcha = inputCode.toLowerCase();
|
||||
String keyPrefix = Md5Util.md5Encode(sysLoginModel.getCheckKey() + jeecgBaseConfig.getSignatureSecret(), "utf-8");
|
||||
String realKey = keyPrefix + lowerCaseCaptcha;
|
||||
String keyPrefix = Md5Util.md5Encode(checkKey + jeecgBaseConfig.getSignatureSecret(), "utf-8");
|
||||
realKey = keyPrefix + lowerCaseCaptcha;
|
||||
Object checkCode = redisUtil.get(realKey);
|
||||
if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
|
||||
log.warn("验证码错误,key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
|
||||
log.warn("验证码错误,key= {} , Ui checkCode= {}, Redis checkCode = {}", checkKey, lowerCaseCaptcha, checkCode);
|
||||
result.error500("验证码错误");
|
||||
result.setCode(HttpStatus.PRECONDITION_FAILED.value());
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
// step.2 校验用户是否存在且有效
|
||||
// step.2 校验用户名或密码是否正确(密码错误时作废验证码;密码正确时保留,随后的登录接口还要用)
|
||||
SysUser sysUser = baseMapper.getUserByName(username);
|
||||
result = this.checkUserIsEffective(sysUser);
|
||||
if(!result.isSuccess()) {
|
||||
if (!verifyLoginPassword(sysUser, username, password)) {
|
||||
if (realKey != null) {
|
||||
redisUtil.del(realKey);
|
||||
}
|
||||
result.error500("用户名或密码错误");
|
||||
return result;
|
||||
}
|
||||
|
||||
// step.3 校验用户名或密码是否正确
|
||||
String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
|
||||
String syspassword = sysUser.getPassword();
|
||||
if (!syspassword.equals(userpassword)) {
|
||||
result.error500("用户名或密码错误");
|
||||
// step.3 校验用户是否有效
|
||||
result = this.checkUserIsEffective(sysUser);
|
||||
if(!result.isSuccess()) {
|
||||
return result;
|
||||
}
|
||||
String orgCode = sysUser.getOrgCode();
|
||||
obj.put("currentOrgCode", orgCode);
|
||||
}
|
||||
//update-end---author:scott ---date:20261014 for:【安全 GHSA-6mmg-j26w-hxfx】登录前查部门接口可匿名调用:增加失败计数与锁定,用户不存在与密码/验证码错误统一提示,防止无限次猜密码和爆破短信验证码;APP端(无图形验证码)保留跳过验证码,手机分支兼容captcha参数名-----------
|
||||
// step.4 获取用户部门信息,仅限部门
|
||||
List<SysDepart> departList = sysDepartMapper.queryDeptByUserAndCategory(username,DepartCategoryEnum.DEPART_CATEGORY_DEPART.getValue());
|
||||
if (CollectionUtil.isNotEmpty(departList)) {
|
||||
|
||||
@ -271,7 +271,7 @@ jeecg:
|
||||
# 是否允许同一账号多地同时登录 (为 true 时允许一起登录, 为 false 时新登录挤掉旧登录)
|
||||
is-concurrent: true
|
||||
# 登录是否启用验证码
|
||||
enableLoginCaptcha: false
|
||||
enableLoginCaptcha: true
|
||||
# 是否开启三级等保强密码校验(true 开启强密码模式,false 使用简单密码规则)
|
||||
enableStrongPwd: false
|
||||
# 签名密钥串(前后端要一致,正式发布请自行修改)
|
||||
|
||||
@ -240,7 +240,7 @@ jeecg:
|
||||
# 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
|
||||
lowCodeMode: dev
|
||||
# 登录是否启用验证码
|
||||
enableLoginCaptcha: false
|
||||
enableLoginCaptcha: true
|
||||
# 是否开启三级等保强密码校验(true 开启强密码模式,false 使用简单密码规则)
|
||||
enableStrongPwd: false
|
||||
# 签名密钥串(前后端要一致,正式发布请自行修改)
|
||||
|
||||
@ -260,7 +260,7 @@ jeecg:
|
||||
# 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
|
||||
lowCodeMode: dev
|
||||
# 登录是否启用验证码
|
||||
enableLoginCaptcha: false
|
||||
enableLoginCaptcha: true
|
||||
# 是否开启三级等保强密码校验(true 开启强密码模式,false 使用简单密码规则)
|
||||
enableStrongPwd: false
|
||||
# 签名密钥串(前后端要一致,正式发布请自行修改)
|
||||
|
||||
@ -254,7 +254,7 @@ jeecg:
|
||||
# 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
|
||||
lowCodeMode: dev
|
||||
# 登录是否启用验证码
|
||||
enableLoginCaptcha: false
|
||||
enableLoginCaptcha: true
|
||||
# 是否开启三级等保强密码校验(true 开启强密码模式,false 使用简单密码规则)
|
||||
enableStrongPwd: false
|
||||
# 签名密钥串(前后端要一致,正式发布请自行修改)
|
||||
|
||||
@ -267,7 +267,7 @@ jeecg:
|
||||
# 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
|
||||
lowCodeMode: dev
|
||||
# 登录是否启用验证码
|
||||
enableLoginCaptcha: false
|
||||
enableLoginCaptcha: true
|
||||
# 是否开启三级等保强密码校验(true 开启强密码模式,false 使用简单密码规则)
|
||||
enableStrongPwd: false
|
||||
# 签名密钥串(前后端要一致,正式发布请自行修改)
|
||||
|
||||
@ -249,7 +249,7 @@ jeecg:
|
||||
# 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
|
||||
lowCodeMode: dev
|
||||
# 登录是否启用验证码
|
||||
enableLoginCaptcha: false
|
||||
enableLoginCaptcha: true
|
||||
# 是否开启三级等保强密码校验(true 开启强密码模式,false 使用简单密码规则)
|
||||
enableStrongPwd: false
|
||||
# 签名密钥串(前后端要一致,正式发布请自行修改)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user