bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

用户登录问题修改

This commit is contained in:
jiang 2024-11-11 16:19:39 +08:00
parent 2635e025ca
commit 061e62431e
1 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java
View File

@ -281,48 +281,65 @@ public class PasswordValidatorService {
}
public void ipFilter(SysUser user){
List<Map<String,Object>> cacheList = redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST);
// 获取黑名单列表
List<Map<String, Object>> cacheList = redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST);
// 获取客户端的 IP 地址
String ip = IpUtils.getIpAddr();
for (Map<String,Object> map : cacheList) {
String ipAddress = map.containsKey("ipAddress") ? map.get("ipAddress").toString() : null;
String ipRangeEnd = map.containsKey("ipRangeEnd") ?map.get("ipRangeEnd").toString(): null;
String ipRangeStart = map.containsKey("ipRangeStart")?map.get("ipRangeStart").toString():null;
String accessStartTime =map.containsKey("accessStartTime")? map.get("accessStartTime").toString():null;
String accessEndTime = map.containsKey("accessEndTime")?map.get("accessEndTime").toString():null;
if (ObjectUtils.isEmpty(ipAddress)){
if (isIpInRange(ip, ipRangeStart, ipRangeEnd)){
if (ObjectUtils.isNotEmpty(accessStartTime)){
// 遍历黑名单
for (Map<String, Object> map : cacheList) {
String ipAddress = (String) map.getOrDefault("ipAddress", null);
String ipRangeEnd = (String) map.getOrDefault("ipRangeEnd", null);
String ipRangeStart = (String) map.getOrDefault("ipRangeStart", null);
String accessStartTime = (String) map.getOrDefault("accessStartTime", null);
String accessEndTime = (String) map.getOrDefault("accessEndTime", null);
// 如果 ipAddress 为空，检查是否在 ip 范围内
if (ObjectUtils.isEmpty(ipAddress)) {
if (isIpInRange(ip, ipRangeStart, ipRangeEnd)) {
handleAccessTimeCheck(accessStartTime, accessEndTime);
}
} else if (ipAddress.equals(ip)) {
handleAccessTimeCheck(accessStartTime, accessEndTime);
}
}
}
/**
* 检查当前时间是否在有效的访问时间范围内
* @param accessStartTime 访问开始时间
* @param accessEndTime 访问结束时间
*/
private void handleAccessTimeCheck(String accessStartTime, String accessEndTime) {
if (ObjectUtils.isNotEmpty(accessStartTime)) {
boolean currentTimeInRange = isCurrentTimeInRange(accessStartTime, accessEndTime);
if (!currentTimeInRange){
// 异常处理
}else {
//正常处理
if (!currentTimeInRange) {
handleException(); // 异常处理
} else {
handleNormalProcess(); // 正常处理
}
} else {
handleNormalProcess(); // 正常处理
}
}else {
//正常处理
}
}
}else {
if (ipAddress.equals(ip)){
if (ObjectUtils.isNotEmpty(accessStartTime)){
boolean currentTimeInRange = isCurrentTimeInRange(accessStartTime, accessEndTime);
if (!currentTimeInRange){
// 异常处理
}else {
//正常处理
}
}else {
//正常处理
}
}
}
}
//异常处理
/**
* 处理异常情况
*/
private void handleException() {
// 异常处理的具体逻辑
System.out.println("IP access is outside the allowed time range or other error occurred.");
}
/**
* 处理正常情况
*/
private void handleNormalProcess() {
// 正常处理的具体逻辑
System.out.println("IP access is within the allowed time range.");
}
/**
* 检查给定的IP地址是否在指定的网段区间内