Commit @bee412376c6204de69e2ef7ba1f41ee41b558100

이호영 2024-11-21

+보안로그인 컨트롤러 체크 완료

@bee412376c6204de69e2ef7ba1f41ee41b558100

7a38574

bee4123

src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java

--- src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java

+++ src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java


 		
 		return resultCnt;
 	}
+
+	@Override
+	public String getSecuLoginFlag(String id) {
+		// TODO Auto-generated method stub
+		return mberManageDAO.getSecuLoginFlag(id);
+	}
 	
 	
 }

7a38574

bee4123

src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java

--- src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java

+++ src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java


 		
 		return resultCnt;
 	}
+
+	public String getSecuLoginFlag(String id) {
+		return (String)select("mberManageDAO.getSecuLoginFlag", id);
+	}
 	
 }

7a38574

bee4123

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


 import itn.com.cmm.util.WebUtil;
 import itn.com.uss.olh.hpc.service.HackIpService;
 import itn.com.uss.olh.hpc.service.HackIpVO;
+import itn.let.cert.ip.service.CertIpService;
 import itn.let.cert.ip.service.CertLoginLogService;
+import itn.let.cert.ip.service.MberCertIpVO;
 import itn.let.cert.ip.service.MberCertLoginLogVO;
 import itn.let.cert.phone.service.CertPhoneService;
 import itn.let.cert.phone.service.MberCertPhoneVO;

 	
 	@Resource(name = "CertLoginLogService")
 	private CertLoginLogService certLoginLogService;
+	
+	@Resource(name = "CertIpService")
+	private CertIpService certIpService;
 	
 	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
 

 		modelAndView.addObject("data", resultVO);
 		modelAndView.addObject("mberCertPhoneList", mberCertPhoneList);
 		
+		
+
+
+		/* 일시 : 2024.11.21
+		 * 내용 : 패스 인증 조회
+		 * 작업자 : 이호영
+		 */
+		String userId = loginVO.getId();
+		// lettngnrlmber TB에 secuLoginFlag 값이 Y면 인증 해야함
+		String secuLoginFlag = mberManageService.getSecuLoginFlag(userId);
+		
+		String passFlag = "Y";
+		if("Y".equals(secuLoginFlag)) {
+			// lettngnrlmber TB에 secuLoginFlag 값이 Y면
+			// IP가 등록 되어 있는지 확인
+			// 있으면 2차인증 안함
+			// 없으면 2차인증 진행
+	    	MberCertIpVO mberCertIpVO = new MberCertIpVO();
+	    	mberCertIpVO.setCertIp(userIp);
+	    	mberCertIpVO.setMberId(userId);
+	    	// ip가 있으면 true
+	    	if(!certIpService.checkCertIp(mberCertIpVO)) {
+	    		passFlag = "N";
+	    	}
+		}
+		modelAndView.addObject("passFlag", passFlag);
+		
+		
+		
 		return modelAndView;
 		
 

 		sendLogVO.setSendId(id);
 		sendLogVO.setReceive(s_hp);
 		sendLogVO.setCheckNo(s_num);
-				
-		sendLogVO = mjonMsgDataService.selectSysMsgLogCheck(sendLogVO);
 		
-		if (sendLogVO==null) {
-			redirectAttributes.addFlashAttribute("fail2", true);
-			return "redirect:/web/user/login/login.do";
-		}		
+		String passFlag	=	request.getParameter("passFlag");
+		System.out.println("passFlag : "+ passFlag);
+		System.out.println("passFlag : "+ passFlag);
+		System.out.println("passFlag : "+ passFlag);
+		System.out.println("passFlag : "+ passFlag);
+		System.out.println("passFlag : "+ passFlag);
+		System.out.println("passFlag : "+ passFlag);
+		if("Y".equals(passFlag)) {
 		
+			sendLogVO = mjonMsgDataService.selectSysMsgLogCheck(sendLogVO);
+			
+			if (sendLogVO==null) {
+				redirectAttributes.addFlashAttribute("fail2", true);
+				return "redirect:/web/user/login/login.do";
+			}		
+		
+		}
 		
 		String password = decryptRsa(privateKey, loginVO.getPassword());
 		loginVO.setId(id);

