Commit 85a244cd authored by Andre Freyssinet's avatar Andre Freyssinet

Test Joram-372.

Test the use of client authentication configuration (JORAM-368).
parent 2cb29d2d
...@@ -495,6 +495,7 @@ ...@@ -495,6 +495,7 @@
<antcall target="noreg.test61"/> <antcall target="noreg.test61"/>
<antcall target="noreg.test62"/> <antcall target="noreg.test62"/>
<antcall target="noreg.test63"/> <antcall target="noreg.test63"/>
<antcall target="noreg.test64"/>
</target> </target>
<target name="tests.xa" <target name="tests.xa"
...@@ -636,6 +637,10 @@ ...@@ -636,6 +637,10 @@
<target name="tests.ssl" <target name="tests.ssl"
description=" --> launch all ssl tests"> description=" --> launch all ssl tests">
<antcall target="ssl.test"/> <antcall target="ssl.test"/>
<antcall target="ssl.noneclientauth"/>
<antcall target="ssl.wantclientauth1"/>
<antcall target="ssl.wantclientauth2"/>
<antcall target="ssl.needclientauth"/>
</target> </target>
<target name="tests.jca" description=" --> test joram connector"> <target name="tests.jca" description=" --> test joram connector">
...@@ -4945,6 +4950,17 @@ ...@@ -4945,6 +4950,17 @@
</antcall> </antcall>
</target> </target>
<target name="noreg.test64" depends="init.a3props,compile"
description=" --> Test context cleaning in case of server dead.">
<antcall target="test.run" inheritAll="true">
<param name="className" value="joram.noreg.Test64"/>
<param name="testid" value="noreg.test64"/>
<param name="jndiconf" value="noreg/jndi.properties"/>
<param name="a3conf" value="noreg/a3servers1.xml"/>
<param name="jvmargs" value=""/>
</antcall>
</target>
<!-- end noreg --> <!-- end noreg -->
<!-- test with bug --> <!-- test with bug -->
...@@ -6491,26 +6507,92 @@ ...@@ -6491,26 +6507,92 @@
<!-- Initializes the ssl centralized configuration --> <!-- Initializes the ssl centralized configuration -->
<target name="sslsimple_init" depends="init.a3props,compile"> <target name="sslsimple_init" depends="init.a3props,compile">
<property name="keystore" location="${test.dir}/joram_ks"/>
<property name="keystore_pass" value="jorampass"/>
<antcall target="init.test" inheritAll="true"> <antcall target="init.test" inheritAll="true">
<param name="jvmargs" value=""/> <param name="jvmargs" value=""/>
<param name="args" value=""/> <param name="args" value=""/>
<param name="a3conf" value="ssl/a3servers.xml"/>
<param name="jndiconf" value="ssl/jndi.properties"/>
</antcall> </antcall>
<copy file="ssl/joram_ks" todir="${test.dir}"/> <copy file="ssl/${mom.keystore}" todir="${test.dir}"/>
<copy file="ssl/${client.keystore}" todir="${test.dir}"/>
</target> </target>
<target name="ssl.base" depends="sslsimple_init"
<target name="ssl.test" depends="sslsimple_init"
description=" --> test with ssl conection"> description=" --> test with ssl conection">
<java classname="joram.ssl.Test" failonerror="no" fork="yes" dir="${test.dir}"> <java classname="joram.ssl.Test" failonerror="no" fork="yes" dir="${test.dir}">
<classpath path="${project.class.path}"/> <classpath path="${project.class.path}"/>
<jvmarg line="-Dfelix.dir=${felix.dir} -Dorg.objectweb.joram.keystore=${keystore} -Dorg.objectweb.joram.keystorepass=${keystore_pass} -Dframework.TestCase.OutFile=${report.file} "/> <jvmarg line="-Dfelix.dir=${felix.dir} -Dclient.ks=${test.dir}/${client.keystore} -Dclient.pass=${client.pass} -Dclient.auth=${client.auth} -Dserver.ks=${test.dir}/${mom.keystore} -Dserver.pass=${mom.pass} -Dframework.TestCase.TestId=${testid} -Dframework.TestCase.OutFile=${report.file} ${jvmargs}"/>
</java> </java>
</target> </target>
<target name="ssl.test" description=" --> test with ssl conection">
<antcall target="ssl.base" inheritAll="true">
<param name="classname" value="joram.ssl.Test"/>
<param name="testid" value="ssl.test"/>
<param name="mom.keystore" value="joram_ks"/>
<param name="mom.pass" value="jorampass"/>
<param name="client.auth" value="NEED"/>
<param name="client.keystore" value="joram_ks"/>
<param name="client.pass" value="jorampass"/>
<param name="a3conf" value="ssl/a3servers.xml"/>
<param name="jndiconf" value="ssl/jndi.properties"/>
</antcall>
</target>
<target name="ssl.noneclientauth" description=" --> test with ssl conection, no authentication">
<antcall target="ssl.base" inheritAll="true">
<param name="classname" value="joram.ssl.Test"/>
<param name="testid" value="ssl.noneclientauth"/>
<param name="mom.keystore" value="keystore_srv.jks"/>
<param name="mom.pass" value="jorampass"/>
<param name="client.auth" value="NONE"/>
<param name="client.keystore" value="keystore_ca.jks"/>
<param name="client.pass" value="jorampass"/>
<param name="a3conf" value="ssl/a3servers.xml"/>
<param name="jndiconf" value="ssl/jndi.properties"/>
</antcall>
</target>
<target name="ssl.wantclientauth1" description=" --> test with ssl conection, authentication wanted, not provided">
<antcall target="ssl.base" inheritAll="true">
<param name="classname" value="joram.ssl.Test"/>
<param name="testid" value="ssl.wantclientauth1"/>
<param name="mom.keystore" value="keystore_srv_ca.jks "/>
<param name="mom.pass" value="jorampass"/>
<param name="client.auth" value="WANT"/>
<param name="client.keystore" value="keystore_ca.jks"/>
<param name="client.pass" value="jorampass"/>
<param name="a3conf" value="ssl/a3servers.xml"/>
<param name="jndiconf" value="ssl/jndi.properties"/>
</antcall>
</target>
<target name="ssl.wantclientauth2" description=" --> test with ssl conection, authentication wanted, done">
<antcall target="ssl.base" inheritAll="true">
<param name="classname" value="joram.ssl.Test"/>
<param name="testid" value="ssl.wantclientauth2"/>
<param name="mom.keystore" value="keystore_srv_ca.jks "/>
<param name="mom.pass" value="jorampass"/>
<param name="client.auth" value="WANT"/>
<param name="client.keystore" value="keystore_clt_ca.jks"/>
<param name="client.pass" value="jorampass"/>
<param name="a3conf" value="ssl/a3servers.xml"/>
<param name="jndiconf" value="ssl/jndi.properties"/>
</antcall>
</target>
<target name="ssl.needclientauth" description=" --> test with ssl conection, authentication needed">
<antcall target="ssl.base" inheritAll="true">
<param name="classname" value="joram.ssl.Test"/>
<param name="testid" value="ssl.needclientauth"/>
<param name="mom.keystore" value="keystore_srv_ca.jks "/>
<param name="mom.pass" value="jorampass"/>
<param name="client.auth" value="NEED"/>
<param name="client.keystore" value="keystore_clt_ca.jks "/>
<param name="client.pass" value="jorampass"/>
<param name="a3conf" value="ssl/a3servers.xml"/>
<param name="jndiconf" value="ssl/jndi.properties"/>
</antcall>
</target>
<!-- end test ssl --> <!-- end test ssl -->
<!-- start JCA tests --> <!-- start JCA tests -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment