This commit is contained in:
Shinsuke Sugaya 2016-07-16 06:52:13 +09:00
parent 9e43d41583
commit 90e9b93787
2 changed files with 5 additions and 8 deletions

View file

@ -48,7 +48,9 @@ public class SsoAction extends FessLoginAction {
if (logger.isDebugEnabled()) {
logger.debug("No user in SSO request.");
}
saveError(messages -> messages.addErrorsSsoLoginError(GLOBAL));
if (fessConfig.isSsoEnabled()) {
saveError(messages -> messages.addErrorsSsoLoginError(GLOBAL));
}
return redirect(LoginAction.class);
} else if (loginCredential instanceof EmptyLoginCredential) {
throw new RequestLoggingFilter.RequestClientErrorException("Your request is not authorized.", "401 Unauthorized",

View file

@ -18,14 +18,9 @@ if("systemError".equals(type)) {
} else if("badRequest".equals(type)) {
redirectPage.append("/error/badrequest");
response.sendRedirect(redirectPage.toString());
} else if("badAuth".equals(type)) {
%>
Bad Authentication.
<%
} else {
} else if(!"badAuth".equals(type)) {
redirectPage.append("/error/notfound?url=");
redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8"));
response.sendRedirect(redirectPage.toString());
}
%>
%>Bad Authentication.