You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2005/10/23 20:25:20 UTC
svn commit: r327830 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/clientapi/ integration/test-resources/security/
samples/resources/security/ samples/src/sample/security/META-INF/
security/src/org/apache/axis2/security/ security...
Author: ruchithf
Date: Sun Oct 23 11:24:36 2005
New Revision: 327830
URL: http://svn.apache.org/viewcvs?rev=327830&view=rev
Log:
- Changed security configurations to look as described in http://marc.theaimsgroup.com/?l=axis-dev&m=112983906808070&w=2
- Updated the security test cases' and the sample's configuration files
- Updated Call to set the correct OperationDescription which is the OutInOperationDescription
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml
webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml
webservices/axis2/trunk/java/modules/samples/src/sample/security/META-INF/services.xml
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/clientapi/Call.java Sun Oct 23 11:24:36 2005
@@ -105,7 +105,7 @@
OperationDescription opDesc =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
- opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop, WSDLConstants.MEP_CONSTANT_IN_OUT);
+ opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop, WSDLConstants.MEP_CONSTANT_OUT_IN);
MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
if(envelope == null || envelope.getBody() == null){
@@ -134,7 +134,7 @@
throws AxisFault {
OperationDescription opDesc =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
- opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_IN_OUT);
+ opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_OUT_IN);
MessageContext msgctx = prepareTheSOAPEnvelope(toSend);
//call the underline implementation
super.invokeNonBlocking(opDesc, msgctx, callback);
@@ -156,7 +156,7 @@
throws AxisFault {
OperationDescription opDesc =
serviceContext.getServiceConfig().getOperation(new QName(axisop));
- opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_IN_OUT);
+ opDesc = createOpDescAndFillInFlowInformation(opDesc,axisop,WSDLConstants.MEP_CONSTANT_OUT_IN);
MessageContext msgctx = new MessageContext(serviceContext.getEngineContext());
if(envelope == null || envelope.getBody() == null){
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -12,7 +12,8 @@
<!-- Test with addressing and MTOM: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
@@ -22,12 +23,15 @@
<signatureParts>{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}To;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}ReplyTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}MessageID;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp</signatureParts>
<optimizeParts>//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</optimizeParts>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Test with addressing and MTOM: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.xml Sun Oct 23 11:24:36 2005
@@ -6,13 +6,16 @@
</operation>
<parameter name="InflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<user>bob</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
@@ -22,6 +25,7 @@
<signatureParts>{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}To;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}ReplyTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}MessageID;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp</signatureParts>
<optimizeParts>//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</optimizeParts>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -9,10 +9,12 @@
<!-- Scenario 1: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>UsernameToken</action>
+ <action>
+ <items>UsernameToken</items>
<user>Chris</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<passwordType>PasswordText</passwordType>
+ </action>
</parameter>
<!-- Scenario 1: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s1.service.xml Sun Oct 23 11:24:36 2005
@@ -6,8 +6,10 @@
</operation>
<parameter name="InflowSecurity">
- <action>UsernameToken</action>
+ <action>
+ <items>UsernameToken</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 2: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>UsernameToken Encrypt</action>
+ <action>
+ <items>UsernameToken Encrypt</items>
<user>Chris</user>
<addUTElements>Nonce Created</addUTElements>
<encryptionParts>{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken</encryptionParts>
@@ -20,6 +21,7 @@
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<passwordType>PasswordText</passwordType>
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
+ </action>
</parameter>
<!-- Scenario 2: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2.service.xml Sun Oct 23 11:24:36 2005
@@ -6,9 +6,11 @@
</operation>
<parameter name="InflowSecurity">
- <action>UsernameToken Encrypt</action>
+ <action>
+ <items>UsernameToken Encrypt</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<decryptionPropFile>interop.properties</decryptionPropFile>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 2: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>UsernameTokenSignature Encrypt Timestamp</action>
+ <action>
+ <items>UsernameTokenSignature Encrypt Timestamp</items>
<user>Chris</user>
<encryptionParts>{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken</encryptionParts>
<encryptionUser>bob</encryptionUser>
@@ -18,6 +19,7 @@
<encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
+ </action>
</parameter>
<!-- Scenario 2: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s2a.service.xml Sun Oct 23 11:24:36 2005
@@ -6,9 +6,11 @@
</operation>
<parameter name="InflowSecurity">
- <action>UsernameTokenSignature UsernameToken Encrypt Timestamp</action>
+ <action>
+ <items>UsernameTokenSignature UsernameToken Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<decryptionPropFile>interop.properties</decryptionPropFile>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 3: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
@@ -18,12 +19,15 @@
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
<encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
<encryptionUser>bob</encryptionUser>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Scenario 3: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s3.service.xml Sun Oct 23 11:24:36 2005
@@ -6,13 +6,16 @@
</operation>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>bob</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
@@ -20,6 +23,7 @@
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
<encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
<encryptionUser>alice</encryptionUser>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 4: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
@@ -19,12 +20,15 @@
<signaturePropFile>interop.properties</signaturePropFile>
<EmbeddedKeyCallbackClass>org.apache.axis2.security.PWCallback</EmbeddedKeyCallbackClass>
<EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Scenario 4: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s4.service.xml Sun Oct 23 11:24:36 2005
@@ -6,13 +6,16 @@
</operation>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>bob</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signatureKeyIdentifier>SKIKeyIdentifier</signatureKeyIdentifier>
@@ -21,6 +24,7 @@
<signaturePropFile>interop.properties</signaturePropFile>
<EmbeddedKeyCallbackClass>org.apache.axis2.security.PWCallback</EmbeddedKeyCallbackClass>
<EmbeddedKeyName>SessionKey</EmbeddedKeyName>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,19 +10,22 @@
<!-- Scenario 5: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Signature NoSerialization</action>
+
+ <action>
+ <items>Signature NoSerialization</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
<signatureParts>{}{http://xmlsoap.org/Ping}ticket</signatureParts>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
- <repetition count="1">
- <user>alice</user>
- <action>Signature Timestamp</action>
- <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
- <signaturePropFile>interop.properties</signaturePropFile>
- </repetition>
+ <action>
+ <items>Signature Timestamp</items>
+ <user>alice</user>
+ <passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
+ <signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s5.service.xml Sun Oct 23 11:24:36 2005
@@ -6,9 +6,11 @@
</operation>
<parameter name="InflowSecurity">
- <action>Signature Signature Timestamp</action>
+ <action>
+ <items>Signature Signature Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 6: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Encrypt Signature Timestamp</action>
+ <action>
+ <items>Encrypt Signature Timestamp</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
@@ -18,12 +19,15 @@
<encryptionUser>bob</encryptionUser>
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Encrypt Signature Timestamp</action>
+ <action>
+ <items>Encrypt Signature Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Scenario 6: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s6.service.xml Sun Oct 23 11:24:36 2005
@@ -6,13 +6,16 @@
</operation>
<parameter name="InflowSecurity">
- <action>Encrypt Signature Timestamp</action>
+ <action>
+ <items>Encrypt Signature Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Encrypt Signature Timestamp</action>
+ <action>
+ <items>Encrypt Signature Timestamp</items>
<user>bob</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<encryptionKeyIdentifier>DirectReference</encryptionKeyIdentifier>
@@ -20,6 +23,7 @@
<encryptionUser>alice</encryptionUser>
<signatureKeyIdentifier>SKIKeyIdentifier</signatureKeyIdentifier>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 7: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
@@ -20,13 +21,16 @@
<signaturePropFile>interop.properties</signaturePropFile>
<encryptionPropFile>interop.properties</encryptionPropFile>
<signatureParts>{}{http://schemas.xmlsoap.org/soap/envelope/}Body;STRTransform</signatureParts>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
<decryptionPropFile>interop.properties</decryptionPropFile>
+ </action>
</parameter>
<!-- Scenario 7: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/s7.service.xml Sun Oct 23 11:24:36 2005
@@ -6,14 +6,17 @@
</operation>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
<decryptionPropFile>interop.properties</decryptionPropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>bob</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<encryptionKeyIdentifier>DirectReference</encryptionKeyIdentifier>
@@ -22,6 +25,7 @@
<signatureKeyIdentifier>SKIKeyIdentifier</signatureKeyIdentifier>
<signaturePropFile>interop.properties</signaturePropFile>
<encryptionPropFile>interop.properties</encryptionPropFile>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,8 +10,10 @@
<!-- Scenario ST1: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Timestamp SAMLTokenUnsigned</action>
+ <action>
+ <items>Timestamp SAMLTokenUnsigned</items>
<samlPropFile>axis2.saml.properties</samlPropFile>
+ </action>
</parameter>
<!-- Scenario ST1: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/sST1.service.xml Sun Oct 23 11:24:36 2005
@@ -6,7 +6,9 @@
</operation>
<parameter name="InflowSecurity">
- <action>Timestamp SAMLTokenUnsigned</action>
+ <action>
+ <items>Timestamp SAMLTokenUnsigned</items>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -10,7 +10,8 @@
<!-- Scenario 3 with MTOM: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>alice</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
@@ -19,12 +20,15 @@
<encryptionUser>bob</encryptionUser>
<optimizeParts>//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</optimizeParts>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Scenario 3 with MTOM: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/test-resources/security/secMtom.service.xml Sun Oct 23 11:24:36 2005
@@ -7,13 +7,16 @@
<parameter name="InflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Signature Encrypt Timestamp</action>
+ <action>
+ <items>Signature Encrypt Timestamp</items>
<user>bob</user>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
@@ -22,6 +25,7 @@
<encryptionUser>alice</encryptionUser>
<optimizeParts>//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</optimizeParts>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/resources/security/client.axis2.xml Sun Oct 23 11:24:36 2005
@@ -12,7 +12,8 @@
<!-- Test with addressing and MTOM: Client's Configuration:START-->
<parameter name="OutflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<user>alice</user>
<passwordCallbackClass>sample.security.PWCallback</passwordCallbackClass>
<signaturePropFile>sec.properties</signaturePropFile>
@@ -22,12 +23,15 @@
<signatureParts>{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}To;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}ReplyTo;{Element}{http://schemas.xmlsoap.org/ws/2004/08/addressing}MessageID;{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp</signatureParts>
<optimizeParts>//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</optimizeParts>
+ </action>
</parameter>
<parameter name="InflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<passwordCallbackClass>sample.security.PWCallback</passwordCallbackClass>
<signaturePropFile>sec.properties</signaturePropFile>
+ </action>
</parameter>
<!-- Test with addressing and MTOM: Client's Configuration:END-->
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/security/META-INF/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/security/META-INF/services.xml?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/security/META-INF/services.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/security/META-INF/services.xml Sun Oct 23 11:24:36 2005
@@ -5,13 +5,16 @@
</operation>
<parameter name="InflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<passwordCallbackClass>sample.security.PWCallback</passwordCallbackClass>
<signaturePropFile>sec.properties</signaturePropFile>
+ </action>
</parameter>
<parameter name="OutflowSecurity">
- <action>Timestamp Signature Encrypt</action>
+ <action>
+ <items>Timestamp Signature Encrypt</items>
<user>bob</user>
<passwordCallbackClass>sample.security.PWCallback</passwordCallbackClass>
<signaturePropFile>sec.properties</signaturePropFile>
@@ -20,6 +23,7 @@
<encryptionUser>alice</encryptionUser>
<optimizeParts>//xenc:EncryptedData/xenc:CipherData/xenc:CipherValue</optimizeParts>
+ </action>
</parameter>
</service>
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllReceiver.java Sun Oct 23 11:24:36 2005
@@ -101,11 +101,11 @@
Vector actions = new Vector();
String action = null;
- if ((action = (String) getOption(WSHandlerConstants.ACTION)) == null) {
- action = (String) getProperty(msgContext, WSHandlerConstants.ACTION);
+ if ((action = (String) getOption(WSSHandlerConstants.ACTION_ITEMS)) == null) {
+ action = (String) getProperty(msgContext, WSSHandlerConstants.ACTION_ITEMS);
}
if (action == null) {
- throw new AxisFault("WSDoAllReceiver: No action defined");
+ throw new AxisFault("WSDoAllReceiver: No action items defined");
}
int doAction = WSSecurityUtil.decodeAction(action, actions);
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/WSDoAllSender.java Sun Oct 23 11:24:36 2005
@@ -105,12 +105,13 @@
try {
Vector actions = new Vector();
String action = null;
- if ((action = (String) getOption(WSHandlerConstants.ACTION)) == null) {
- action = (String) getProperty(reqData.getMsgContext(),WSHandlerConstants.ACTION);
- }
- if (action == null) {
- throw new AxisFault("WSDoAllSender: No action defined");
- }
+ if ((action = (String) getOption(WSSHandlerConstants.ACTION_ITEMS)) == null) {
+ action = (String) getProperty(msgContext, WSSHandlerConstants.ACTION_ITEMS);
+ }
+ if (action == null) {
+ throw new AxisFault("WSDoAllReceiver: No action items defined");
+ }
+
int doAction = WSSecurityUtil.decodeAction(action, actions);
if (doAction == WSConstants.NO_SECURITY) {
return;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java Sun Oct 23 11:24:36 2005
@@ -33,6 +33,10 @@
*/
public static final String OUTFLOW_SECURITY = "OutflowSecurity";
+ public static final String ACTION = "action";
+
+ public static final String ACTION_ITEMS = "items";
+
/**
* Repetition count
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java?rev=327830&r1=327829&r2=327830&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/HandlerParameterDecoder.java Sun Oct 23 11:24:36 2005
@@ -23,12 +23,12 @@
import java.util.Iterator;
+import javax.xml.namespace.QName;
+
/**
- * This is used to process the security parameters from the
- * configuration files
+ * This is used to process the security parameters from the configuration files
*
- * Example:
- <code>
+ * Example: <code>
<br>
</code>
@@ -44,51 +44,73 @@
* @param inflow
* @throws WSSecurityException
*/
- public static void processParameters(MessageContext msgCtx, boolean inflow) throws Exception {
-
- Parameter inFlowSecParam = msgCtx.getParameter(WSSHandlerConstants.INFLOW_SECURITY);
-
- Parameter outFlowSecParam = msgCtx.getParameter(WSSHandlerConstants.OUTFLOW_SECURITY);
-
- int repetitionCount = 0;
+ public static void processParameters(MessageContext msgCtx, boolean inflow)
+ throws Exception {
+
+ Parameter inFlowSecParam = msgCtx
+ .getParameter(WSSHandlerConstants.INFLOW_SECURITY);
+
+ Parameter outFlowSecParam = msgCtx
+ .getParameter(WSSHandlerConstants.OUTFLOW_SECURITY);
+
+ int repetitionCount = -1;
/*
* Populate the inflow parameters
*/
- if(inFlowSecParam != null && inflow) {
+ if (inFlowSecParam != null && inflow) {
OMElement inFlowParamElem = inFlowSecParam.getParameterElement();
- Iterator childElements = inFlowParamElem.getChildElements();
+
+ OMElement actionElem = inFlowParamElem
+ .getFirstChildWithName(new QName(WSSHandlerConstants.ACTION));
+ if (actionElem == null) {
+ throw new Exception(
+ "Inflow configurtion must contain an 'action' "
+ + "elementas the child of 'InflowSecurity' element");
+ }
+
+ Iterator childElements = actionElem.getChildElements();
while (childElements.hasNext()) {
OMElement element = (OMElement) childElements.next();
- msgCtx.setProperty(element.getLocalName(),element.getText());
+ msgCtx.setProperty(element.getLocalName(), element.getText());
}
+
}
-
+
/*
* Populate the ourflow parameters
*/
- if(outFlowSecParam != null && !inflow) {
+ if (outFlowSecParam != null && !inflow) {
OMElement outFlowParamElem = outFlowSecParam.getParameterElement();
+
Iterator childElements = outFlowParamElem.getChildElements();
while (childElements.hasNext()) {
OMElement element = (OMElement) childElements.next();
- if(!element.getLocalName().equals("repetition")) {
- msgCtx.setProperty(element.getLocalName(),element.getText());
- } else {
- //Handle the repetition configuration
- repetitionCount++;
- Iterator repetitionParamElems = element.getChildElements();
- while (repetitionParamElems.hasNext()) {
- OMElement elem = (OMElement) repetitionParamElems.next();
- msgCtx.setProperty(elem.getLocalName()+1,elem.getText());
- }
-
+
+ if(!element.getLocalName().equals(WSSHandlerConstants.ACTION)) {
+ throw new Exception(
+ "Alian element '"
+ + element.getLocalName()
+ + "' in the 'OutFlowSecurity' element, "
+ + "only 'action' elements can be present");
}
+
+
+ repetitionCount++;
+ Iterator paramElements = element.getChildElements();
+ while (paramElements.hasNext()) {
+ OMElement elem = (OMElement) paramElements.next();
+ msgCtx.setProperty(Axis2Util.getKey(elem.getLocalName(),
+ inflow,repetitionCount), elem.getText());
+ }
+
}
+
+ msgCtx.setProperty(WSSHandlerConstants.SENDER_REPEAT_COUNT,
+ new Integer(repetitionCount));
}
-
- msgCtx.setProperty(WSSHandlerConstants.SENDER_REPEAT_COUNT,new Integer(repetitionCount));
-
+
+
}
-
+
}