Ravi Nori has uploaded a new change for review. Change subject: webadmin, userportal: Custom 405 error page ......................................................................
webadmin, userportal: Custom 405 error page After rhev manager access failure, browser should not display the "JBoss Web" package version. Change-Id: I3029915d10f3df830f3040dc1269ac4607e33ac7 Bug-Url: https://bugzilla.redhat.com/1129944 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/welcome/src/main/resources/messages.properties A backend/manager/modules/welcome/src/main/webapp/WEB-INF/405.jsp M backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml 8 files changed, 146 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/31846/1 diff --git a/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml index 6d389d3..7dca9bb 100644 --- a/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml @@ -56,6 +56,25 @@ <url-pattern>/404.html</url-pattern> </servlet-mapping> + <!-- MethodNotAllowedForward Servlet --> + <servlet> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <servlet-class>org.ovirt.engine.core.utils.servlet.ForwardServlet</servlet-class> + <init-param> + <param-name>targetContext</param-name> + <param-value>..</param-value> + </init-param> + <init-param> + <param-name>uri</param-name> + <param-value>/405.html</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <url-pattern>/405.html</url-pattern> + </servlet-mapping> + + <!-- help tag mapping servlet --> <servlet> <servlet-name>HelpTagJsonServlet</servlet-name> @@ -139,6 +158,11 @@ <location>/404.html</location> </error-page> + <error-page> + <error-code>405</error-code> + <location>/405.html</location> + </error-page> + <session-config> <cookie-config> <http-only>true</http-only> diff --git a/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml index 5df7ce9..8e3308b 100644 --- a/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml @@ -113,6 +113,25 @@ <url-pattern>/404.html</url-pattern> </servlet-mapping> + <!-- MethodNotAllowedForward Servlet --> + <servlet> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <servlet-class>org.ovirt.engine.core.utils.servlet.ForwardServlet</servlet-class> + <init-param> + <param-name>targetContext</param-name> + <param-value>..</param-value> + </init-param> + <init-param> + <param-name>uri</param-name> + <param-value>/405.html</param-value> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <url-pattern>/405.html</url-pattern> + </servlet-mapping> + <!-- Go to the index when a page is not found (preserving the 404 status code): --> <error-page> @@ -120,6 +139,13 @@ <location>/404.html</location> </error-page> + <!-- Go to the index when method is not allowed (preserving the + 405 status code): --> + <error-page> + <error-code>405</error-code> + <location>/405.html</location> + </error-page> + <session-config> <cookie-config> <http-only>true</http-only> diff --git a/backend/manager/modules/welcome/src/main/resources/messages.properties b/backend/manager/modules/welcome/src/main/resources/messages.properties index 4416688..ab2a054 100644 --- a/backend/manager/modules/welcome/src/main/resources/messages.properties +++ b/backend/manager/modules/welcome/src/main/resources/messages.properties @@ -1,3 +1,6 @@ #404 error page pagenotfound.page_not_found=404 - Page not found pagenotfound.link=Click here to continue. +#405 error page +methodnotallowed.method_not_allowed=405 - Method not allowed +methodnotallowed.link=Click here to continue. diff --git a/backend/manager/modules/welcome/src/main/webapp/WEB-INF/405.jsp b/backend/manager/modules/welcome/src/main/webapp/WEB-INF/405.jsp new file mode 100644 index 0000000..363cd1c --- /dev/null +++ b/backend/manager/modules/welcome/src/main/webapp/WEB-INF/405.jsp @@ -0,0 +1,43 @@ +<%@ page pageEncoding="UTF-8" session="false" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %> +<%@ taglib prefix="obrand" uri="obrand" %> +<fmt:setLocale value="${locale}" /> +<fmt:setBundle basename="messages" var="methodnotallowed" /> +<!DOCTYPE html> +<html> +<head> + <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> + <obrand:favicon /> + <title><fmt:message key="methodnotallowed.method_not_allowed" bundle="${methodnotallowed}" /></title> + <obrand:stylesheets /> +</head> +<body> +<div class="obrand_loginPageBackground"> + <a href="<obrand:messages key="obrand.common.vendor_url"/>" class="obrand_loginPageLogoImageLink"> + <span class="obrand_loginPageLogoImage"></span> + </a> + <div class="login-pf"> + <div class="container"> + <div class="row"> + + <div class="col-sm-12"> + <div id="brand"> + <div class="obrand_loginFormLogoImage"></div> + </div> + </div> + + <div class="col-sm-12 welcome-title-wrapper"> + <span class="welcome-title"><fmt:message key="methodnotallowed.method_not_allowed" bundle="${methodnotallowed}" /></span> + </div> + + <div class="col-sm-12"> + <a id="link-405" href="${pageContext.request.contextPath}/"><fmt:message key="methodnotallowed.link" bundle="${methodnotallowed}" /></a> + </div> + + </div> + </div> + </div> + </div> +</body> +</html> diff --git a/backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml index a82699e..ea806a8 100644 --- a/backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml @@ -50,6 +50,17 @@ <url-pattern>/404.html</url-pattern> </servlet-mapping> + <!-- MethodNotAllowedServlet --> + <servlet> + <servlet-name>MethodNotAllowedServlet</servlet-name> + <jsp-file>/WEB-INF/405.jsp</jsp-file> + </servlet> + + <servlet-mapping> + <servlet-name>MethodNotAllowedServlet</servlet-name> + <url-pattern>/405.html</url-pattern> + </servlet-mapping> + <!-- Welcome page --> <servlet> <servlet-name>WelcomeServlet</servlet-name> @@ -105,6 +116,12 @@ <location>/404.html</location> </error-page> + <!-- Go to the index when method is not allowed (preserving the 405 status code): --> + <error-page> + <error-code>405</error-code> + <location>/405.html</location> + </error-page> + <!-- This is handled by the welcome servlet --> <welcome-file-list> <welcome-file>index.html</welcome-file> diff --git a/frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml b/frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml index 368d2e8..efec72d 100644 --- a/frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml +++ b/frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml @@ -108,4 +108,17 @@ <param-value>/404.html</param-value> </init-param> </servlet> + <!-- MethodNotAllowed Servlet --> + <servlet> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <servlet-class>org.ovirt.engine.core.utils.servlet.ForwardServlet</servlet-class> + <init-param> + <param-name>targetContext</param-name> + <param-value>..</param-value> + </init-param> + <init-param> + <param-name>uri</param-name> + <param-value>/405.html</param-value> + </init-param> + </servlet> </web-fragment> diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml b/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml index 1638f16..e3903cd 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml @@ -127,6 +127,11 @@ <url-pattern>/404.html</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <url-pattern>/405.html</url-pattern> + </servlet-mapping> + <!-- Default page to serve --> <welcome-file-list> <welcome-file>UserPortal.html</welcome-file> @@ -138,6 +143,11 @@ <location>/404.html</location> </error-page> + <error-page> + <error-code>405</error-code> + <location>/405.html</location> + </error-page> + <!-- Confidentiality --> <security-constraint> <web-resource-collection> diff --git a/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml b/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml index 2f01176..9d22f7c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml +++ b/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml @@ -134,6 +134,11 @@ <url-pattern>/404.html</url-pattern> </servlet-mapping> + <servlet-mapping> + <servlet-name>MethodNotAllowedForwardServlet</servlet-name> + <url-pattern>/405.html</url-pattern> + </servlet-mapping> + <!-- Default page to serve --> <welcome-file-list> <welcome-file>WebAdmin.html</welcome-file> @@ -145,6 +150,11 @@ <location>/404.html</location> </error-page> + <error-page> + <error-code>405</error-code> + <location>/405.html</location> + </error-page> + <!-- Confidentiality --> <security-constraint> <web-resource-collection> -- To view, visit http://gerrit.ovirt.org/31846 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3029915d10f3df830f3040dc1269ac4607e33ac7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
