From 796b44ea813a1133beae4f3a67f1c0263510c0c7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 17 十一月 2024 09:45:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/moon/server/service/sys/ProxyService.java | 76 ++++++++++----------------------------
1 files changed, 20 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/moon/server/service/sys/ProxyService.java b/src/main/java/com/moon/server/service/sys/ProxyService.java
index 029c420..8fa7c8e 100644
--- a/src/main/java/com/moon/server/service/sys/ProxyService.java
+++ b/src/main/java/com/moon/server/service/sys/ProxyService.java
@@ -4,6 +4,7 @@
import com.moon.server.entity.all.*;
import com.moon.server.entity.sys.ResEntity;
import com.moon.server.entity.sys.ResLogEntity;
+import com.moon.server.entity.sys.TokenEntity;
import com.moon.server.entity.sys.UserEntity;
import com.moon.server.helper.AsyncHelper;
import com.moon.server.helper.HttpHelper;
@@ -22,12 +23,8 @@
import java.util.TimerTask;
import java.util.concurrent.TimeUnit;
-/**
- * 浠ｇ悊鏈嶅姟绫�
- * @author WWW
- * @date 2023-07-11
- */
@Service
+@SuppressWarnings("ALL")
public class ProxyService {
@Resource
RedisService redisService;
@@ -43,18 +40,14 @@
public static final String ILLEGAL_RESOURCE = JSON.toJSONString(new ResponseMsg<String>(HttpStatus.UNAUTHORIZED, "娌℃湁璧勬簮璁块棶鏉冮檺"));
- /**
- * URL浠ｇ悊
- */
public void proxyUrl(String token, int resId, boolean isRest, HttpServletRequest req, HttpServletResponse res) throws Exception {
- // 3.鑾峰彇鐢ㄦ埛
UserEntity ue = getUser(req, res, token);
if (null == ue) {
return;
}
- // 9.鑾峰彇璧勬簮瀹炰綋锛宻tatus锛�0-绂佺敤锛�1-鍚敤鍘熷鍦板潃锛�2-鍚敤浠ｇ悊鍦板潃
+
ResEntity entity = getResEntity(ue, resId);
- if (null == entity || StaticData.I2 != entity.getStatus() || StringHelper.isNull(entity.getProxy()) || StringHelper.isNull(entity.getUrl())) {
+ if (null == entity || StaticData.I1 > entity.getStatus() || StringHelper.isNull(entity.getProxy()) || StringHelper.isNull(entity.getUrl())) {
WebHelper.writeStr2Page(res, ILLEGAL_RESOURCE);
return;
}
@@ -65,9 +58,6 @@
forward(req, res, entity, url);
}
- /**
- * 鑾峰彇鐢ㄦ埛
- */
private UserEntity getUser(HttpServletRequest req, HttpServletResponse res, String token) {
String key = RedisCacheKey.permsProxy(token);
Object obj = redisService.get(key);
@@ -89,30 +79,22 @@
return ue;
}
- /**
- * 妫�鏌�
- */
private boolean check(HttpServletRequest req, HttpServletResponse res, UserEntity ue, String token) {
- // 4.鑾峰彇IP
String ip = WebHelper.getIpAddress(req);
if (StringHelper.isEmpty(ip)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.IP_NULL);
}
- // 5.妫�鏌ラ粦鍚嶅崟
if (!checkBlackList(ip, req)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.BLACK_LIST);
}
- // 6.admin璺宠繃鏉冮檺妫�娴�
if (StaticData.ADMIN.equals(ue.getUid())) {
return true;
}
- // 7.妫�鏌ョ櫧鍚嶅崟鍜孖P涓�鑷存��
if (!checkWhiteList(ip, req)) {
- if (!ip.equals(sysService.tokenService.getEntityByToken(token).getIp())) {
+ if (!checkIpSource(ip, token)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.ILLEGAL_TOKEN);
}
}
- // 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
if (sysService.tokenService.isUidDisable(ue)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.USER_LOCK);
}
@@ -120,9 +102,6 @@
return true;
}
- /**
- * 妫�鏌ラ粦鍚嶅崟
- */
private boolean checkBlackList(String ip, HttpServletRequest request) {
List<String> blackList = sysService.blacklistService.selectIpList(1);
if (blackList == null || blackList.isEmpty()) {
@@ -132,9 +111,6 @@
return !blackList.contains(ip);
}
- /**
- * 妫�鏌ョ櫧鍚嶅崟
- */
private boolean checkWhiteList(String ip, HttpServletRequest request) {
List<String> whiteList = sysService.blacklistService.selectIpList(2);
if (whiteList == null || whiteList.isEmpty()) {
@@ -144,9 +120,12 @@
return whiteList.contains(ip);
}
- /**
- * 妫�鏌ヨ祫婧愭潈闄�
- */
+ private boolean checkIpSource(String ip, String token) {
+ TokenEntity te = sysService.tokenService.getEntityByToken(token);
+
+ return StaticData.I1 == te.getType() || te.getIp().equals(ip);
+ }
+
private ResEntity getResEntity(UserEntity ue, int resId) {
List<ResEntity> rs = StaticData.ADMIN.equals(ue.getUid()) ? permsService.selectAllRes() : permsService.selectRes(ue.getUid());
if (null == rs || rs.isEmpty()) {
@@ -162,9 +141,6 @@
return null;
}
- /**
- * 鎻掑叆鏃ュ織
- */
private void insertLog(HttpServletRequest req, UserEntity ue, int resId) {
String ip = WebHelper.getIpAddress(req);
@@ -184,11 +160,7 @@
});
}
- /**
- * 鑾峰彇璇锋眰绫诲埆
- */
private int getRequestType(String method) {
- // 璇锋眰绫伙細1-GET锛�2-POST锛�3-PUT锛�4-DELETE锛�5-TRACE锛�6-HEAD锛�7-OPTIONS锛�8-CONNECT';
switch (method) {
case "GET":
return 1;
@@ -211,9 +183,6 @@
}
}
- /**
- * 鑾峰彇Url
- */
private String getUrl(HttpServletRequest req, UserEntity ue, ResEntity entity, String token, boolean isRest) {
String proxyUrl = entity.getProxy().replace("{token}", token);
int end = req.getRequestURL().indexOf(proxyUrl) + proxyUrl.length();
@@ -237,21 +206,22 @@
return url;
}
- /**
- * 鑾峰彇GeoServer鍦板潃
- */
private String getGeoServerUrl(HttpServletRequest req, UserEntity ue, ResEntity entity, String url) {
if (null == req.getQueryString()) {
return url;
}
- String str = req.getQueryString(), layers = req.getParameter("layers");
- if (!StaticData.GET_CAPABILITIES.equals(req.getParameter(StaticData.REQUEST)) && null != layers) {
- int start = str.indexOf("layers");
+ String str = req.getQueryString();
+ boolean isLower = str.contains(StaticData.SERVICE);
+ String layersKey = isLower ? StaticData.LAYERS : StaticData.LAYERS.toUpperCase();
+ String layers = req.getParameter(layersKey);
+ String request = req.getParameter(isLower ? StaticData.REQUEST : StaticData.REQUEST.toUpperCase());
+ if (!StaticData.GET_CAPABILITIES.equals(request)) {
+ int start = str.indexOf(layersKey);
int end = str.indexOf("&", start);
layers = filterGeoLayers(ue, layers);
- str = str.replace(str.substring(start, end > -1 ? end : str.length()), "layers=" + layers);
+ str = str.replace(str.substring(start, end > -1 ? end : str.length()), layersKey + "=" + layers);
} else {
List<String> tabs = StaticData.ADMIN.equals(ue.getUid()) ? permsService.selectAllTabs() : permsService.selectTabs(ue.getUid());
entity.setTab(null == tabs ? "" : StringHelper.join(tabs, ","));
@@ -261,12 +231,9 @@
return url + (url.contains("?") ? "&" : "?") + str;
}
- /**
- * 杩囨护GeoServer鍥惧眰
- */
private String filterGeoLayers(UserEntity ue, String layers) {
List<String> tabs = StaticData.ADMIN.equals(ue.getUid()) ? permsService.selectAllTabs() : permsService.selectTabs(ue.getUid());
- if (null == tabs || tabs.isEmpty()) {
+ if (null == tabs || tabs.isEmpty() || StringHelper.isEmpty(layers)) {
return "";
}
@@ -282,9 +249,6 @@
return sb.toString();
}
- /**
- * 杞彂璇锋眰
- */
private void forward(HttpServletRequest request, HttpServletResponse response, ResEntity entity, String url) throws Exception {
HttpHelper httpHelper = new HttpHelper();
httpHelper.service(request, response, entity, url);
--
Gitblit v1.9.3