Skip to content

Commit 6d9f23a

Browse files
tulinkryVladimir Kotal
authored andcommitted
display default 403 forbidden page when there is no customization (#1591)
fixes #1585
1 parent 4a9197c commit 6d9f23a

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

src/org/opensolaris/opengrok/web/AuthorizationFilter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) thr
6060
config.getEnv().getStatistics().addRequestTime(httpReq,
6161
"requests_forbidden",
6262
System.currentTimeMillis() - processTime);
63+
64+
if (!config.getEnv().getConfiguration().getForbiddenIncludeFileContent().isEmpty()) {
65+
sr.getRequestDispatcher("/eforbidden").forward(sr, sr1);
66+
return;
67+
}
6368
httpRes.sendError(403, "Access forbidden");
6469
return;
6570
}

web/WEB-INF/web.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@
200200
<error-code>500</error-code>
201201
<location>/error</location>
202202
</error-page>
203-
<error-page>
204-
<error-code>403</error-code>
205-
<location>/eforbidden</location>
206-
</error-page>
207203
<jsp-config>
208204
<jsp-property-group>
209205
<url-pattern>*.jsp</url-pattern>

web/eforbidden.jsp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ information: Portions Copyright [yyyy] [name of copyright owner]
1717
CDDL HEADER END
1818
1919
Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
20-
--%><%@page session="false" isErrorPage="true" import="
20+
--%><%@page session="false" import="
2121
org.opensolaris.opengrok.web.PageConfig"
2222
%><%
23-
/* ---------------------- eforbidden.jspf start --------------------- */
24-
{
23+
/* ---------------------- eforbidden.jspf start --------------------- */
24+
{
25+
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
2526
%>
26-
<%= PageConfig.get(request).getEnv().getConfiguration().getForbiddenIncludeFileContent()%>
27+
<%= PageConfig.get(request).getEnv().getConfiguration().getForbiddenIncludeFileContent() %>
2728
<%
28-
}
29-
/* ---------------------- eforbidden.jspf end --------------------- */
29+
}
30+
/* ---------------------- eforbidden.jspf end --------------------- */
3031
%>

0 commit comments

Comments
 (0)