From fd348a3be56e08a67d5ea9e6a25b5b4f680a145f Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Tue, 17 Dec 2024 17:29:14 +0900
Subject: [PATCH] =?UTF-8?q?IP=EC=B2=B4=ED=81=AC=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95(=EC=99=B8=EB=B6=80=ED=98=91=EB=A0=A5?=
 =?UTF-8?q?=EC=97=85=EC=B2=B4=EC=9A=A9=20IP=20=EC=B2=B4=ED=81=AC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/fims/FimsConf.java       |  1 +
 .../cokr/xit/fims/base/web/MainController.java  | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/FimsConf.java b/src/main/java/cokr/xit/fims/FimsConf.java
index 83363f37..2df20e3b 100644
--- a/src/main/java/cokr/xit/fims/FimsConf.java
+++ b/src/main/java/cokr/xit/fims/FimsConf.java
@@ -33,5 +33,6 @@ public class FimsConf extends AbstractComponent {
 	private List<String> taskUrlNames; //업무URL명칭
 
 	private List<String> sggNet; //시군구별 내부망 IP대역
+	private List<String> externalEntNet; //외부 협력업체PC IP
 
 }
diff --git a/src/main/java/cokr/xit/fims/base/web/MainController.java b/src/main/java/cokr/xit/fims/base/web/MainController.java
index 267e4d31..e2ea4f1a 100644
--- a/src/main/java/cokr/xit/fims/base/web/MainController.java
+++ b/src/main/java/cokr/xit/fims/base/web/MainController.java
@@ -173,9 +173,9 @@ public class MainController extends cokr.xit.base.web.MainController {
 		String[] LOCAL = {"127.0.0.1", "0:0:0:0:0:0:0:1"};
 		String[] PRIVATES = {"10.","172.16.","172.31.","192.168."};
 		String XIT_NET = "211.119.124.";
+		List<String> EXTERNAL_ENT_NET = FimsConf.get().getExternalEntNet();
 		List<String> SGG_NET = FimsConf.get().getSggNet();
 
-
 		if(remoteAddr.equals(LOCAL[0]) || remoteAddr.equals(LOCAL[1])) {
 			net = "intra";
 			flagUsable = true;
@@ -188,6 +188,9 @@ public class MainController extends cokr.xit.base.web.MainController {
 		} else if(remoteAddr.startsWith(XIT_NET)) {
 			net = "intra";
 			flagUsable = true;
+		} else if(this.includeIp(remoteAddr,EXTERNAL_ENT_NET)){
+			net = "intra";
+			flagUsable = true;
 		} else if(this.includeIp(remoteAddr,SGG_NET)) {
 			net = "intra";
 			flagUsable = true;
@@ -214,14 +217,22 @@ public class MainController extends cokr.xit.base.web.MainController {
 
 		if(ipBand != null && ipBand.size() > 0){
 			for(String item : ipBand) {
-				if(ipAddr.startsWith(item)) {
-					result = true;
+				if(item.endsWith(".")) {
+					if(ipAddr.startsWith(item)) {
+						result = true;
+					}
+				} else {
+					if(ipAddr.equals(item)) {
+						result = true;
+					}
 				}
+
 			}
 		}
 		return result;
 	}
 
+
 	@RequestMapping(name="서버 이벤트 수신 등록", value="/subscribe.do")
 	public SseEmitter subscribe(HttpServletRequest req) {
 		return sseBean.start(req.getParameter("sseKey"));