You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2012/02/29 21:54:56 UTC
svn commit: r1295267 [3/11] - in /webservices/wss4j/branches/swssf:
rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/
streaming-ws-policy/src/main/java/org/swssf/policy/
streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ s...
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AsymmetricBindingTest.java Wed Feb 29 20:54:51 2012
@@ -22,13 +22,14 @@ import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -51,23 +52,36 @@ public class AsymmetricBindingTest exten
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
+
+ RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_wsu_Timestamp);
+ requiredElementSecurityEvent.setElementPath(headerPath);
+ policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
+
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+
+ x509TokenSecurityEvent = new X509TokenSecurityEvent();
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, false);
- encryptedElementSecurityEvent.setElement(WSSConstants.TAG_dsig_Signature);
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_dsig_Signature);
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, false);
- encryptedElementSecurityEvent.setElement(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -75,7 +89,7 @@ public class AsymmetricBindingTest exten
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap12_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
policyEnforcer.doFinal();
}
@@ -92,16 +106,17 @@ public class AsymmetricBindingTest exten
"</wsp:Policy>\n" +
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
+
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+
+ x509TokenSecurityEvent = new X509TokenSecurityEvent();
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
@@ -167,19 +182,24 @@ public class AsymmetricBindingTest exten
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
+
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+
+ x509TokenSecurityEvent = new X509TokenSecurityEvent();
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
+
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, false, false);
- encryptedElementSecurityEvent.setElement(WSSConstants.TAG_dsig_Signature);
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_dsig_Signature);
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -207,25 +227,34 @@ public class AsymmetricBindingTest exten
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
+
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- x509TokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+
+ x509TokenSecurityEvent = new X509TokenSecurityEvent();
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
+
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, false);
- encryptedElementSecurityEvent.setElement(WSSConstants.TAG_dsig_Signature);
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_dsig_Signature);
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
+
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, false);
- encryptedElementSecurityEvent.setElement(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, false);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap12_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ContentEncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ContentEncryptedElementsTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ContentEncryptedElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ContentEncryptedElementsTest.java Wed Feb 29 20:54:51 2012
@@ -20,6 +20,7 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
@@ -27,6 +28,8 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -47,12 +50,16 @@ public class ContentEncryptedElementsTes
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(null, true, false);
- contentEncryptedElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
- contentEncryptedElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "a"));
+ contentEncryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
//additional ContentEncryptedElements are also allowed!
- contentEncryptedElementSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "b"));
+ contentEncryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
policyEnforcer.doFinal();
}
@@ -70,10 +77,12 @@ public class ContentEncryptedElementsTes
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(null, true, false);
- contentEncryptedElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(null, false, false);
- contentEncryptedElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "a"));
+ contentEncryptedElementSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Assert.fail("Exception expected");
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedElementsTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedElementsTest.java Wed Feb 29 20:54:51 2012
@@ -20,6 +20,7 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.EncryptedElementSecurityEvent;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
@@ -27,6 +28,8 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -47,12 +50,16 @@ public class EncryptedElementsTest exten
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, false);
- encryptedElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
- encryptedElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
//additional EncryptedElements are also allowed!
- encryptedElementSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "b"));
+ encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
policyEnforcer.doFinal();
}
@@ -70,10 +77,12 @@ public class EncryptedElementsTest exten
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, false);
- encryptedElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, false, false);
- encryptedElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedElementSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
Assert.fail("Exception expected");
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedPartsTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedPartsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/EncryptedPartsTest.java Wed Feb 29 20:54:51 2012
@@ -20,6 +20,7 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.EncryptedPartSecurityEvent;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
@@ -27,6 +28,8 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -49,12 +52,18 @@ public class EncryptedPartsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, false);
- encryptedPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
- encryptedPartSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
//additional encryptedParts are also allowed!
- encryptedPartSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "b"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
policyEnforcer.doFinal();
}
@@ -74,10 +83,13 @@ public class EncryptedPartsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, false);
- encryptedPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, false, false);
- encryptedPartSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
Assert.fail("Exception expected");
@@ -98,11 +110,17 @@ public class EncryptedPartsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, false);
- encryptedPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
- encryptedPartSecurityEvent.setElement(new QName("http://example.org", "a"));
- policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
- encryptedPartSecurityEvent.setElement(new QName("http://example.com", "b"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
+ policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "b"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
policyEnforcer.doFinal();
}
@@ -119,7 +137,7 @@ public class EncryptedPartsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, false, false);
- encryptedPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
try {
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
} catch (WSSecurityException e) {
@@ -142,12 +160,18 @@ public class EncryptedPartsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, false);
- encryptedPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
- encryptedPartSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
//additional encryptedParts are also allowed!
- encryptedPartSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "b"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
policyEnforcer.doFinal();
}
@@ -167,10 +191,13 @@ public class EncryptedPartsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, false);
- encryptedPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, false, false);
- encryptedPartSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ encryptedPartSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
Assert.fail("Exception expected");
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/HttpsTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/HttpsTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/HttpsTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/HttpsTokenTest.java Wed Feb 29 20:54:51 2012
@@ -20,9 +20,11 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -54,6 +56,9 @@ public class HttpsTokenTest extends Abst
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
HttpsTokenSecurityEvent httpsTokenSecurityEvent = new HttpsTokenSecurityEvent();
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ httpsTokenSecurityEvent.setSecurityToken(securityToken);
httpsTokenSecurityEvent.setAuthenticationType(HttpsTokenSecurityEvent.AuthenticationType.HttpsClientCertificateAuthentication);
httpsTokenSecurityEvent.setIssuerName("xs:anyURI");
policyEnforcer.registerSecurityEvent(httpsTokenSecurityEvent);
@@ -85,6 +90,9 @@ public class HttpsTokenTest extends Abst
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
HttpsTokenSecurityEvent httpsTokenSecurityEvent = new HttpsTokenSecurityEvent();
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ httpsTokenSecurityEvent.setSecurityToken(securityToken);
httpsTokenSecurityEvent.setAuthenticationType(HttpsTokenSecurityEvent.AuthenticationType.HttpBasicAuthentication);
httpsTokenSecurityEvent.setIssuerName("xs:anyURI");
policyEnforcer.registerSecurityEvent(httpsTokenSecurityEvent);
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/IssuedTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/IssuedTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/IssuedTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/IssuedTokenTest.java Wed Feb 29 20:54:51 2012
@@ -16,13 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.IssuedTokenSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
@@ -62,32 +65,25 @@ public class IssuedTokenTest extends Abs
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
+
IssuedTokenSecurityEvent initiatorTokenSecurityEvent = new IssuedTokenSecurityEvent();
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
IssuedTokenSecurityEvent recipientTokenSecurityEvent = new IssuedTokenSecurityEvent();
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KerberosTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KerberosTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KerberosTokenTest.java Wed Feb 29 20:54:51 2012
@@ -20,9 +20,11 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.KerberosTokenSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
@@ -64,31 +66,23 @@ public class KerberosTokenTest extends A
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
KerberosTokenSecurityEvent initiatorTokenSecurityEvent = new KerberosTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
KerberosTokenSecurityEvent recipientTokenSecurityEvent = new KerberosTokenSecurityEvent();
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KeyValueTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KeyValueTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KeyValueTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/KeyValueTokenTest.java Wed Feb 29 20:54:51 2012
@@ -20,9 +20,11 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.KeyValueTokenSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
@@ -62,31 +64,23 @@ public class KeyValueTokenTest extends A
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
KeyValueTokenSecurityEvent initiatorTokenSecurityEvent = new KeyValueTokenSecurityEvent();
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
KeyValueTokenSecurityEvent recipientTokenSecurityEvent = new KeyValueTokenSecurityEvent();
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/LayoutTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/LayoutTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/LayoutTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/LayoutTest.java Wed Feb 29 20:54:51 2012
@@ -22,16 +22,14 @@ import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
-import org.swssf.wss.securityEvent.TimestampSecurityEvent;
-import org.swssf.wss.securityEvent.X509TokenSecurityEvent;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.*;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -55,17 +53,22 @@ public class LayoutTest extends Abstract
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
+
+ RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+ headerPath.add(WSSConstants.TAG_wsu_Timestamp);
+ requiredElementSecurityEvent.setElementPath(headerPath);
+ policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
+
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(x509TokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -85,12 +88,9 @@ public class LayoutTest extends Abstract
"</sp:Layout>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -113,12 +113,9 @@ public class LayoutTest extends Abstract
"</sp:Layout>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
@@ -142,12 +139,9 @@ public class LayoutTest extends Abstract
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- x509TokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RelTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RelTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RelTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RelTokenTest.java Wed Feb 29 20:54:51 2012
@@ -20,9 +20,11 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.RelTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
@@ -63,31 +65,23 @@ public class RelTokenTest extends Abstra
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
RelTokenSecurityEvent initiatorTokenSecurityEvent = new RelTokenSecurityEvent();
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
RelTokenSecurityEvent recipientTokenSecurityEvent = new RelTokenSecurityEvent();
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredElementsTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredElementsTest.java Wed Feb 29 20:54:51 2012
@@ -20,12 +20,15 @@ package org.swssf.policy.test;
import org.apache.ws.secpolicy.WSSPolicyException;
import org.swssf.policy.PolicyEnforcer;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
import org.swssf.wss.securityEvent.RequiredElementSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -46,12 +49,16 @@ public class RequiredElementsTest extend
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- requiredElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ requiredElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
- requiredElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "a"));
+ requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
//additional RequiredElements are also allowed!
- requiredElementSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "b"));
+ requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
policyEnforcer.doFinal();
}
@@ -69,7 +76,7 @@ public class RequiredElementsTest extend
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- requiredElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ requiredElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
try {
policyEnforcer.doFinal();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredPartsTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredPartsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/RequiredPartsTest.java Wed Feb 29 20:54:51 2012
@@ -20,12 +20,15 @@ package org.swssf.policy.test;
import org.apache.ws.secpolicy.WSSPolicyException;
import org.swssf.policy.PolicyEnforcer;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
import org.swssf.wss.securityEvent.RequiredPartSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -48,12 +51,18 @@ public class RequiredPartsTest extends A
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
RequiredPartSecurityEvent RequiredPartSecurityEvent = new RequiredPartSecurityEvent();
- RequiredPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ RequiredPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(RequiredPartSecurityEvent);
- RequiredPartSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ RequiredPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(RequiredPartSecurityEvent);
//additional encryptedParts are also allowed!
- RequiredPartSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "b"));
+ RequiredPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(RequiredPartSecurityEvent);
policyEnforcer.doFinal();
}
@@ -71,7 +80,7 @@ public class RequiredPartsTest extends A
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
RequiredPartSecurityEvent RequiredPartSecurityEvent = new RequiredPartSecurityEvent();
- RequiredPartSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ RequiredPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(RequiredPartSecurityEvent);
try {
policyEnforcer.doFinal();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SamlTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SamlTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SamlTokenTest.java Wed Feb 29 20:54:51 2012
@@ -24,7 +24,11 @@ import org.swssf.policy.PolicyViolationE
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
-import org.swssf.wss.securityEvent.*;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.SamlTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -66,21 +70,23 @@ public class SamlTokenTest extends Abstr
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- initiatorTokenSecurityEvent.setSecurityToken(new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:anyURI", null, null, null, "1", null));
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:anyURI", null, null, null, "1", null);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
- recipientTokenSecurityEvent.setSecurityToken(new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:anyURI", null, null, null, "1", null));
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:anyURI", null, null, null, "1", null);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -120,21 +126,23 @@ public class SamlTokenTest extends Abstr
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- initiatorTokenSecurityEvent.setSecurityToken(new SAMLSecurityToken(SAMLVersion.VERSION_11, null, "xs:anyURI", null, null, null, "1", null));
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:anyURI", null, null, null, "1", null);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
- recipientTokenSecurityEvent.setSecurityToken(new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:anyURI", null, null, null, "1", null));
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = new SAMLSecurityToken(SAMLVersion.VERSION_20, null, "xs:otherURI", null, null, null, "1", null);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecureConversationTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecureConversationTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecureConversationTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecureConversationTokenTest.java Wed Feb 29 20:54:51 2012
@@ -22,9 +22,11 @@ import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.SecureConversationTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -68,33 +70,25 @@ public class SecureConversationTokenTest
SecureConversationTokenSecurityEvent initiatorTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecureConversationTokenSecurityEvent recipientTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
recipientTokenSecurityEvent.setExternalUriRef(true);
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -135,33 +129,25 @@ public class SecureConversationTokenTest
SecureConversationTokenSecurityEvent initiatorTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("sss");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecureConversationTokenSecurityEvent recipientTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("sss");
recipientTokenSecurityEvent.setExternalUriRef(true);
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecurityContextTokenTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SecurityContextTokenTest.java Wed Feb 29 20:54:51 2012
@@ -1,4 +1,5 @@
-/**
+/*
+*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -22,9 +23,11 @@ import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.X509SecurityToken;
-import org.swssf.wss.securityEvent.*;
-import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.OperationSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityContextTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
+import org.swssf.xmlsec.ext.SecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -68,33 +71,26 @@ public class SecurityContextTokenTest ex
SecurityContextTokenSecurityEvent initiatorTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecurityContextTokenSecurityEvent recipientTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
recipientTokenSecurityEvent.setExternalUriRef(true);
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
@@ -136,33 +132,25 @@ public class SecurityContextTokenTest ex
SecurityContextTokenSecurityEvent initiatorTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("sss");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- initiatorTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- initiatorTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Signature);
+ SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecurityContextTokenSecurityEvent recipientTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("sss");
recipientTokenSecurityEvent.setExternalUriRef(true);
- recipientTokenSecurityEvent.setSecurityToken(new X509SecurityToken(WSSConstants.X509V3Token, null, null, null, "1", null, null) {
- @Override
- protected String getAlias() throws XMLSecurityException {
- return null;
- }
- });
- recipientTokenSecurityEvent.setTokenUsage(TokenSecurityEvent.TokenUsage.Encryption);
+ securityToken = getX509Token(WSSConstants.X509V3Token);
+ securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true);
- signedPartSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, true);
- contentEncryptedElementSecurityEvent.setElement(WSSConstants.TAG_soap11_Body);
+ contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SignedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SignedElementsTest.java?rev=1295267&r1=1295266&r2=1295267&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SignedElementsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SignedElementsTest.java Wed Feb 29 20:54:51 2012
@@ -20,6 +20,7 @@ package org.swssf.policy.test;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.policy.PolicyViolationException;
+import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
import org.swssf.wss.securityEvent.SignedElementSecurityEvent;
@@ -27,6 +28,8 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author $Author$
@@ -47,12 +50,18 @@ public class SignedElementsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(null, true);
- signedElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ signedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
- signedElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "a"));
+ signedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
//additional SignedElements are also allowed!
- signedElementSecurityEvent.setElement(new QName("http://example.com", "b"));
+ headerPath = new ArrayList<QName>();
+ headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
+ headerPath.add(new QName("http://example.org", "b"));
+ signedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
policyEnforcer.doFinal();
}
@@ -70,10 +79,12 @@ public class SignedElementsTest extends
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(null, true);
- signedElementSecurityEvent.setElement(new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
+ signedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
signedElementSecurityEvent = new SignedElementSecurityEvent(null, false);
- signedElementSecurityEvent.setElement(new QName("http://example.org", "a"));
+ List<QName> headerPath = new ArrayList<QName>();
+ headerPath.add(new QName("http://example.org", "a"));
+ signedElementSecurityEvent.setElementPath(headerPath);
try {
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
Assert.fail("Exception expected");