[jboss-cvs] JBossAS SVN: r104767 - in branches/JBPAPP_5_0: tomcat/src/webapps/ROOT.war/WEB-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 13 11:15:07 EDT 2010
Author: bshim
Date: 2010-05-13 11:15:06 -0400 (Thu, 13 May 2010)
New Revision: 104767
Added:
branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/jboss-web.xml
Modified:
branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml
Log:
JBPAPP-3171 - tomcat status servlet secured with jmx-console security domain
Modified: branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2010-05-13 14:49:20 UTC (rev 104766)
+++ branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch 2010-05-13 15:15:06 UTC (rev 104767)
@@ -793,3 +793,163 @@
</list>
</property>
<depends>ConnectorMBean</depends>
+diff -Naur ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 15:39:33.000000000 -0400
++++ ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 16:09:03.000000000 -0400
+@@ -6,6 +6,7 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+- <security-domain>java:/jaas/jmx-console</security-domain>
++
+ </jboss-web>
+diff -Naur ./server/production/deploy/ROOT.war/WEB-INF/web.xml ./server/production/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/production/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:04:10.000000000 -0400
++++ ./server/production/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:07:20.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
++
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,6 +35,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 15:39:33.000000000 -0400
++++ ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 16:09:03.000000000 -0400
+@@ -6,6 +6,7 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+- <security-domain>java:/jaas/jmx-console</security-domain>
++
+ </jboss-web>
+diff -Naur ./server/all/deploy/ROOT.war/WEB-INF/web.xml ./server/all/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/all/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:04:10.000000000 -0400
++++ ./server/all/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:07:20.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
++
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,6 +35,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 15:39:33.000000000 -0400
++++ ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 16:09:03.000000000 -0400
+@@ -6,6 +6,7 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+- <security-domain>java:/jaas/jmx-console</security-domain>
++
+ </jboss-web>
+diff -Naur ./server/default/deploy/ROOT.war/WEB-INF/web.xml ./server/default/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/default/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:04:10.000000000 -0400
++++ ./server/default/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:07:20.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
++
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,6 +35,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 15:39:33.000000000 -0400
++++ ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 16:09:03.000000000 -0400
+@@ -6,6 +6,7 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+- <security-domain>java:/jaas/jmx-console</security-domain>
++
+ </jboss-web>
+diff -Naur ./server/standard/deploy/ROOT.war/WEB-INF/web.xml ./server/standard/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/standard/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:04:10.000000000 -0400
++++ ./server/standard/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:07:20.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
++
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,6 +35,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 15:39:33.000000000 -0400
++++ ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 16:09:03.000000000 -0400
+@@ -6,6 +6,7 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+- <security-domain>java:/jaas/jmx-console</security-domain>
++
+ </jboss-web>
+diff -Naur ./server/web/deploy/ROOT.war/WEB-INF/web.xml ./server/web/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/web/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:04:10.000000000 -0400
++++ ./server/web/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 16:07:20.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+- -->
++
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,6 +35,7 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
++ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
Modified: branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch 2010-05-13 14:49:20 UTC (rev 104766)
+++ branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch 2010-05-13 15:15:06 UTC (rev 104767)
@@ -934,3 +934,163 @@
</security-role>
<!--
+diff -Naur ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/production/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -6,7 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+-
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ </jboss-web>
+diff -Naur ./server/production/deploy/ROOT.war/WEB-INF/web.xml ./server/production/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/production/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/production/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+-
++ -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,7 +35,6 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+- -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/all/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -6,7 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+-
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ </jboss-web>
+diff -Naur ./server/all/deploy/ROOT.war/WEB-INF/web.xml ./server/all/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/all/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/all/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+-
++ -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,7 +35,6 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+- -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/default/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -6,7 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+-
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ </jboss-web>
+diff -Naur ./server/default/deploy/ROOT.war/WEB-INF/web.xml ./server/default/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/default/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/default/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+-
++ -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,7 +35,6 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+- -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/standard/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -6,7 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+-
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ </jboss-web>
+diff -Naur ./server/standard/deploy/ROOT.war/WEB-INF/web.xml ./server/standard/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/standard/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/standard/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+-
++ -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,7 +35,6 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+- -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+diff -Naur ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml
+--- ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/web/deploy/ROOT.war/WEB-INF/jboss-web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -6,7 +6,6 @@
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+- <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+-
++ <security-domain>java:/jaas/jmx-console</security-domain>
+ </jboss-web>
+diff -Naur ./server/web/deploy/ROOT.war/WEB-INF/web.xml ./server/web/deploy/ROOT.war/WEB-INF/web.xml
+--- ./server/web/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:57:48.000000000 -0400
++++ ./server/web/deploy/ROOT.war/WEB-INF/web.xml 2010-05-11 13:58:25.000000000 -0400
+@@ -22,7 +22,7 @@
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+-
++ -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+@@ -35,7 +35,6 @@
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+- -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
Added: branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/jboss-web.xml (rev 0)
+++ branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/jboss-web.xml 2010-05-13 15:15:06 UTC (rev 104767)
@@ -0,0 +1,12 @@
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
+
+<jboss-web>
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users.
+ <security-domain>java:/jaas/jmx-console</security-domain>
+ -->
+
+</jboss-web>
Modified: branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml 2010-05-13 14:49:20 UTC (rev 104766)
+++ branches/JBPAPP_5_0/tomcat/src/webapps/ROOT.war/WEB-INF/web.xml 2010-05-13 15:15:06 UTC (rev 104767)
@@ -17,4 +17,32 @@
<servlet-name>Status Servlet</servlet-name>
<url-pattern>/status</url-pattern>
</servlet-mapping>
+
+ <!-- A security constraint that restricts access to the status servlet
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console.
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+ <description>An example security config that only allows users with the
+ role JBossAdmin to access the HTML JMX console web application
+ </description>
+ <url-pattern>/status/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+ -->
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Tomcat STATUS</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
</web-app>
More information about the jboss-cvs-commits
mailing list