From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/interceptor/AuthInterceptor.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index 2b49a65..9dd6838 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -2,11 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.lf.server.entity.all.*;
+import com.lf.server.entity.sys.TokenEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.all.SysService;
-import com.lf.server.service.sys.TokenService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.annotation.Configuration;
@@ -23,7 +23,7 @@
*/
@Configuration
public class AuthInterceptor implements HandlerInterceptor {
- private SysService sysService;
+ private final SysService sysService;
private static final Log log = LogFactory.getLog(AuthInterceptor.class);
@@ -34,6 +34,12 @@
private static final String USER_LOCK = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.USER_LOCK_ERROR, "鐢ㄦ埛ID宸茬鐢�"));
private static final String NO_AUTH = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.NO_AUTH_ERROR, "鏃犳潈闄愯闂�"));
+
+ private static final String IP_NULL = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.UNAUTHORIZED, "IP鍦板潃涓虹┖"));
+
+ private static final String BLACK_LIST = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.UNAUTHORIZED, "璇P鍏ラ粦鍚嶅崟"));
+
+ private static final String ILLEGAL_TOKEN = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.UNAUTHORIZED, "浠ょ墝鏉ユ簮闈炴硶"));
public AuthInterceptor(SysService sysService) {
this.sysService = sysService;
@@ -46,32 +52,55 @@
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
// noinspection AlibabaRemoveCommentedCode
try {
- // 闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
+ // 1.闈炴柟娉� 鎴� 鏃犻渶鎺堟潈锛屾棤闇�鎷︽埅
if (!(handler instanceof HandlerMethod) || noNeedAuth(request)) {
return true;
}
+ // 2.鑾峰彇浠ょ墝
String token = WebHelper.getToken(request);
if (StringHelper.isNull(token)) {
- return WebHelper.write2Page(response, NO_TOKEN);
+ return WebHelper.writeStr2Page(response, NO_TOKEN);
}
- //String ip = WebHelper.getIpAddress(request);
- //List<String> blackList=
-
- UserEntity ue = sysService.tokenService.getCurrentUser(request);
+ // 3.鑾峰彇鐢ㄦ埛浠ょ墝
+ UserEntity ue = sysService.tokenService.getUserByToken(token);
if (ue == null) {
- return WebHelper.write2Page(response, NO_LOGIN);
+ return WebHelper.writeStr2Page(response, NO_LOGIN);
}
+ // 4.鑾峰彇IP
+ String ip = WebHelper.getIpAddress(request);
+ if (StringHelper.isEmpty(ip)) {
+ return WebHelper.writeStr2Page(response, IP_NULL);
+ }
+
+ // 5.妫�鏌ラ粦鍚嶅崟
+ if (!checkBlackList(ip, request)) {
+ return WebHelper.writeStr2Page(response, BLACK_LIST);
+ }
+
+ // 6.admin璺宠繃鏉冮檺妫�娴�
+ if (StaticData.ADMIN.equals(ue.getUid())) {
+ return true;
+ }
+
+ // 7.妫�鏌ョ櫧鍚嶅崟鍜孖P涓�鑷存��
+ if (!checkWhiteList(ip, request)) {
+ if (!checkIpSource(ip, token)) {
+ return WebHelper.writeStr2Page(response, ILLEGAL_TOKEN);
+ }
+ }
+
+ // 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
if (sysService.tokenService.isUidDisable(ue)) {
- return WebHelper.write2Page(response, USER_LOCK);
+ return WebHelper.writeStr2Page(response, USER_LOCK);
}
- // 鏉冮檺鏍￠獙
+ // 9.鏉冮檺鏍￠獙
if (!checkPerms(ue, request)) {
System.out.println("鏃犳潈闄愯闂細" + request.getRequestURI().toLowerCase());
- return WebHelper.write2Page(response, NO_AUTH);
+ return WebHelper.writeStr2Page(response, NO_AUTH);
}
return true;
@@ -106,11 +135,47 @@
String url = request.getRequestURI();
for (String perm : list) {
- if (url.startsWith(perm)) {
+ if (url.contains(perm)) {
return true;
}
}
return false;
}
+
+ /**
+ * 妫�鏌ラ粦鍚嶅崟
+ */
+ private boolean checkBlackList(String ip, HttpServletRequest request) {
+ List<String> blackList = sysService.blacklistService.selectIpList(1);
+ if (blackList == null || blackList.isEmpty()) {
+ return true;
+ }
+ if (blackList.contains(ip)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * 妫�鏌ョ櫧鍚嶅崟
+ */
+ private boolean checkWhiteList(String ip, HttpServletRequest request) {
+ List<String> whiteList = sysService.blacklistService.selectIpList(2);
+ if (whiteList == null || whiteList.isEmpty()) {
+ return false;
+ }
+
+ return whiteList.contains(ip);
+ }
+
+ /**
+ * 妫�鏌P涓�鑷存�э細鍥哄畾浠ょ墝涓嶆鏌�
+ */
+ private boolean checkIpSource(String ip, String token) {
+ TokenEntity te = sysService.tokenService.getEntityByToken(token);
+
+ return StaticData.I1 == te.getType() || te.getIp().equals(ip);
+ }
}
--
Gitblit v1.9.3