[JBWS-4048] Elytron integration

* Add Elytron configuration * Fix realm configuration * Fix wsse jaas security tests * Add elytron test configuration * Elytron requires add some special comment in property file * Fix more test failures for elytron integration * Correct elytron configuration * Fix JAASJBossWSDigestRealm * Fix elytron configuration groovy for tests
jbossws · Jan 11, 2017 · 1d9984a · 1d9984a
1 parent 21a98f9
commit 1d9984a
Show file tree

Hide file tree

Showing 12 changed files with 688 additions and 5 deletions.
diff --git a/modules/testsuite/cxf-tests/pom.xml b/modules/testsuite/cxf-tests/pom.xml
@@ -376,6 +376,94 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>elytron</id>
+      <activation>
+        <property>
+          <name>elytron</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>elytron-testsuite-default</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-default-elytron.groovy</source>
+                  <properties>
+                    <inputFile>${jboss.home}/standalone/configuration/standalone-elytron.xml</inputFile>
+                    <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default.xml</outputFile>
+                    <serverLog>jbws-testsuite-default.log</serverLog>
+                    <usersPropFile>${project.build.directory}/test-classes/jbossws-users.properties</usersPropFile>
+                    <rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile>
+                    <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath>
+                    <testResourcesDir>${project.build.directory}/test-resources</testResourcesDir>
+                  </properties>
+                </configuration>
+              </execution>
+              <!--execution>
+                <id>testsuite-ssl-mutual-auth</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-ssl-mutual-auth-elytron.groovy</source>
+                  <properties>
+                    <inputFile>${jboss.home}/standalone/configuration/standalone-elytron.xml</inputFile>
+                    <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-ssl-mutual-auth.xml</outputFile>
+                    <serverLog>jbws-testsuite-ssl-mutual-auth.log</serverLog>
+                    <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath>
+                    <truststorePath>${project.build.directory}/test-classes/test.truststore</truststorePath>
+                  </properties>
+                </configuration>
+              </execution>
+              <execution>
+                <id>testsuite-default-config-tests</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-default-config-tests-elytron.groovy</source>
+                  <properties>
+                    <inputFile>${jboss.home}/standalone/configuration/standalone-elytron.xml</inputFile>
+                    <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml</outputFile>
+                    <serverLog>jbws-testsuite-default-config-tests.log</serverLog>
+                  </properties>
+                </configuration>
+              </execution>
+              <execution>
+                <id>testsuite-jms</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <source>${basedir}/src/test/scripts/jbws-testsuite-jms-${jbossws.integration.target}.groovy</source>
+                  <properties>
+                    <inputFile>${jboss.home}/standalone/configuration/standalone-full.xml</inputFile>
+                    <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-jms-${jbossws.integration.target}.xml</outputFile>
+                    <serverLog>jbws-testsuite-jms.log</serverLog>
+                    <srcUsersProperties>${project.build.directory}/test-classes/jbws-application-users.properties</srcUsersProperties>
+                    <destUsersProperties>${jboss.home}/standalone/configuration/jbws-application-users.properties</destUsersProperties>
+                    <srcRolesProperties>${project.build.directory}/test-classes/jbws-application-roles.properties</srcRolesProperties>
+                    <destRolesProperties>${jboss.home}/standalone/configuration/jbws-application-roles.properties</destRolesProperties>
+                  </properties>
+                </configuration>
+              </execution-->
+            </executions>
+          </plugin>
+         </plugins>
+        </build>
+       </profile>
 
   </profiles>
 

diff --git a/modules/testsuite/cxf-tests/src/test/etc/jbossws-users.properties b/modules/testsuite/cxf-tests/src/test/etc/jbossws-users.properties
@@ -1,2 +1,4 @@
 # A sample users.properties file for use with the UsersRolesLoginModule
-kermit=thefrog
+#Elytron requires this
+#$REALM_NAME=JBOSSWS$ This line is used by the add-user utility to identify the realm name already used in this file.
+kermit=thefrog
diff --git a/...tsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/ws-digest-users.properties b/...tsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/ws-digest-users.properties
@@ -0,0 +1,2 @@
+#$REALM_NAME=ws-digest-domain$ This line is used by the add-user utility to identify the realm name already used in this file.
+jbossws=148f15e82b7877e306261fff94a6ee16
diff --git a/...les/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/ws-users.properties b/...les/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/ws-users.properties
@@ -1 +1,2 @@
+#$REALM_NAME=ws-basic-domain$ This line is used by the add-user utility to identify the realm name already used in this file.
 jbossws=jbossws
diff --git a/...te/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/jboss-web.xml b/...te/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/jboss-web.xml
@@ -3,5 +3,5 @@
 <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 
 <jboss-web>
-   <security-domain>java:/jaas/JBossWS</security-domain>
+   <security-domain>java:/jaas/JAASJBossWS</security-domain>
 </jboss-web>