You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by we...@apache.org on 2004/06/02 21:37:02 UTC
cvs commit: ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping deploy.wsdd
werner 2004/06/02 12:37:02
Modified: wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
wss4j/interop/org/apache/ws/axis/oasis/ping deploy.wsdd
Log:
WSFX-9: Implement explicit timestamp handling, patches from Christof.
Add explicit Timestamp action in deployment descriptors.
Revision Changes Path
1.21 +12 -12 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
Index: Client_deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Client_deploy.wsdd 30 May 2004 09:26:10 -0000 1.20
+++ Client_deploy.wsdd 2 Jun 2004 19:37:02 -0000 1.21
@@ -52,7 +52,7 @@
<service name="Ping3">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<!-- Use the Client's cert/key to sign the request -->
<parameter name="user" value="7706c71b0628d6ecc85ea1e8ad62be60_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -67,7 +67,7 @@
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</responseFlow>
@@ -76,7 +76,7 @@
<service name="Ping4">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<!-- Use the Client's cert/key to sign the request -->
<parameter name="user" value="7706c71b0628d6ecc85ea1e8ad62be60_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -93,7 +93,7 @@
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback"/>
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</responseFlow>
@@ -113,7 +113,7 @@
<parameter name="signatureParts" value="{}{http://xmlsoap.org/Ping}ticket" />
</handler>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature"/>
+ <parameter name="action" value="Signature Timestamp"/>
<!-- Use the Client's cert/key to sign the request -->
<parameter name="user" value="7706c71b0628d6ecc85ea1e8ad62be60_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -127,7 +127,7 @@
<service name="Ping6">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Encrypt Signature"/>
+ <parameter name="action" value="Encrypt Signature Timestamp"/>
<!-- Use the Client's cert/key to sign the request -->
<parameter name="user" value="7706c71b0628d6ecc85ea1e8ad62be60_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -142,7 +142,7 @@
<responseFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Encrypt Signature"/>
+ <parameter name="action" value="Encrypt Signature Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</responseFlow>
@@ -152,7 +152,7 @@
<service name="Ping7">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="user" value="7706c71b0628d6ecc85ea1e8ad62be60_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
<parameter name="signatureKeyIdentifier" value="DirectReference" />
@@ -168,7 +168,7 @@
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
<parameter name="decryptionPropFile" value="wsstest.properties" />
</handler>
@@ -178,7 +178,7 @@
<service name="STPing1">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="SAMLTokenUnsigned"/>
+ <parameter name="action" value="Timestamp SAMLTokenUnsigned"/>
<parameter name="samlPropFile" value="saml.properties"/>
</handler>
@@ -201,7 +201,7 @@
<service name="STPing3">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="SAMLTokenSigned"/>
+ <parameter name="action" value="Timestamp SAMLTokenSigned"/>
<parameter name="samlPropFile" value="saml3.properties"/>
<parameter name="signatureKeyIdentifier" value="DirectReference" />
</handler>
@@ -224,7 +224,7 @@
<service name="STPing4">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="SAMLTokenSigned"/>
+ <parameter name="action" value="Timestamp SAMLTokenSigned"/>
<parameter name="samlPropFile" value="saml4.properties"/>
<parameter name="signatureKeyIdentifier" value="DirectReference" />
<parameter name="user" value="16c73ab6-b892-458f-abf5-2f875f74882e"/>
1.20 +12 -12 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
Index: deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- deploy.wsdd 30 May 2004 09:26:10 -0000 1.19
+++ deploy.wsdd 2 Jun 2004 19:37:02 -0000 1.20
@@ -92,13 +92,13 @@
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</requestFlow>
<responseFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<!-- Use the Server's cert/key to sign the response -->
<parameter name="user" value="86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -135,13 +135,13 @@
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</requestFlow>
<responseFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<!-- Use the Server's cert/key to sign the response -->
<parameter name="user" value="86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -179,7 +179,7 @@
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Signature Signature"/>
+ <parameter name="action" value="Signature Signature Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</requestFlow>
@@ -208,13 +208,13 @@
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Encrypt Signature"/>
+ <parameter name="action" value="Encrypt Signature Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
</handler>
</requestFlow>
<responseFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Encrypt Signature"/>
+ <parameter name="action" value="Encrypt Signature Timestamp"/>
<!-- Use the Server's cert/key to sign the response -->
<parameter name="user" value="86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -252,14 +252,14 @@
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
<parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<parameter name="signaturePropFile" value="wsstest.properties" />
<parameter name="decryptionPropFile" value="wsstest.properties" />
</handler>
</requestFlow>
<responseFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="action" value="Signature Encrypt"/>
+ <parameter name="action" value="Signature Encrypt Timestamp"/>
<!-- Use the Server's cert/key to sign the response -->
<parameter name="user" value="86ab6c4828bcde6983d81b2b59ff426c_a8272f6f-2c94-436e-aa71-d8d2be4647f6"/>
<parameter name="passwordCallbackClass"
@@ -296,7 +296,7 @@
/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
- <parameter name="action" value="SAMLTokenUnsigned"/>
+ <parameter name="action" value="Timestamp SAMLTokenUnsigned"/>
</handler>
</requestFlow>
</service>
@@ -333,7 +333,7 @@
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
- <parameter name="action" value="Signature SAMLTokenUnsigned"/>
+ <parameter name="action" value="Timestamp Signature SAMLTokenUnsigned"/>
<parameter name="signaturePropFile" value="crypto.properties" />
</handler>
@@ -371,7 +371,7 @@
-->
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
- <parameter name="action" value="Signature SAMLTokenUnsigned"/>
+ <parameter name="action" value="Timestamp Signature SAMLTokenUnsigned"/>
<parameter name="signaturePropFile" value="crypto.properties" />
</handler>