0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1405 wrap redirect responses

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-12-29 21:09:54 +09:00
parent 525080f43a
commit 0bdb3f5101
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
View file

@ -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
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -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;
}
}