cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r749525 - in /cxf/sandbox/interopfest/wstrust10: build.xml src/main/java/interop/client/Client.java src/main/resources/etc/client.xml src/style/makelocal.xsl
Date Tue, 03 Mar 2009 04:22:14 GMT
Author: dkulp
Date: Tue Mar  3 04:22:13 2009
New Revision: 749525

URL: http://svn.apache.org/viewvc?rev=749525&view=rev
Log:
More updates to get trust working

Modified:
    cxf/sandbox/interopfest/wstrust10/build.xml
    cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
    cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
    cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl

Modified: cxf/sandbox/interopfest/wstrust10/build.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/build.xml?rev=749525&r1=749524&r2=749525&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/build.xml (original)
+++ cxf/sandbox/interopfest/wstrust10/build.xml Tue Mar  3 04:22:13 2009
@@ -1,17 +1,19 @@
 <project name="wssec11" default="download">
     <property name="build.dir" location="target"/>
+    <property name="host" value="131.107.72.15"/>
+   
     <target name="download.internal" if="needsToDownload">
         <mkdir dir="${build.dir}/generated/src/main/resources/certs"/>
         <mkdir dir="${build.dir}/wsdl"/>
         <get src="http://131.107.72.15/ilab/Certs/Certs.zip" dest="${build.dir}/Certs.zip"/>
-        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl"
dest="${build.dir}/wsdl/WsTrustSym.wsdl"/>
-        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0"
dest="${build.dir}/wsdl/WsTrustSym_policy.wsdl"/>
+        <get src="http://${host}/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl"
dest="${build.dir}/wsdl/WsTrustSym.wsdl"/>
+        <get src="http://${host}/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0"
dest="${build.dir}/wsdl/WsTrustSym_policy.wsdl"/>
 
-        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl"
dest="${build.dir}/wsdl/WsTrustAsym.wsdl"/>
-        <get src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl=wsdl0"
dest="${build.dir}/wsdl/WsTrustAsym_policy.wsdl"/>
+        <get src="http://${host}/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl"
dest="${build.dir}/wsdl/WsTrustAsym.wsdl"/>
+        <get src="http://${host}/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl=wsdl0"
dest="${build.dir}/wsdl/WsTrustAsym_policy.wsdl"/>
 
-        <get src="http://131.107.72.15/Security_Federation_SecurityTokenService_Indigo/Asymmetric.svc?wsdl"
dest="${build.dir}/wsdl/STSAsym.wsdl"/>
-        <get src="http://131.107.72.15/Security_Federation_SecurityTokenService_Indigo/Symmetric.svc?wsdl"
dest="${build.dir}/wsdl/STSSym.wsdl"/>
+        <get src="http://${host}/Security_Federation_SecurityTokenService_Indigo/Asymmetric.svc?wsdl"
dest="${build.dir}/wsdl/STSAsym.wsdl"/>
+        <get src="http://${host}/Security_Federation_SecurityTokenService_Indigo/Symmetric.svc?wsdl"
dest="${build.dir}/wsdl/STSSym.wsdl"/>
 
 
         <antcall target="transform"/>

Modified: cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java?rev=749525&r1=749524&r2=749525&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/java/interop/client/Client.java Tue Mar  3
04:22:13 2009
@@ -74,17 +74,17 @@
         
         if (argv.length < 1) {
             argv = new String[] {
-                //"Scenario_1_IssuedTokenOverTransport_UsernameOverTransport", // [1]
+                "Scenario_1_IssuedTokenOverTransport_UsernameOverTransport",
                 "Scenario_2_IssuedToken_MutualCertificate10",
                 "Scenario_5_IssuedTokenForCertificate_MutualCertificate11",
-                "Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
       
+                //"Scenario_6_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
       
                                  
                 //"Scenario_7_IssuedTokenOverTransport_UsernameOverTransport", //[2]
                 //"Scenario_9_IssuedTokenForCertificate_MutualCertificate11", // [2]
                 //"Scenario_10_IssuedTokenForCertificateSecureConversation_MutualCertificate11",
//[2]
             };
         }
-        argv = new String[] {argv[2]};
+        //argv = new String[] {argv[1]};
 
         new SpringBusFactory().createBus("etc/client.xml");
         List<String> results = new ArrayList<String>(argv.length);
@@ -132,8 +132,6 @@
 }
 
 /*
-[1] - The STS is not return a SAML assertion.   It's some bizarre "EncryptedData" element.
 Need to 
-      investigate what to do.
 [2] - RSA KeyValue / Public key thing (not supported by wss4j yet)
 [3] - WSS4J or xml-sec is not able to validate the returned signature from the STS.   The
key ref
       finds the wssip key/alias in the keystore, just the sig doesn't seem valid

Modified: cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml?rev=749525&r1=749524&r2=749525&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml (original)
+++ cxf/sandbox/interopfest/wstrust10/src/main/resources/etc/client.xml Tue Mar  3 04:22:13
2009
@@ -35,6 +35,8 @@
     		<map>
     			<entry key="ws-security.username" value="Alice"/>
     			<entry key="ws-security.password" value="abcd!1234"/>
+            	<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>

+            	<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
     		</map>
     	</property>
     </bean>
@@ -50,6 +52,7 @@
             	<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
             	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

             	<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>

+            	<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>

     		</map>
     	</property>
     </bean>
@@ -65,6 +68,7 @@
             	<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
             	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

             	<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>

+            	<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>

     		</map>
     	</property>
     </bean>
@@ -86,6 +90,7 @@
             	<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
             	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

             	<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>

+            	<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>

     		</map>
     	</property>
     </bean>

Modified: cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl?rev=749525&r1=749524&r2=749525&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl (original)
+++ cxf/sandbox/interopfest/wstrust10/src/style/makelocal.xsl Tue Mar  3 04:22:13 2009
@@ -57,7 +57,7 @@
     <xsl:template match="soap12:address|soap:address">
         <xsl:copy>
             <xsl:choose>
-                <xsl:when test="starts-with(@location,'http://ndgo-introp-s24/')">
+                <!--xsl:when test="starts-with(@location,'http://ndgo-introp-s24/')">
                     <xsl:attribute name="location">http://131.107.153.205/<xsl:value-of
select="substring(@location,24)"/></xsl:attribute>
                 </xsl:when>
                 <xsl:when test="starts-with(@location,'https://ndgo-introp-s24/')">
@@ -65,6 +65,16 @@
                 </xsl:when>
                 <xsl:when test="starts-with(@location,'https://ndgo-introp-s24:8443/')">
                     <xsl:attribute name="location">https://131.107.153.205:8443/<xsl:value-of
select="substring(@location,30)"/></xsl:attribute>
+                </xsl:when-->
+
+                <xsl:when test="starts-with(@location,'http://ndgo-introp-s24/')">
+                    <xsl:attribute name="location">http://131.107.72.15/<xsl:value-of
select="substring(@location,22)"/></xsl:attribute>
+                </xsl:when>
+                <xsl:when test="starts-with(@location,'https://ndgo-introp-s24/')">
+                    <xsl:attribute name="location">https://131.107.72.15/<xsl:value-of
select="substring(@location,23)"/></xsl:attribute>
+                </xsl:when>
+                <xsl:when test="starts-with(@location,'https://ndgo-introp-s24:8443/')">
+                    <xsl:attribute name="location">https://131.107.72.15:8443/<xsl:value-of
select="substring(@location,38)"/></xsl:attribute>
                 </xsl:when>
 
                 <xsl:when test="starts-with(@location,'https://kirillgdev04')">



Mime
View raw message