tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

이준호 문자온 커밋

Browse Source 
- IP 받아오는 방식 수정
This commit is contained in:
leejunho 2023-07-28 12:49:28 +09:00
parent d2e986a666
commit 26db81bdc8
14 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java
View File

@ -125,7 +125,7 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
Date currentTime = new Date (); Date currentTime = new Date ();
String mTime = mSimpleDateFormat.format ( currentTime ); String mTime = mSimpleDateFormat.format ( currentTime );
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); 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();} if (ip == null){ ip = req.getRemoteAddr();}
LoginLog loginLog = new LoginLog(); LoginLog loginLog = new LoginLog();
@ -223,31 +223,31 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
String ip = ""; String ip = "";
try { 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); //logger.info("> X-FORWARDED-FOR : " + ip);
//System.out.println("> X-FORWARDED-FOR : " + ip); System.out.println("> X-FORWARDED-FOR : " + ip);
if (ip == null) { if (ip == null) {
ip = request.getHeader("Proxy-Client-IP"); ip = request.getHeader("Proxy-Client-IP");
//System.out.println("> Proxy-Client-IP : " + ip); System.out.println("> Proxy-Client-IP : " + ip);
} }
if (ip == null) { if (ip == null) {
ip = request.getHeader("WL-Proxy-Client-IP"); 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) { if (ip == null) {
ip = request.getHeader("HTTP_CLIENT_IP"); ip = request.getHeader("HTTP_CLIENT_IP");
//System.out.println("> HTTP_CLIENT_IP : " + ip); System.out.println("> HTTP_CLIENT_IP : " + ip);
} }
if (ip == null) { if (ip == null) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR"); 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) { if (ip == null) {
ip = request.getRemoteAddr(); 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) }catch(Exception ex)
{ {
ex.printStackTrace(); ex.printStackTrace();

2
src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java
View File

@ -34,7 +34,7 @@ public class IPCheckInterceptor implements HandlerInterceptor, Constants {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception { 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)) { if (ObjectUtils.isEmpty(clientIp) || "unknown".equalsIgnoreCase(clientIp)) {
clientIp = request.getHeader("Proxy-Client-IP"); clientIp = request.getHeader("Proxy-Client-IP");
} }

2
src/main/java/itn/com/cmm/util/IpUtil.java
View File

@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
public class IpUtil { public class IpUtil {
public static String getClientIP(HttpServletRequest request) { 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) ) { // 아이피 가져오기 , 바로 웹로직이 있을경우 if ( userip == null || "".equals(userip) ) { // 아이피 가져오기 , 바로 웹로직이 있을경우
userip = request.getRemoteAddr(); userip = request.getRemoteAddr();

6
src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java
View File

@ -314,7 +314,7 @@ public class EgovBBSManageController {
model.addAttribute("paginationInfo", paginationInfo); 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(); if (ip == null) ip = request.getRemoteAddr();
String ddd = ""; String ddd = "";
@ -809,7 +809,7 @@ public class EgovBBSManageController {
vo.setCodeId("ITN015"); vo.setCodeId("ITN015");
model.addAttribute("codeList", cmmUseService.selectCmmCodeDetail(vo)); 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 (ip == null) ip = request.getRemoteAddr();
String ddd = ""; String ddd = "";
@ -1038,7 +1038,7 @@ public class EgovBBSManageController {
model.addAttribute("codeList", cmmUseService.selectCmmCodeDetail(vo)); 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 (ip == null) ip = request.getRemoteAddr();
if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) {
model.addAttribute("Transfer", true ); model.addAttribute("Transfer", true );

6
src/main/java/itn/let/main/web/EgovMainController.java
View File

@ -71,6 +71,7 @@ import itn.let.sym.site.service.SiteManagerVO;
import itn.let.uss.olp.qmc.service.EgovQustnrManageService; import itn.let.uss.olp.qmc.service.EgovQustnrManageService;
import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.EgovUserManageService;
import itn.let.uss.umt.service.MberManageVO; import itn.let.uss.umt.service.MberManageVO;
import itn.let.utl.sim.service.EgovClntInfo;
/** /**
* 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스) * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스)
@ -1151,7 +1152,8 @@ public class EgovMainController {
Date currentTime = new Date (); Date currentTime = new Date ();
String mTime = mSimpleDateFormat.format ( currentTime ); String mTime = mSimpleDateFormat.format ( currentTime );
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); 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();} if (ip == null){ ip = req.getRemoteAddr();}
LoginLog loginLog = new LoginLog(); LoginLog loginLog = new LoginLog();
loginLog.setLoginIp(ip); loginLog.setLoginIp(ip);
@ -1212,7 +1214,7 @@ public class EgovMainController {
Date currentTime = new Date (); Date currentTime = new Date ();
String mTime = mSimpleDateFormat.format ( currentTime ); String mTime = mSimpleDateFormat.format ( currentTime );
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); 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();} if (ip == null){ ip = req.getRemoteAddr();}
LoginLog loginLog = new LoginLog(); LoginLog loginLog = new LoginLog();
loginLog.setLoginIp(ip); loginLog.setLoginIp(ip);

2
src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
View File

@ -1470,7 +1470,7 @@ public class MjonPayV2Controller {
// Get Ip // Get Ip
public static String getClientIP(HttpServletRequest request) { 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"; String ipMethod = "X-Forwarded-For";
if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {

2
src/main/java/itn/let/uat/uia/web/ClientIP.java
View File

@ -6,7 +6,7 @@ public class ClientIP {
public String getClientIP(HttpServletRequest request) { 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) { if (ip == null) {
ip = request.getHeader("Proxy-Client-IP"); ip = request.getHeader("Proxy-Client-IP");

2
src/main/java/itn/let/uat/uia/web/EgovLoginController.java
View File

@ -1274,7 +1274,7 @@ public class EgovLoginController {
HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()) HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())
.getRequest(); .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) { if (userIp == null) {
userIp = req.getRemoteAddr(); userIp = req.getRemoteAddr();
} }

4
src/main/java/itn/let/utl/sim/service/EgovClntInfo.java
View File

@ -32,7 +32,7 @@ public class EgovClntInfo {
*/ */
public static String getClntIP(HttpServletRequest request) throws Exception { 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)) { if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP"); ip = request.getHeader("Proxy-Client-IP");
@ -62,7 +62,7 @@ public class EgovClntInfo {
// IP주소 // IP주소
//String ipAddr = request.getRemoteAddr(); //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)) { if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP"); ip = request.getHeader("Proxy-Client-IP");

6
src/main/java/itn/web/ContentController.java
View File

@ -367,7 +367,7 @@ public class ContentController{
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
try { 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) { if (ipAddress == null) {
ipAddress = request.getRemoteAddr(); ipAddress = request.getRemoteAddr();
} }
@ -559,7 +559,7 @@ public class ContentController{
int ignoreIpCnt = 0; int ignoreIpCnt = 0;
// 0:0:0:0:0:0:0:1 // 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) { if (ipAddress == null) {
ipAddress = request.getRemoteAddr(); ipAddress = request.getRemoteAddr();
} }
@ -598,7 +598,7 @@ public class ContentController{
modelAndView.setViewName("jsonView"); modelAndView.setViewName("jsonView");
// 0:0:0:0:0:0:0:1 // 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) { if (ipAddress == null) {
ipAddress = request.getRemoteAddr(); ipAddress = request.getRemoteAddr();
} }

12
src/main/java/itn/web/MainController.java
View File

@ -1046,7 +1046,8 @@ public class MainController {
Date currentTime = new Date (); Date currentTime = new Date ();
String mTime = mSimpleDateFormat.format ( currentTime ); String mTime = mSimpleDateFormat.format ( currentTime );
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); 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();} if (ip == null){ ip = req.getRemoteAddr();}
loginLog.setLoginIp(ip); loginLog.setLoginIp(ip);
@ -1235,7 +1236,8 @@ public class MainController {
Date currentTime = new Date (); Date currentTime = new Date ();
String mTime = mSimpleDateFormat.format ( currentTime ); String mTime = mSimpleDateFormat.format ( currentTime );
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); 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();} if (ip == null){ ip = req.getRemoteAddr();}
loginLog.setLoginIp(ip); loginLog.setLoginIp(ip);
@ -1292,7 +1294,7 @@ public class MainController {
// 차단IP 체크 START // 차단IP 체크 START
{ {
int ignoreIpCnt = 0; 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) { if (ipAddress == null) {
ipAddress = request.getRemoteAddr(); ipAddress = request.getRemoteAddr();
} }
@ -2628,7 +2630,7 @@ public class MainController {
try { 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) { if (ipAddress == null) {
ipAddress = request.getRemoteAddr(); ipAddress = request.getRemoteAddr();
System.out.println("+++++++++++++ ipAddress ::: "+ipAddress); System.out.println("+++++++++++++ ipAddress ::: "+ipAddress);
@ -2724,7 +2726,7 @@ public class MainController {
String ip = ""; String ip = "";
try { 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); //logger.info("> X-FORWARDED-FOR : " + ip);
//System.out.println("> X-FORWARDED-FOR : " + ip); //System.out.println("> X-FORWARDED-FOR : " + ip);

2
src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <sqlMap namespace="ApiCallInfoMng">

2
src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <sqlMap namespace="ApiKeyMng">

2
src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <sqlMap namespace="UserLog">