Prechádzať zdrojové kódy

fix #1405 wrap redirect responses

Shinsuke Sugaya 7 rokov pred
rodič
commit
0bdb3f5101

+ 3 - 2
src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java

@@ -213,12 +213,13 @@ public abstract class FessSearchAction extends FessBaseAction {
     }
 
     protected HtmlResponse redirectToLogin() {
-        return redirect(SsoAction.class);
+        return systemHelper.getRedirectResponseToLogin(request, redirect(SsoAction.class));
     }
 
     protected HtmlResponse redirectToRoot() {
         final String contextPath = request.getServletContext().getContextPath();
-        return newHtmlResponseAsRedirect(StringUtil.isBlank(contextPath) ? "/" : contextPath);
+        return systemHelper.getRedirectResponseToRoot(request,
+                newHtmlResponseAsRedirect(StringUtil.isBlank(contextPath) ? "/" : contextPath));
     }
 
     protected HtmlNext virtualHost(final HtmlNext path) {

+ 10 - 0
src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -43,6 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -58,6 +59,7 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.FessActionValidator;
 import org.lastaflute.core.message.supplier.UserMessagesCreator;
 import org.lastaflute.web.TypicalAction;
+import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.util.LaServletContextUtil;
@@ -382,4 +384,12 @@ public class SystemHelper {
         return new FessActionValidator<>(requestManager, messagesCreator, runtimeGroups);
     }
 
+    public HtmlResponse getRedirectResponseToLogin(final HttpServletRequest request, final HtmlResponse response) {
+        return response;
+    }
+
+    public HtmlResponse getRedirectResponseToRoot(final HttpServletRequest request, final HtmlResponse response) {
+        return response;
+    }
+
 }