7a38574

bee4123

src/main/java/itn/let/uss/umt/service/EgovMberManageService.java

--- src/main/java/itn/let/uss/umt/service/EgovMberManageService.java

+++ src/main/java/itn/let/uss/umt/service/EgovMberManageService.java

...	...	@@ -243,4 +243,6 @@
243	243
244	244	//기업회원 기업정보 변경신청 취소 처리
245	245	public int updateCmpUserInfoCancel(MberManageVO mberManageVO) throws Exception;
	246	+
	247	+ public String getSecuLoginFlag(String id);
246	248	} (No newline at end of file)

7a38574

bee4123

src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml


 				LOGIN_IP as certIp 
 			from lettngnrlmber_cert_login_log_ip
 			where LOGIN_ID = #mberId#
-			and CERT_IP = #certIp#
+			and LOGIN_IP = #certIp#
 			union all
 			select 
 				CERT_IP as certIp  

7a38574

bee4123

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

...	...	@@ -2106,4 +2106,11 @@
2106	2106	WHERE CMPHST_ID = #cmpHstId#
2107	2107
2108	2108	</update>
	2109	+
	2110	+ <select id="mberManageDAO.getSecuLoginFlag" resultClass="String" parameterClass="String">
	2111	+
	2112	+
	2113	+ select SECU_LOGIN_FLAG from lettngnrlmber where MBER_ID = #id#
	2114	+
	2115	+ </select>
2109	2116	</sqlMap>

7a38574

bee4123

src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp

--- src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp

