Author: ruchithf
Date: Thu Nov 3 11:00:39 2005
New Revision: 330608
URL: http://svn.apache.org/viewcvs?rev=330608&view=rev
Log:
- Added a option to turn off signature confirmation.
- Changed scenario3 to use it.
- Need to update the wss4j-SNAPSHOT.jar (once the wss4j project is updated in a
little while)
Modified:
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/org/apache/axis2/security/Scenario3Test.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
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=330608&r1=330607&r2=330608&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
Thu Nov 3 11:00:39 2005
@@ -19,6 +19,7 @@
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
<encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
<encryptionUser>bob</encryptionUser>
+ <enableSignatureConfirmation>false</enableSignatureConfirmation>
</action>
</parameter>
@@ -27,6 +28,7 @@
<items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ <enableSignatureConfirmation>false</enableSignatureConfirmation>
</action>
</parameter>
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=330608&r1=330607&r2=330608&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
Thu Nov 3 11:00:39 2005
@@ -10,6 +10,7 @@
<items>Signature Encrypt Timestamp</items>
<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>
<signaturePropFile>interop.properties</signaturePropFile>
+ <enableSignatureConfirmation>false</enableSignatureConfirmation>
</action>
</parameter>
@@ -23,6 +24,7 @@
<encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier>
<encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
<encryptionUser>alice</encryptionUser>
+ <enableSignatureConfirmation>false</enableSignatureConfirmation>
</action>
</parameter>
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java?rev=330608&r1=330607&r2=330608&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
(original)
+++
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/Scenario3Test.java
Thu Nov 3 11:00:39 2005
@@ -37,6 +37,7 @@
ofc.setEncryptionSymAlgorithm(WSConstants.TRIPLE_DES);
ofc.setEncryptionKeyIdentifier(WSSHandlerConstants.SKI_KEY_IDENTIFIER);
ofc.setSignatureKeyIdentifier(WSSHandlerConstants.BST_DIRECT_REFERENCE);
+ ofc.setEnableSignatureConfirmation(false);
return ofc;
}
@@ -46,6 +47,7 @@
ifc.setActionItems("Signature Encrypt Timestamp");
ifc.setPasswordCallbackClass("org.apache.axis2.security.PWCallback");
ifc.setSignaturePropFile("interop.properties");
+ ifc.setEnableSignatureConfirmation(false);
return ifc;
}
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java?rev=330608&r1=330607&r2=330608&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
(original)
+++
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/InflowConfiguration.java
Thu Nov 3 11:00:39 2005
@@ -136,5 +136,22 @@
this.action.put(WSHandlerConstants.SIG_PROP_FILE,
signaturePropFile);
}
+ /**
+ * Sets whether signature confirmation should be enabled or not
+ * @param embeddedKeyName
+ */
+ public void setEnableSignatureConfirmation(boolean value) {
+ this.action.put(
+
WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, value?"true":"false");
+ }
+
+ /**
+ * Returns whether signature confirmation should be enabled or not
+ * @return
+ */
+ public String getEnableSignatureConfirmation() {
+ return (String) this.action
+
.get(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION);
+ }
}
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java?rev=330608&r1=330607&r2=330608&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
(original)
+++
webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/config/OutflowConfiguration.java
Thu Nov 3 11:00:39 2005
@@ -472,4 +472,22 @@
return (String) this.actionList[this.currentAction]
.get(WSHandlerConstants.ENC_KEY_NAME);
}
+
+ /**
+ * Sets whether signature confirmation should be enabled or not
+ * @param embeddedKeyName
+ */
+ public void setEnableSignatureConfirmation(boolean value) {
+ this.actionList[this.currentAction].put(
+
WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, value?"true":"false");
+ }
+
+ /**
+ * Returns whether signature confirmation should be enabled or not
+ * @return
+ */
+ public String getEnableSignatureConfirmation() {
+ return (String) this.actionList[this.currentAction]
+
.get(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION);
+ }
}
