이준호 이준호 2023-07-28
이준호 문자온 커밋 - IP 받아오는 방식 수정
 - IP 받아오는 방식 수정
@26db81bdc81d6691400aa59715822d0ba941f4f3
src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java
--- src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java
+++ src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java
@@ -125,7 +125,7 @@
 	            	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 @@
     	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();
src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java
--- src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java
+++ src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java
@@ -34,7 +34,7 @@
 	@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");
 	    }
src/main/java/itn/com/cmm/util/IpUtil.java
--- src/main/java/itn/com/cmm/util/IpUtil.java
+++ src/main/java/itn/com/cmm/util/IpUtil.java
@@ -22,7 +22,7 @@
 
 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();
src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java
--- src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java
+++ src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java
@@ -314,7 +314,7 @@
 		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 @@
 		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 @@
 		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 );
src/main/java/itn/let/main/web/EgovMainController.java
--- src/main/java/itn/let/main/web/EgovMainController.java
+++ src/main/java/itn/let/main/web/EgovMainController.java
@@ -71,6 +71,7 @@
 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 @@
         	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 @@
     	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);
src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
--- src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
@@ -1470,7 +1470,7 @@
     
   	// 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)) {
src/main/java/itn/let/uat/uia/web/ClientIP.java
--- src/main/java/itn/let/uat/uia/web/ClientIP.java
+++ src/main/java/itn/let/uat/uia/web/ClientIP.java
@@ -6,7 +6,7 @@
 
 	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");
src/main/java/itn/let/uat/uia/web/EgovLoginController.java
--- src/main/java/itn/let/uat/uia/web/EgovLoginController.java
+++ src/main/java/itn/let/uat/uia/web/EgovLoginController.java
@@ -1274,7 +1274,7 @@
 
 		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();
 		}
src/main/java/itn/let/utl/sim/service/EgovClntInfo.java
--- src/main/java/itn/let/utl/sim/service/EgovClntInfo.java
+++ src/main/java/itn/let/utl/sim/service/EgovClntInfo.java
@@ -32,7 +32,7 @@
 	*/
 	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 @@
 		// 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");
src/main/java/itn/web/ContentController.java
--- src/main/java/itn/web/ContentController.java
+++ src/main/java/itn/web/ContentController.java
@@ -367,7 +367,7 @@
         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 @@
 		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 @@
 		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();
 	    }
src/main/java/itn/web/MainController.java
--- src/main/java/itn/web/MainController.java
+++ src/main/java/itn/web/MainController.java
@@ -1046,7 +1046,8 @@
             	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 @@
             	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 @@
 		// 차단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 @@
 		
 		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 @@
     	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);
 
src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml
--- src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="ApiCallInfoMng">
 
src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml
--- src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="ApiKeyMng">
 
src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
--- src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="UserLog">
 
Add a comment
List