You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ru...@apache.org on 2007/09/11 12:56:13 UTC
svn commit: r574549 - in
/webservices/rampart/trunk/java/modules/rampart-tests:
src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
test-resources/policy/rampart-asymm-binding-5-ebs.xml
Author: ruchithf
Date: Tue Sep 11 03:56:12 2007
New Revision: 574549
URL: http://svn.apache.org/viewvc?rev=574549&view=rev
Log:
Applied patch in RAMPART-85, Thanks Nandana
Modified:
webservices/rampart/trunk/java/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
webservices/rampart/trunk/java/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-5-ebs.xml
Modified: webservices/rampart/trunk/java/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java?rev=574549&r1=574548&r2=574549&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java Tue Sep 11 03:56:12 2007
@@ -26,173 +26,172 @@
import java.util.ArrayList;
public class AsymmetricBindingBuilderTest extends MessageBuilderTestBase {
-//
-// public void testAsymmBinding() {
-// try {
-// MessageContext ctx = getMsgCtx();
-//
-// String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
-// Policy policy = this.loadPolicy(policyXml);
-//
-// ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-//
-// MessageBuilder builder = new MessageBuilder();
-// builder.build(ctx);
-//
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-// } catch (Exception e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
-// }
-//
-// public void testAsymmBindingServerSide() {
-// try {
-// MessageContext ctx = getMsgCtx();
-//
-// ctx.setServerSide(true);
-// String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
-// Policy policy = this.loadPolicy(policyXml);
-//
-// ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-//
-// MessageBuilder builder = new MessageBuilder();
-// builder.build(ctx);
-//
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-// } catch (Exception e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
-// }
-//
-// public void testAsymmBindingWithSigDK() {
-// try {
-// MessageContext ctx = getMsgCtx();
-//
-// String policyXml = "test-resources/policy/rampart-asymm-binding-2-sig-dk.xml";
-// Policy policy = this.loadPolicy(policyXml);
-//
-// ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-//
-// MessageBuilder builder = new MessageBuilder();
-// builder.build(ctx);
-//
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
-// }
-//
-// public void testAsymmBindingWithDK() {
-// try {
-// MessageContext ctx = getMsgCtx();
-//
-// String policyXml = "test-resources/policy/rampart-asymm-binding-3-dk.xml";
-// Policy policy = this.loadPolicy(policyXml);
-//
-// ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-//
-// MessageBuilder builder = new MessageBuilder();
-// builder.build(ctx);
-//
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-// list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
-// }
-//
-// public void testAsymmBindingWithDKEncrBeforeSig() {
-// try {
-// MessageContext ctx = getMsgCtx();
-//
-// String policyXml = "test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml";
-// Policy policy = this.loadPolicy(policyXml);
-//
-// ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-//
-// MessageBuilder builder = new MessageBuilder();
-// builder.build(ctx);
-//
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-// list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
-// }
-//
-//
-// public void testAsymmBindingEncrBeforeSig() {
-// try {
-// MessageContext ctx = getMsgCtx();
-//
-// String policyXml = "test-resources/policy/rampart-asymm-binding-5-ebs.xml";
-// Policy policy = this.loadPolicy(policyXml);
-//
-// ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-//
-// MessageBuilder builder = new MessageBuilder();
-// builder.build(ctx);
-//
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-// } catch (Exception e) {
-// e.printStackTrace();
-// fail(e.getMessage());
-// }
-// }
-//
+
+ public void testAsymmBinding() {
+ try {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAsymmBindingServerSide() {
+ try {
+ MessageContext ctx = getMsgCtx();
+
+ ctx.setServerSide(true);
+ String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAsymmBindingWithSigDK() {
+ try {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-2-sig-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAsymmBindingWithDK() {
+ try {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-3-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ public void testAsymmBindingWithDKEncrBeforeSig() {
+ try {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+
+ public void testAsymmBindingEncrBeforeSig() {
+ try {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-5-ebs.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
public void testAsymmBindingTripleDesRSA15() {
try {
MessageContext ctx = getMsgCtx();
@@ -204,7 +203,7 @@
MessageBuilder builder = new MessageBuilder();
builder.build(ctx);
- System.out.println(ctx.getEnvelope());
+
ArrayList list = new ArrayList();
list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
@@ -230,16 +229,18 @@
MessageBuilder builder = new MessageBuilder();
builder.build(ctx);
-
- System.out.println(ctx.getEnvelope());
-// ArrayList list = new ArrayList();
-//
-// list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
-// list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
-// list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-//
-// this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS,WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
Modified: webservices/rampart/trunk/java/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-5-ebs.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-5-ebs.xml?rev=574549&r1=574548&r2=574549&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-5-ebs.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-5-ebs.xml Tue Sep 11 03:56:12 2007
@@ -63,14 +63,14 @@
<ramp:signatureCrypto>
<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">interop/interop2.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">test-resources/keys/interop2.jks</ramp:property>
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">interop/interop2.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">test-resources/keys/interop2.jks</ramp:property>
<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>