fix: 관리자 세션 만료 리다이렉트 루프 방지

This reverts commit 194ab35b

src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java

@@ -912,6 +912,7 @@ public class BOGnrlbbscttService {
             throw new WnbtRestException(wre.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw new WnbtRestException("게시글 등록 중 오류가 발생했습니다.", e);
         }
 
         return message;
@@ -1129,6 +1130,7 @@ public class BOGnrlbbscttService {
             throw new WnbtRestException(wre.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw new WnbtRestException("게시글 수정 중 오류가 발생했습니다.", e);
         }
 
         return message;

src/main/java/com/wb/domainserver/domain/mngr/login/MngrLoginController.java

@@ -197,11 +197,12 @@ public class MngrLoginController {
 			log.debug("리프레쉬 토큰이 없는 경우 realm  :: {}", realm);
 
             //엑세스토큰 삭제
-            CookieUtils.deleteCookie("ACT","/"+realm, request, response);
+            CookieUtils.deleteCookie("ACT","/", request, response);
-            CookieUtils.deleteCookie("token_expire","/"+realm, request, response);
+            CookieUtils.deleteCookie("RFT","/" + realm + "/tokens/refresh", request, response);
+            CookieUtils.deleteCookie("token_expire","/", request, response);
 
             response.sendRedirect("/"+realm);
-
+            return;
         }
 
         //리프레쉬 토큰 있을 경우(존재한다는 자체가 refresh토큰이 만료된 상태가 아님)

src/main/java/com/wb/domainserver/interceptor/mngr/MngrLoggingInterceptor.java

@@ -371,7 +371,9 @@ public class MngrLoggingInterceptor implements HandlerInterceptor {
                 String cookieValue = agentId + ":" + md5(agentId + ":" + md5(System.currentTimeMillis() + ":" + random.nextInt())).substring(5, 10);
                 Cookie agentIdCookie = new Cookie("agent_id", cookieValue);
                 agentIdCookie.setMaxAge(86400 * 365 * 10); // 10년
-                agentIdCookie.setDomain(domain);
+                if (!request.getServerName().startsWith("loc.")) {
+                    agentIdCookie.setDomain(domain);
+                }
 //                agentIdCookie.setHttpOnly(true);
                 agentIdCookie.setPath("/mngr");
     //            agentIdCookie.setSecure(true);

src/main/java/com/wb/domainserver/security/filter/JwtAuthenticationFilter.java

@@ -51,14 +51,17 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             String accessToken = extractToken(request);
 
 
-            String sysDvCd = RealmContextHolder.getSysDvCdRealm();
             String expireChk = request.getParameter("expire");
             String tokenExpireCookie = CookieUtils.getCookieValue("token_expire", request);
 
             //사용자이면서 ACT가 없는데 tokenExpire는 있을 경우
             //로그인된 사용자지만 엑세스 토큰이 만료되어 다시 재발급 받아야 하는 대상
-            //expire값은 루프 요청 방지
+            //인증 진입점은 만료 쿠키가 남아 있어도 갱신 대상으로 보내지 않는다.
-            if("01".equals(sysDvCd) && !StringUtils.hasText(accessToken) && StringUtils.hasText(tokenExpireCookie) && !"p".equals(expireChk)){
+            //쿠키 삭제가 지연되거나 이전 경로의 쿠키가 남아도 로그인 화면까지는 항상 도달해야 한다.
+            if(!isAuthenticationEndpoint(requestUri, realm)
+                    && !StringUtils.hasText(accessToken)
+                    && StringUtils.hasText(tokenExpireCookie)
+                    && !"p".equals(expireChk)){
                 response.sendRedirect("/"+realm+"/tokens/refresh?redirect_uri=%s&expire=%s".formatted(URLEncoder.encode(UrlExtractor.getOriginalURL(request), StandardCharset.UTF_8), "p"));
                 return;
 
@@ -66,7 +69,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
 
             // accessToken이 있고 refresh Token 요청이 아닌경우
-            if (StringUtils.hasText(accessToken) && !requestUri.contains("/tokens/refresh")) {
+            if (StringUtils.hasText(accessToken) && !isAuthenticationEndpoint(requestUri, realm)) {
                 UserDetails userDetails = customUserDetailService.loadUserByUsername(accessToken);
                 if (userDetails != null) {
                     log.debug("user details: {}", userDetails);
@@ -92,6 +95,15 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     }
 
+    private boolean isAuthenticationEndpoint(String requestUri, String realm) {
+        String realmPath = "/" + realm;
+
+        return requestUri.equals(realmPath)
+                || requestUri.startsWith(realmPath + "/login")
+                || requestUri.equals(realmPath + "/logout")
+                || requestUri.startsWith(realmPath + "/tokens/refresh");
+    }
+
 
 
     private String extractToken(HttpServletRequest request) {

src/main/java/com/wb/domainserver/util/CookieUtils.java

@@ -44,9 +44,12 @@ public abstract class CookieUtils {
         Cookie cookie = new Cookie(name, null);
         cookie.setMaxAge(0);
         cookie.setPath(path);
-        cookie.setDomain(originHost);
+        setCookieDomain(cookie, request, originHost);
         cookie.setHttpOnly(true);
         response.addCookie(cookie);
+
+        // loc 환경에서는 이전에 상위 도메인으로 저장된 쿠키도 함께 삭제한다.
+        deleteLegacyDomainCookie(name, path, request, response, originHost);
     }
 
     public static void createCookie(String name, String value, String path, int maxAge, boolean httpOnly, HttpServletRequest request, HttpServletResponse response) {
@@ -58,10 +61,12 @@ public abstract class CookieUtils {
 
         String originHost = UrlExtractor.getOriginalHost(host);
 
+        deleteLegacyDomainCookie(name, path, request, response, originHost);
+
         Cookie cookie = new Cookie(name, value);
         cookie.setMaxAge(maxAge);
         cookie.setPath(path);
-        cookie.setDomain(originHost);
+        setCookieDomain(cookie, request, originHost);
         cookie.setHttpOnly(httpOnly);
         response.addCookie(cookie);
     }
@@ -77,7 +82,7 @@ public abstract class CookieUtils {
 
            Cookie cookie = new Cookie(name, value);
            cookie.setPath(path);
-           cookie.setDomain(originHost);
+           setCookieDomain(cookie, request, originHost);
            cookie.setHttpOnly(httpOnly);
            response.addCookie(cookie);
        }
@@ -96,4 +101,30 @@ public abstract class CookieUtils {
         return Map.of("ACTPath", ACTPath, "RFTPath", RFTPath);
     }
 
+    private static void setCookieDomain(Cookie cookie, HttpServletRequest request, String domain) {
+        if (!request.getServerName().startsWith("loc.")) {
+            cookie.setDomain(domain);
+        }
+    }
+
+    private static void deleteLegacyDomainCookie(String name, String path, HttpServletRequest request, HttpServletResponse response, String domain) {
+        if (request.getServerName().startsWith("loc.")) {
+            addDomainDeleteCookie(name, path, domain, response);
+
+            int firstDot = domain.indexOf('.');
+            if (firstDot > 0) {
+                addDomainDeleteCookie(name, path, domain.substring(firstDot + 1), response);
+            }
+        }
+    }
+
+    private static void addDomainDeleteCookie(String name, String path, String domain, HttpServletResponse response) {
+        Cookie domainCookie = new Cookie(name, null);
+        domainCookie.setMaxAge(0);
+        domainCookie.setPath(path);
+        domainCookie.setDomain(domain);
+        domainCookie.setHttpOnly(true);
+        response.addCookie(domainCookie);
+    }
+
 }

src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml

@@ -2659,7 +2659,7 @@
 				AND FGI.IMG_KND = '02'
 				AND FGI.CUT_NB = 1
 				LIMIT 1
-			) AS GOODS_IMG_COURS
+			) AS IMG
 			,FG.GOODS_NM
 			,FG.GOODS_ICON_CD AS ICON_CD_NM_LIST
 			,FG.SRT_DC AS REPRSNT_DC

src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttUpdtPopupU.jsp

@@ -486,7 +486,7 @@
 								    </c:when>
 								    <c:otherwise>
 										<button type="button" class="btn xsm primary ml-5"
-												onclick="fn_open_modal('#modalDiv','#product-search','/mngr/goods/goodsmngr/selectGoodsSrchPopupForm',{'goodsKndCd':'01'}); return false;">
+												onclick="selected = []; fn_open_modal('#modalDiv','#product-search','/mngr/goods/goodsmngr/selectGoodsSrchPopupForm',{'goodsKndCd':'01'}); return false;">
 											검색
 										</button>
 								    </c:otherwise>

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttDtlR.jsp

@@ -824,7 +824,9 @@
                             <i class="icon icon_lock"></i>
                         </c:if>
                     </h4>
-                    <p class="eventDetail__date"><c:out value="${bbscttInfo.sumRegistDt}"/></p>
+                    <c:if test="${bbsInfo.registDtYn eq 'Y'}">
+                        <p class="eventDetail__date"><c:out value="${bbscttInfo.sumRegistDt}"/></p>
+                    </c:if>
                 </div>
                 <%-------------------------------%>
                 <%--첨부 파일 다운로드 영역--%>
@@ -961,7 +963,7 @@
                                                         </c:if>
                                                         <a class="product-detail" href="javascript:void(0);" onclick="fn_move_goods_dtl('<c:out value="${item.goodsInnb}"/>');">
                                                             <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
-                                                            <img src="<c:out value = "${cdnurl}${item.goodsImgCours}"/>"
+                                                            <img src="<c:out value = "${cdnurl}${item.img}"/>"
                                                                  onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${item.goodsNm}"/>">
                                                         </a>
                                                     </div>

src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp

@@ -1254,7 +1254,9 @@
                                     </c:if>
                                 </h4>
                                 <ul class="eventDetail__list">
-                                    <li><c:out value="${bbscttInfo.sumRegistDt}"/></li>
+                                    <c:if test="${bbsInfo.registDtYn eq 'Y'}">
+                                        <li><c:out value="${bbscttInfo.sumRegistDt}"/></li>
+                                    </c:if>
                                     <li>조회 <c:out value="${bbscttInfo.inqireCnt}"/></li>
                                     <li>
                                         <c:choose>
@@ -1439,7 +1441,7 @@
                                                                            <a style="cursor:pointer" loading="lazy"
                                                                               onclick = "fn_move_goods_dtl(<c:out value="${item.goodsInnb}"/>)">
                                                                                <spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
-                                                                               <img src="<c:out value = "${cdnurl}${item.goodsImgCours}"/>"
+                                                                               <img src="<c:out value = "${cdnurl}${item.img}"/>"
                                                                                     onerror="this.src='/pc/images/image_placeholder.png'"
                                                                                     alt="<c:out value="${item.goodsNm}"/>">
                                                                            </a>

src/main/webapp/WEB-INF/views/sopmal_m/csc/SubPageListRForm.jsp

@@ -1059,7 +1059,7 @@
                     </form>
                 </div>
                 <%--게시판 등록 사용여부--%>
-                <c:if test = "${bbsInfo.bbscttRegist eq 'Y' && (bbsInfo.bbsTyCd eq '01' || bbsInfo.bbsTyCd eq '08') && bbsInfo.sknTyCd ne '02'}"><%--갤러리타입 등록 x--%>
+                <c:if test = "${bbsInfo.bbscttRegist eq 'Y' && resultMap.registAuthResult eq 'Y' && (bbsInfo.bbsTyCd eq '01' || bbsInfo.bbsTyCd eq '08') && bbsInfo.sknTyCd ne '02'}"><%--갤러리타입 등록 x--%>
                     <div class="infoSection">
                         <a style="cursor:pointer" class="btn md full theme" id = "regBtn"><spring:message code="button.insert"/>하기</a>
                     </div>