Author: markt
Date: Sun May 23 10:46:40 2010
New Revision: 947396
URL: http://svn.apache.org/viewvc?rev=947396&view=rev
Log:
Align host-manager role names with manager role names.
Add a 403 page to inform users of changed role name.
Added:
tomcat/trunk/webapps/host-manager/403.jsp (with props)
Modified:
tomcat/trunk/webapps/host-manager/401.jsp
tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
Modified: tomcat/trunk/webapps/host-manager/401.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/401.jsp?rev=947396&r1=947395&r2=947396&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/401.jsp (original)
+++ tomcat/trunk/webapps/host-manager/401.jsp Sun May 23 10:46:40 2010
@@ -39,13 +39,13 @@
file must contain the credentials to let you use this webapp.
</p>
<p>
- For example, to add the <tt>admin</tt> role to a user named
+ For example, to add the <tt>admin-gui</tt> role to a user named
<tt>tomcat</tt> with a password of <tt>s3cret</tt>, add the following to
the
config file listed above.
</p>
<pre>
-<role rolename="admin"/>
-<user username="tomcat" password="s3cret" roles="admin"/>
+<role rolename="admin-gui"/>
+<user username="tomcat" password="s3cret" roles="admin-gui"/>
</pre>
<p>
Note that for Tomcat 7 onwards, the roles required to use the host manager
Added: tomcat/trunk/webapps/host-manager/403.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/403.jsp?rev=947396&view=auto
==============================================================================
--- tomcat/trunk/webapps/host-manager/403.jsp (added)
+++ tomcat/trunk/webapps/host-manager/403.jsp Sun May 23 10:46:40 2010
@@ -0,0 +1,62 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%
+ response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Host Manager
Application\"");
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
+<html>
+ <head>
+ <title>403 Access Denied</title>
+ <style type="text/css">
+ <!--
+ BODY
{font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;font-size:12px;}
+ H1
{font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
+ PRE, TT {border: 1px dotted #525D76}
+ A {color : black;}A.name {color : black;}
+ -->
+ </style>
+ </head>
+ <body>
+ <h1>403 Access Denied</h1>
+ <p>
+ You are not authorized to view this page. If you have not changed
+ any configuration files, please examine the file
+ <tt>conf/tomcat-users.xml</tt> in your installation. That
+ file must contain the credentials to let you use this webapp.
+ </p>
+ <p>
+ For example, to add the <tt>admin-gui</tt> role to a user named
+ <tt>tomcat</tt> with a password of <tt>s3cret</tt>, add the following to
the
+ config file listed above.
+ </p>
+<pre>
+<role rolename="admin-gui"/>
+<user username="tomcat" password="s3cret" roles="admin-gui"/>
+</pre>
+ <p>
+ Note that for Tomcat 7 onwards, the roles required to use the host manager
+ application were changed from the single <tt>admin</tt> role to the
+ following two roles. You will need to assign the role(s) required for
+ the functionality you wish to access.
+ </p>
+ <ul>
+ <li><tt>admin-gui</tt> - allows access to the HTML GUI</li>
+ <li><tt>admin-script</tt> - allows access to the text interface</li>
+ </ul>
+ </body>
+
+</html>
Propchange: tomcat/trunk/webapps/host-manager/403.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/webapps/host-manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/WEB-INF/web.xml?rev=947396&r1=947395&r2=947396&view=diff
==============================================================================
--- tomcat/trunk/webapps/host-manager/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/host-manager/WEB-INF/web.xml Sun May 23 10:46:40 2010
@@ -80,7 +80,7 @@
</web-resource-collection>
<auth-constraint>
<!-- NOTE: This role is not present in the default users file -->
- <role-name>admin</role-name>
+ <role-name>admin-gui</role-name>
</auth-constraint>
</security-constraint>
@@ -96,7 +96,7 @@
The role that is required to log in to the Host Manager Application HTML
interface
</description>
- <role-name>admin</role-name>
+ <role-name>admin-gui</role-name>
</security-role>
<security-role>
<description>
@@ -111,6 +111,10 @@
<location>/401.jsp</location>
</error-page>
<error-page>
+ <error-code>403</error-code>
+ <location>/403.jsp</location>
+ </error-page>
+ <error-page>
<error-code>404</error-code>
<location>/404.jsp</location>
</error-page>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
