From 220e8f7ba9dc8218b5a741b02c14e20e3758540c Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Wed, 15 Dec 2021 10:02:48 +0900
Subject: [PATCH] =?UTF-8?q?csrf=20=ED=86=A0=ED=81=B0=20=EC=A0=9C=EA=B1=B0?=
 =?UTF-8?q?=20submit=EC=9D=84=20jsp=EB=82=B4=EB=A1=9C=20=EC=98=AE=EA=B9=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nlib/sch/web/NlibSearchController.java    | 21 +------------------
 .../jsp/nlib/collection/listInterests.jsp     |  2 +-
 .../jsp/nlib/collection/searchList.jsp        |  4 ++--
 .../search/getDetailedSearchFormPopup.jsp     |  3 +--
 src/main/webapp/js/search/reference.js        |  5 -----
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java
index 02d3ddfe..1c064d1e 100644
--- a/src/main/java/nlib/sch/web/NlibSearchController.java
+++ b/src/main/java/nlib/sch/web/NlibSearchController.java
@@ -90,7 +90,7 @@ public class NlibSearchController extends NlibCommonController {
 	 * @param req
 	 * @return
 	 */
-	@RequestMapping(value = {"/search/searchList.do", "/search/searchListCondition.do"} )
+	@RequestMapping(value = {"/search/searchList.do"} )
 	public String searchList(
 			HttpServletRequest req
 			, Authentication authentication
@@ -102,25 +102,6 @@ public class NlibSearchController extends NlibCommonController {
 		HttpSession session = request.getSession();
 		String councilCd = (String)session.getAttribute("councilCd");
 		
-		boolean fromMenu = request.getServletPath().contains("/search/searchList.do");
-		
-		if(fromMenu) { 
-			String sfield = searchVO.getSfield();
-			String query = searchVO.getQuery();
-			String collection = searchVO.getCollection();
-			searchVO = new NlibSearchVO();
-			searchVO.setSfield(sfield);
-			searchVO.setQuery(query);
-			searchVO.setCollection(collection);
-		}
-		
-		if(!fromMenu && !isValidCsrfToken(request, csrfToken))
-		{
-			model.addAttribute("msg", "잘못된 접근입니다.");
-			model.addAttribute("url","/");
-			return "nlib/cmm/alert";
-		}
-		
 		//검색엔진파라미터로 문화원코드
 		searchVO.setMngOrgCd(councilCd);
 		
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
index 19d18776..f2f9fabb 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
@@ -353,7 +353,7 @@
 	                                <select name="mngOrgCd" id="mngOrgCd" title="문화원 선택">
 	                                        <option value="">문화원 전체</option>
 	                                    <c:forEach var="deptList" items="${deptList }">
-	                                        <option value="<c:out value='${deptList.orgCd }" ><c:out value='${deptList.deptNm }'/></option>
+	                                        <option value="<c:out value='${deptList.orgCd }'/>" ><c:out value='${deptList.deptNm }'/></option>
 	                                    </c:forEach>
 	                                </select>
 	                            </div>
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
index 65b5d4b0..94c20fae 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
@@ -189,7 +189,7 @@ function fnTabMoveSch(collection){
     fnFilterSch();
 }
 function fnFilterSch(){
-    document.referencelistForm.action="/search/searchListCondition.do";
+    document.referencelistForm.action="/search/searchList.do";
     document.referencelistForm.submit();
 }
 
@@ -209,7 +209,7 @@ function fn_search_article(pageIndex) {
 </script>
 
 <!-- 소장자료 섹션 -->
-<form name="referencelistForm" id="referencelistForm" method="post" action="/search/searchListCondition.do">
+<form name="referencelistForm" id="referencelistForm" method="post" action="/search/searchList.do">
        <input type="hidden" name="collection" id="collection" value="<c:out value='${searchVO.collection}'/>" /> 
         <input type="hidden" id="pageIndex" name="pageIndex" title="페이지번호" value="<c:out value='${searchVO.pageIndex }' />"/> 
         <input type="hidden" id="masterId" name="masterId" value="" /> 
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
index a821d6c8..8e038c48 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
@@ -381,12 +381,11 @@ function detailPopClose(){
                 <span>검색어와, 검색조건들을 통해서 더 정확한 정보를 찾아보세요.</span>
                 <span><a href="javascript:;" class="btn-close-pop" onclick="detailPopClose();"><img src="/images/btn/btn-pop-close.png" alt="닫기"></a></span>
             </div>
-            <form action="/search/searchListCondition.do" method="POST" id="d_referencelistForm" name="d_referencelistForm" class="mCustomScrollbar" data-mcs-theme="dark-2">
+            <form action="/search/searchList.do" method="POST" id="d_referencelistForm" name="d_referencelistForm" class="mCustomScrollbar" data-mcs-theme="dark-2">
                 <input type="hidden" id="d_filter_class" name="filter_class">
                 <input type="hidden" id="d_filter_category" name="filter_category">
                 <input type="hidden" id="d_filter_mylist" name="filter_mylist">
                 <input type="hidden" id="d_filter_creatYyyy" name="filter_creatYyyy" value="">
-                <input type="hidden" id="csrfToken" name="csrfToken" value="<c:out value='${csrfToken}'/>">
                 <div class="scroll-wrap">
                     <fieldset>
                         <legend>상세검색 입력폼</legend>
diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js
index f16dbf62..84309f7f 100644
--- a/src/main/webapp/js/search/reference.js
+++ b/src/main/webapp/js/search/reference.js
@@ -409,8 +409,3 @@ function fnLabel_reference_detail(){
         $(checked2[i]).prop("checked", true);
     }
 }
-function fnFilterSch(){
-	document.referencelistForm.action="/search/searchListCondition.do";
-    document.referencelistForm.submit();
-}
-