[Jboss-cvs] JBossAS SVN: r55385 - in trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy: . jbossweb-tomcat6.sar jbossweb-tomcat6.sar/META-INF

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2006-08-07 17:25:41 -0400 (Mon, 07 Aug 2006)
New Revision: 55385

Added:
   trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/keystore.password
Modified:
   trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml
   trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/server.xml
   trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml
Log:
JBAS-3369:encrypt keystore pass in tomcat connectors

Modified: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml	2006-08-07 21:20:14 UTC (rev 55384)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/META-INF/jboss-service.xml	2006-08-07 21:25:41 UTC (rev 55385)
@@ -77,6 +77,7 @@
 
       <attribute name="Domain">jboss.web</attribute>
       <depends>jboss.security:service=SecurityDomain</depends>
+      <depends>jboss.security:service=PBESecurityDomain</depends>
    </mbean>
 
 </server>

Modified: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/server.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/server.xml	2006-08-07 21:20:14 UTC (rev 55384)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb-tomcat6.sar/server.xml	2006-08-07 21:25:41 UTC (rev 55385)
@@ -35,6 +35,14 @@
          sslProtocol = "TLS" securityDomain="java:/jaas/jbosstest-ssl"
          SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
 
+      <!-- SSL/TLS Connector with encrypted keystore password configuration  -->
+      <Connector port="9943" address="${jboss.bind.address}"
+           maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+           scheme="https" secure="true" clientAuth="true"
+         sslProtocol = "TLS" 
+         securityDomain="java:/jaas/encrypt-keystore-password"
+         SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
+
       <Engine name="jboss.web" defaultHost="localhost">
 
          <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"

Added: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/keystore.password
===================================================================
(Binary files differ)


Property changes on: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/keystore.password
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml	2006-08-07 21:20:14 UTC (rev 55384)
+++ trunk/testsuite/src/resources/test-configs/tomcat-ssl/deploy/security-service.xml	2006-08-07 21:25:41 UTC (rev 55385)
@@ -1,5 +1,4 @@
 <server>
-
    <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
       name="jboss.security:service=SecurityDomain">
       <constructor>
@@ -9,5 +8,14 @@
       <attribute name="KeyStorePass">unit-tests-server</attribute>
    </mbean>
 
+   <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+      name="jboss.security:service=PBESecurityDomain">
+      <constructor>
+         <arg type="java.lang.String" value="encrypt-keystore-password"/>
+      </constructor>
+      <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
+      <attribute name="KeyStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
+      <attribute name="Salt">welcometojboss</attribute>
+      <attribute name="IterationCount">13</attribute>
+   </mbean>
 </server>
-