From: markt Date: Sun, 23 May 2010 10:46:40 +0000 (+0000) Subject: Align host-manager role names with manager role names. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=38563fce78ed2dc0d9ab3614562edc41faef291d;p=tomcat7.0 Align host-manager role names with manager role names. Add a 403 page to inform users of changed role name. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@947396 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/webapps/host-manager/401.jsp b/webapps/host-manager/401.jsp index db9b03a08..b2d9deb96 100644 --- a/webapps/host-manager/401.jsp +++ b/webapps/host-manager/401.jsp @@ -39,13 +39,13 @@ file must contain the credentials to let you use this webapp.

- For example, to add the admin role to a user named + For example, to add the admin-gui role to a user named tomcat with a password of s3cret, add the following to the config file listed above. 

-<role rolename="admin"/>
-<user username="tomcat" password="s3cret" roles="admin"/>
+<role rolename="admin-gui"/>
+<user username="tomcat" password="s3cret" roles="admin-gui"/>

Note that for Tomcat 7 onwards, the roles required to use the host manager diff --git a/webapps/host-manager/403.jsp b/webapps/host-manager/403.jsp new file mode 100644 index 000000000..078a35d2b --- /dev/null +++ b/webapps/host-manager/403.jsp @@ -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\""); +%> + + + + 403 Access Denied + + + +

403 Access Denied

+

+ You are not authorized to view this page. If you have not changed + any configuration files, please examine the file + conf/tomcat-users.xml in your installation. That + file must contain the credentials to let you use this webapp. +

+

+ For example, to add the admin-gui role to a user named + tomcat with a password of s3cret, add the following to the + config file listed above. +

+
+<role rolename="admin-gui"/>
+<user username="tomcat" password="s3cret" roles="admin-gui"/>
+
+

+ Note that for Tomcat 7 onwards, the roles required to use the host manager + application were changed from the single admin role to the + following two roles. You will need to assign the role(s) required for + the functionality you wish to access. +

+ + + + diff --git a/webapps/host-manager/WEB-INF/web.xml b/webapps/host-manager/WEB-INF/web.xml index 7e0096745..f65f016c7 100644 --- a/webapps/host-manager/WEB-INF/web.xml +++ b/webapps/host-manager/WEB-INF/web.xml @@ -80,7 +80,7 @@ - admin + admin-gui @@ -96,7 +96,7 @@ The role that is required to log in to the Host Manager Application HTML interface - admin + admin-gui @@ -111,6 +111,10 @@ /401.jsp + 403 + /403.jsp + + 404 /404.jsp