+++ src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp


 }
 
 function actionLogin(){
+	console.log('actionLogin : actionLogin')
 
 	setTimeout(function() {
 		if (isKoreaIpAddress == false) {

 			      //alert(data.data.moblphonNo);
 			      console.log('===========');
 			      console.log(data.mberCertPhoneList);
+			  		console.log(data.passFlag);
 
 			      if (data.status=="success"){
-			    	  //번호인증팝업 띄우기
-			    	  $("#input_list_item_1").hide();
-			    	  $("#input_list_item_2").hide();
-			    	  $("#input_list_item_3").hide();
-			    	  $("#input_list_item_0").hide();
-
-			    	  $("#input_list_item_4").show();
-			    	  $("#input_list_item_5").show();
-			    	  $("#input_list_item_6").show();
-
-// 			    	  $("#hp_text2").val(data.data.moblphonNo);
-			    		var $select = $('#hp_text2');
-			    		data.mberCertPhoneList.forEach(function(item) {
-			    			$select.append($('<option>', {
-			    				value: item.mbtlnum, // option의 value 값
-			    				text: item.mbtlnum+'('+item.certAlias+')'  // option의 화면에 보이는 텍스트
-			    			}));
-			    		});
-			    	  
-			    	  
+				    	
+				    	if(data.passFlag == "Y")
+			    		{
+				    	    document.loginForm2.passFlag.value = passFlag;
+				    		actionLogin_end();
+			    		}
+				    	else
+				    	{
+					    	  
+					    	//번호인증팝업 띄우기
+					    	$("#input_list_item_1").hide();
+					    	$("#input_list_item_2").hide();
+					    	$("#input_list_item_3").hide();
+					    	$("#input_list_item_0").hide();
+		
+					    	$("#input_list_item_4").show();
+					    	$("#input_list_item_5").show();
+					    	$("#input_list_item_6").show();
+		
+		// 			    	$("#hp_text2").val(data.data.moblphonNo);
+					    	var $select = $('#hp_text2');
+					    	data.mberCertPhoneList.forEach(function(item) {
+					    		$select.append($('<option>', {
+					    			value: item.mbtlnum, // option의 value 값
+					    			text: item.mbtlnum+'('+item.certAlias+')'  // option의 화면에 보이는 텍스트
+					    		}));
+					    	});
+		
+				    	}
+				    	
 			   		}else if (data.status=="fail"){
 			   			
 			   			if (data.dormantYn=="Y"){

     <input type="hidden" name="goEventPay" value="${goEventPay}"/>
     <input type="hidden" id="hp" name="hp">
     <input type="hidden" id="num" name="num">
+    <input type="hidden" id="passFlag" name="passFlag">
     
     <div class="send_top">
 		<div class="mypage_content current">

Add a comment

Open 0
Closed 0

List

...	...	@@ -604,6 +604,12 @@
604	604
605	605	return resultCnt;
606	606	}
	607	+
	608	+ @Override
	609	+ public String getSecuLoginFlag(String id) {
	610	+ // TODO Auto-generated method stub
	611	+ return mberManageDAO.getSecuLoginFlag(id);
	612	+ }
607	613
608	614
609	615	} (No newline at end of file)

...	...	@@ -332,5 +332,9 @@
332	332
333	333	return resultCnt;
334	334	}
	335	+
	336	+ public String getSecuLoginFlag(String id) {
	337	+ return (String)select("mberManageDAO.getSecuLoginFlag", id);
	338	+ }
335	339
336	340	} (No newline at end of file)

...	...	@@ -83,7 +83,9 @@
83	83	import itn.com.cmm.util.WebUtil;
84	84	import itn.com.uss.olh.hpc.service.HackIpService;
85	85	import itn.com.uss.olh.hpc.service.HackIpVO;
	86	+import itn.let.cert.ip.service.CertIpService;
86	87	import itn.let.cert.ip.service.CertLoginLogService;
	88	+import itn.let.cert.ip.service.MberCertIpVO;
87	89	import itn.let.cert.ip.service.MberCertLoginLogVO;
88	90	import itn.let.cert.phone.service.CertPhoneService;
89	91	import itn.let.cert.phone.service.MberCertPhoneVO;
...	...	@@ -246,6 +248,9 @@
246	248
247	249	@Resource(name = "CertLoginLogService")
248	250	private CertLoginLogService certLoginLogService;
	251	+
	252	+ @Resource(name = "CertIpService")
	253	+ private CertIpService certIpService;
249	254
250	255	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
251	256
...	...	@@ -2072,6 +2077,35 @@
2072	2077	modelAndView.addObject("data", resultVO);
2073	2078	modelAndView.addObject("mberCertPhoneList", mberCertPhoneList);
2074	2079
	2080	+
	2081	+
	2082	+
	2083	+ /* 일시 : 2024.11.21
	2084	+ * 내용 : 패스 인증 조회
	2085	+ * 작업자 : 이호영
	2086	+ */
	2087	+ String userId = loginVO.getId();
	2088	+ // lettngnrlmber TB에 secuLoginFlag 값이 Y면 인증 해야함
	2089	+ String secuLoginFlag = mberManageService.getSecuLoginFlag(userId);
	2090	+
	2091	+ String passFlag = "Y";
	2092	+ if("Y".equals(secuLoginFlag)) {
	2093	+ // lettngnrlmber TB에 secuLoginFlag 값이 Y면
	2094	+ // IP가 등록 되어 있는지 확인
	2095	+ // 있으면 2차인증 안함
	2096	+ // 없으면 2차인증 진행
	2097	+ MberCertIpVO mberCertIpVO = new MberCertIpVO();
	2098	+ mberCertIpVO.setCertIp(userIp);
	2099	+ mberCertIpVO.setMberId(userId);
	2100	+ // ip가 있으면 true
	2101	+ if(!certIpService.checkCertIp(mberCertIpVO)) {
	2102	+ passFlag = "N";
	2103	+ }
	2104	+ }
	2105	+ modelAndView.addObject("passFlag", passFlag);
	2106	+
	2107	+
	2108	+
2075	2109	return modelAndView;
2076	2110
2077	2111
...	...	@@ -2467,14 +2501,24 @@
2467	2501	sendLogVO.setSendId(id);
2468	2502	sendLogVO.setReceive(s_hp);
2469	2503	sendLogVO.setCheckNo(s_num);
2470		-
2471		- sendLogVO = mjonMsgDataService.selectSysMsgLogCheck(sendLogVO);
2472	2504
2473		- if (sendLogVO==null) {
2474		- redirectAttributes.addFlashAttribute("fail2", true);
2475		- return "redirect:/web/user/login/login.do";
2476		- }
	2505	+ String passFlag = request.getParameter("passFlag");
	2506	+ System.out.println("passFlag : "+ passFlag);
	2507	+ System.out.println("passFlag : "+ passFlag);
	2508	+ System.out.println("passFlag : "+ passFlag);
	2509	+ System.out.println("passFlag : "+ passFlag);
	2510	+ System.out.println("passFlag : "+ passFlag);
	2511	+ System.out.println("passFlag : "+ passFlag);
	2512	+ if("Y".equals(passFlag)) {
2477	2513
	2514	+ sendLogVO = mjonMsgDataService.selectSysMsgLogCheck(sendLogVO);
	2515	+
	2516	+ if (sendLogVO==null) {
	2517	+ redirectAttributes.addFlashAttribute("fail2", true);
	2518	+ return "redirect:/web/user/login/login.do";
	2519	+ }
	2520	+
	2521	+ }
2478	2522
2479	2523	String password = decryptRsa(privateKey, loginVO.getPassword());
2480	2524	loginVO.setId(id);

...	...	@@ -93,7 +93,7 @@
93	93	LOGIN_IP as certIp
94	94	from lettngnrlmber_cert_login_log_ip
95	95	where LOGIN_ID = #mberId#
96		- and CERT_IP = #certIp#
	96	+ and LOGIN_IP = #certIp#
97	97	union all
98	98	select
99	99	CERT_IP as certIp

...	...	@@ -138,6 +138,7 @@
138	138	}
139	139
140	140	function actionLogin(){
	141	+ console.log('actionLogin : actionLogin')
141	142
142	143	setTimeout(function() {
143	144	if (isKoreaIpAddress == false) {
...	...	@@ -180,28 +181,39 @@
180	181	//alert(data.data.moblphonNo);
181	182	console.log('===========');
182	183	console.log(data.mberCertPhoneList);
	184	+ console.log(data.passFlag);
183	185
184	186	if (data.status=="success"){
185		- //번호인증팝업 띄우기
186		- $("#input_list_item_1").hide();
187		- $("#input_list_item_2").hide();
188		- $("#input_list_item_3").hide();
189		- $("#input_list_item_0").hide();
190		-
191		- $("#input_list_item_4").show();
192		- $("#input_list_item_5").show();
193		- $("#input_list_item_6").show();
194		-
195		-// $("#hp_text2").val(data.data.moblphonNo);
196		- var $select = $('#hp_text2');
197		- data.mberCertPhoneList.forEach(function(item) {
198		- $select.append($('<option>', {
199		- value: item.mbtlnum, // option의 value 값
200		- text: item.mbtlnum+'('+item.certAlias+')' // option의 화면에 보이는 텍스트
201		- }));
202		- });
203		-
204		-
	187	+
	188	+ if(data.passFlag == "Y")
	189	+ {
	190	+ document.loginForm2.passFlag.value = passFlag;
	191	+ actionLogin_end();
	192	+ }
	193	+ else
	194	+ {
	195	+
	196	+ //번호인증팝업 띄우기
	197	+ $("#input_list_item_1").hide();
	198	+ $("#input_list_item_2").hide();
	199	+ $("#input_list_item_3").hide();
	200	+ $("#input_list_item_0").hide();
	201	+
	202	+ $("#input_list_item_4").show();
	203	+ $("#input_list_item_5").show();
	204	+ $("#input_list_item_6").show();
	205	+
	206	+ // $("#hp_text2").val(data.data.moblphonNo);
	207	+ var $select = $('#hp_text2');
	208	+ data.mberCertPhoneList.forEach(function(item) {
	209	+ $select.append($('<option>', {
	210	+ value: item.mbtlnum, // option의 value 값
	211	+ text: item.mbtlnum+'('+item.certAlias+')' // option의 화면에 보이는 텍스트
	212	+ }));
	213	+ });
	214	+
	215	+ }
	216	+
205	217	}else if (data.status=="fail"){
206	218
207	219	if (data.dormantYn=="Y"){
...	...	@@ -526,6 +538,7 @@
526	538	<input type="hidden" name="goEventPay" value="${goEventPay}"/>
527	539	<input type="hidden" id="hp" name="hp">
528	540	<input type="hidden" id="num" name="num">
	541	+ <input type="hidden" id="passFlag" name="passFlag">
529	542
530	543	<div class="send_top">
531	544	<div class="mypage_content current">

Delete comment