From 26db81bdc81d6691400aa59715822d0ba941f4f3 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 28 Jul 2023 12:49:28 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EC=98=A8=20=EC=BB=A4=EB=B0=8B=20=20-=20IP=20=EB=B0=9B?= =?UTF-8?q?=EC=95=84=EC=98=A4=EB=8A=94=20=EB=B0=A9=EC=8B=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IPIgnoreInterceptorHandler.java | 18 +++++++++--------- .../ipCheck/IPCheckInterceptor.java | 2 +- src/main/java/itn/com/cmm/util/IpUtil.java | 2 +- .../cop/bbs/web/EgovBBSManageController.java | 6 +++--- .../itn/let/main/web/EgovMainController.java | 6 ++++-- .../let/mjo/pay/web/MjonPayV2Controller.java | 2 +- .../java/itn/let/uat/uia/web/ClientIP.java | 2 +- .../let/uat/uia/web/EgovLoginController.java | 2 +- .../itn/let/utl/sim/service/EgovClntInfo.java | 4 ++-- src/main/java/itn/web/ContentController.java | 6 +++--- src/main/java/itn/web/MainController.java | 12 +++++++----- .../mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml | 2 +- .../let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml | 2 +- .../let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml | 2 +- 14 files changed, 36 insertions(+), 32 deletions(-) diff --git a/src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java b/src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java index 7f905dd7..7e51b3b7 100644 --- a/src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java +++ b/src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java @@ -125,7 +125,7 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{ Date currentTime = new Date (); String mTime = mSimpleDateFormat.format ( currentTime ); HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String ip = req.getHeader("X-FORWARDED-FOR"); + String ip = req.getHeader("X-Forwarded-For") == null ? req.getHeader("X-Forwarded-For") : req.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ip == null){ ip = req.getRemoteAddr();} LoginLog loginLog = new LoginLog(); @@ -223,31 +223,31 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{ String ip = ""; try { - ip = request.getHeader("X-Forwarded-For"); + ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); //logger.info("> X-FORWARDED-FOR : " + ip); - //System.out.println("> X-FORWARDED-FOR : " + ip); + System.out.println("> X-FORWARDED-FOR : " + ip); if (ip == null) { ip = request.getHeader("Proxy-Client-IP"); - //System.out.println("> Proxy-Client-IP : " + ip); + System.out.println("> Proxy-Client-IP : " + ip); } if (ip == null) { ip = request.getHeader("WL-Proxy-Client-IP"); - //System.out.println("> WL-Proxy-Client-IP : " + ip); + System.out.println("> WL-Proxy-Client-IP : " + ip); } if (ip == null) { ip = request.getHeader("HTTP_CLIENT_IP"); - //System.out.println("> HTTP_CLIENT_IP : " + ip); + System.out.println("> HTTP_CLIENT_IP : " + ip); } if (ip == null) { ip = request.getHeader("HTTP_X_FORWARDED_FOR"); - //System.out.println("> HTTP_X_FORWARDED_FOR : " + ip); + System.out.println("> HTTP_X_FORWARDED_FOR : " + ip); } if (ip == null) { ip = request.getRemoteAddr(); - //System.out.println("> getRemoteAddr : "+ip); + System.out.println("> getRemoteAddr : "+ip); } - //System.out.println("> Result : IP Address : "+ip); + System.out.println("> Result : IP Address : "+ip); }catch(Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java b/src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java index cd9c578e..c15a2433 100644 --- a/src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java +++ b/src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java @@ -34,7 +34,7 @@ public class IPCheckInterceptor implements HandlerInterceptor, Constants { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String clientIp = request.getHeader("X-Forwarded-For"); + String clientIp = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ObjectUtils.isEmpty(clientIp) || "unknown".equalsIgnoreCase(clientIp)) { clientIp = request.getHeader("Proxy-Client-IP"); } diff --git a/src/main/java/itn/com/cmm/util/IpUtil.java b/src/main/java/itn/com/cmm/util/IpUtil.java index 927bb5f2..9d9e4994 100644 --- a/src/main/java/itn/com/cmm/util/IpUtil.java +++ b/src/main/java/itn/com/cmm/util/IpUtil.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest; public class IpUtil { public static String getClientIP(HttpServletRequest request) { - String userip = request.getHeader("X-Forwarded-For"); // 아이피 가져오기 아파치 아래에 웹로직이 있을경우 + String userip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); // 아이피 가져오기 아파치 아래에 웹로직이 있을경우 if ( userip == null || "".equals(userip) ) { // 아이피 가져오기 , 바로 웹로직이 있을경우 userip = request.getRemoteAddr(); diff --git a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java index 7611fd4e..a09f49fc 100644 --- a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java @@ -314,7 +314,7 @@ public class EgovBBSManageController { model.addAttribute("paginationInfo", paginationInfo); //임시 데이터 이관용 - /*String ip = request.getHeader("X-Forwarded-For"); + /*String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ip == null) ip = request.getRemoteAddr(); String ddd = ""; @@ -809,7 +809,7 @@ public class EgovBBSManageController { vo.setCodeId("ITN015"); model.addAttribute("codeList", cmmUseService.selectCmmCodeDetail(vo)); //임시 데이터 이관용 - /*String ip = request.getHeader("X-Forwarded-For"); + /*String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ip == null) ip = request.getRemoteAddr(); String ddd = ""; @@ -1038,7 +1038,7 @@ public class EgovBBSManageController { model.addAttribute("codeList", cmmUseService.selectCmmCodeDetail(vo)); //임시 데이터 이관용 - String ip = request.getHeader("X-Forwarded-For"); + String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ip == null) ip = request.getRemoteAddr(); if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { model.addAttribute("Transfer", true ); diff --git a/src/main/java/itn/let/main/web/EgovMainController.java b/src/main/java/itn/let/main/web/EgovMainController.java index b7d20ced..cbb14ab0 100644 --- a/src/main/java/itn/let/main/web/EgovMainController.java +++ b/src/main/java/itn/let/main/web/EgovMainController.java @@ -71,6 +71,7 @@ import itn.let.sym.site.service.SiteManagerVO; import itn.let.uss.olp.qmc.service.EgovQustnrManageService; import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.MberManageVO; +import itn.let.utl.sim.service.EgovClntInfo; /** * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스) @@ -1151,7 +1152,8 @@ public class EgovMainController { Date currentTime = new Date (); String mTime = mSimpleDateFormat.format ( currentTime ); HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String ip = req.getHeader("X-FORWARDED-FOR"); + /* String ip = req.getHeader("X-FORWARDED-FOR"); */ + String ip = EgovClntInfo.getClntIP(req); if (ip == null){ ip = req.getRemoteAddr();} LoginLog loginLog = new LoginLog(); loginLog.setLoginIp(ip); @@ -1212,7 +1214,7 @@ public class EgovMainController { Date currentTime = new Date (); String mTime = mSimpleDateFormat.format ( currentTime ); HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String ip = req.getHeader("X-FORWARDED-FOR"); + String ip = req.getHeader("X-Forwarded-For") == null ? req.getHeader("X-Forwarded-For") : req.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ip == null){ ip = req.getRemoteAddr();} LoginLog loginLog = new LoginLog(); loginLog.setLoginIp(ip); diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java index c34d3bc6..f6101af1 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java @@ -1470,7 +1470,7 @@ public class MjonPayV2Controller { // Get Ip public static String getClientIP(HttpServletRequest request) { - String ip = request.getHeader("X-Forwarded-For"); + String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); String ipMethod = "X-Forwarded-For"; if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { diff --git a/src/main/java/itn/let/uat/uia/web/ClientIP.java b/src/main/java/itn/let/uat/uia/web/ClientIP.java index a225fdb7..bf3da38a 100644 --- a/src/main/java/itn/let/uat/uia/web/ClientIP.java +++ b/src/main/java/itn/let/uat/uia/web/ClientIP.java @@ -6,7 +6,7 @@ public class ClientIP { public String getClientIP(HttpServletRequest request) { - String ip = request.getHeader("X-Forwarded-For"); + String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ip == null) { ip = request.getHeader("Proxy-Client-IP"); diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 43ee013e..7a993cef 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1274,7 +1274,7 @@ public class EgovLoginController { HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()) .getRequest(); - String userIp = req.getHeader("X-FORWARDED-FOR"); + String userIp = req.getHeader("X-Forwarded-For") == null ? req.getHeader("X-Forwarded-For") : req.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (userIp == null) { userIp = req.getRemoteAddr(); } diff --git a/src/main/java/itn/let/utl/sim/service/EgovClntInfo.java b/src/main/java/itn/let/utl/sim/service/EgovClntInfo.java index 267a6952..c08fe021 100644 --- a/src/main/java/itn/let/utl/sim/service/EgovClntInfo.java +++ b/src/main/java/itn/let/utl/sim/service/EgovClntInfo.java @@ -32,7 +32,7 @@ public class EgovClntInfo { */ public static String getClntIP(HttpServletRequest request) throws Exception { - String ip = request.getHeader("X-Forwarded-For"); + String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); @@ -62,7 +62,7 @@ public class EgovClntInfo { // IP주소 //String ipAddr = request.getRemoteAddr(); - String ip = request.getHeader("X-Forwarded-For"); + String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); diff --git a/src/main/java/itn/web/ContentController.java b/src/main/java/itn/web/ContentController.java index e9de9b30..2ef62575 100644 --- a/src/main/java/itn/web/ContentController.java +++ b/src/main/java/itn/web/ContentController.java @@ -367,7 +367,7 @@ public class ContentController{ StringBuilder sb = new StringBuilder(); try { - String ipAddress = request.getHeader("X-Forwarded-For"); + String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ipAddress == null) { ipAddress = request.getRemoteAddr(); } @@ -559,7 +559,7 @@ public class ContentController{ int ignoreIpCnt = 0; // 0:0:0:0:0:0:0:1 - String ipAddress = request.getHeader("X-Forwarded-For"); + String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ipAddress == null) { ipAddress = request.getRemoteAddr(); } @@ -598,7 +598,7 @@ public class ContentController{ modelAndView.setViewName("jsonView"); // 0:0:0:0:0:0:0:1 - String ipAddress = request.getHeader("X-Forwarded-For"); + String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ipAddress == null) { ipAddress = request.getRemoteAddr(); } diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index f92b5923..4b27ca67 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -1046,7 +1046,8 @@ public class MainController { Date currentTime = new Date (); String mTime = mSimpleDateFormat.format ( currentTime ); HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String ip = req.getHeader("X-FORWARDED-FOR"); + /* String ip = req.getHeader("X-FORWARDED-FOR"); */ + String ip = EgovClntInfo.getClntIP(req); if (ip == null){ ip = req.getRemoteAddr();} loginLog.setLoginIp(ip); @@ -1235,7 +1236,8 @@ public class MainController { Date currentTime = new Date (); String mTime = mSimpleDateFormat.format ( currentTime ); HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String ip = req.getHeader("X-FORWARDED-FOR"); + /* String ip = req.getHeader("X-FORWARDED-FOR"); */ + String ip = EgovClntInfo.getClntIP(req); if (ip == null){ ip = req.getRemoteAddr();} loginLog.setLoginIp(ip); @@ -1292,7 +1294,7 @@ public class MainController { // 차단IP 체크 START { int ignoreIpCnt = 0; - String ipAddress = request.getHeader("X-Forwarded-For"); + String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ipAddress == null) { ipAddress = request.getRemoteAddr(); } @@ -2628,7 +2630,7 @@ public class MainController { try { - String ipAddress = request.getHeader("X-Forwarded-For"); + String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); if (ipAddress == null) { ipAddress = request.getRemoteAddr(); System.out.println("+++++++++++++ ipAddress ::: "+ipAddress); @@ -2724,7 +2726,7 @@ public class MainController { String ip = ""; try { - ip = request.getHeader("X-Forwarded-For"); + ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); //logger.info("> X-FORWARDED-FOR : " + ip); //System.out.println("> X-FORWARDED-FOR : " + ip); diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml index d6846336..bff70921 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml index 20170890..67818230 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml index 076970b9..8b0a6571 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml @@ -1,5 +1,5 @@ - +