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 2013/04/01 15:57:35 UTC
svn commit: r1463136 [3/11] - in /webservices/wss4j/trunk:
cxf-integration/src/main/java/org/apache/wss4j/cxfIntegration/interceptor/
integration/src/test/java/org/apache/wss4j/integration/test/stax/
ws-security-common/src/main/java/org/apache/wss4j/co...
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/IssuedTokenTest.java Mon Apr 1 13:57:32 2013
@@ -27,16 +27,17 @@ import org.apache.wss4j.common.saml.bean
import org.apache.wss4j.common.saml.bean.AttributeStatementBean;
import org.apache.wss4j.common.saml.bean.SubjectBean;
import org.apache.wss4j.policy.stax.PolicyViolationException;
-import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityToken;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityTokenImpl;
+import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.KerberosTokenSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.opensaml.common.SAMLVersion;
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.stax.ext.WSSConstants;
-import org.apache.wss4j.stax.impl.securityToken.SAMLSecurityToken;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SamlTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.testng.annotations.Test;
@@ -112,9 +113,9 @@ public class IssuedTokenTest extends Abs
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -123,19 +124,23 @@ public class IssuedTokenTest extends Abs
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -167,27 +172,31 @@ public class IssuedTokenTest extends Abs
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -224,9 +233,9 @@ public class IssuedTokenTest extends Abs
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -235,19 +244,23 @@ public class IssuedTokenTest extends Abs
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -284,9 +297,9 @@ public class IssuedTokenTest extends Abs
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -295,19 +308,23 @@ public class IssuedTokenTest extends Abs
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -343,9 +360,9 @@ public class IssuedTokenTest extends Abs
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -354,19 +371,23 @@ public class IssuedTokenTest extends Abs
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -424,32 +445,36 @@ public class IssuedTokenTest extends Abs
KerberosTokenSecurityEvent initiatorTokenSecurityEvent = new KerberosTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("http://initiatorTokenIssuer.com");
- SecurityToken securityToken = new KerberosServiceSecurityToken(
+ KerberosServiceSecurityTokenImpl securityToken = new KerberosServiceSecurityTokenImpl(
null, null, null,
"http://docs.oasisopen.org/wss/oasiswss-kerberos-tokenprofile-1.1#Kerberosv5APREQSHA1",
- "1", WSSConstants.WSSKeyIdentifierType.EMBEDDED_KEYIDENTIFIER_REF);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ "1", WSSecurityTokenConstants.KeyIdentifier_EmbeddedKeyIdentifierRef);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
KerberosTokenSecurityEvent recipientTokenSecurityEvent = new KerberosTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("http://recipientTokenIssuer.com");
- securityToken = new KerberosServiceSecurityToken(
+ securityToken = new KerberosServiceSecurityTokenImpl(
null, null, null,
"http://docs.oasisopen.org/wss/oasiswss-kerberos-tokenprofile-1.1#Kerberosv5APREQSHA1",
- "1", WSSConstants.WSSKeyIdentifierType.EMBEDDED_KEYIDENTIFIER_REF);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ "1", WSSecurityTokenConstants.KeyIdentifier_EmbeddedKeyIdentifierRef);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -467,32 +492,36 @@ public class IssuedTokenTest extends Abs
KerberosTokenSecurityEvent initiatorTokenSecurityEvent = new KerberosTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("http://initiatorTokenIssuer.com");
- SecurityToken securityToken = new KerberosServiceSecurityToken(
+ KerberosServiceSecurityTokenImpl securityToken = new KerberosServiceSecurityTokenImpl(
null, null, null,
"http://docs.oasisopen.org/wss/oasiswss-kerberos-tokenprofile-1.1#GSS_Kerberosv5_AP_REQ",
- "1", WSSConstants.WSSKeyIdentifierType.EMBEDDED_KEYIDENTIFIER_REF);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ "1", WSSecurityTokenConstants.KeyIdentifier_EmbeddedKeyIdentifierRef);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
KerberosTokenSecurityEvent recipientTokenSecurityEvent = new KerberosTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("http://recipientTokenIssuer.com");
- securityToken = new KerberosServiceSecurityToken(
+ securityToken = new KerberosServiceSecurityTokenImpl(
null, null, null,
"http://docs.oasisopen.org/wss/oasiswss-kerberos-tokenprofile-1.1#Kerberosv5APREQSHA1",
- "1", WSSConstants.WSSKeyIdentifierType.EMBEDDED_KEYIDENTIFIER_REF);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ "1", WSSecurityTokenConstants.KeyIdentifier_EmbeddedKeyIdentifierRef);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KerberosTokenTest.java Mon Apr 1 13:57:32 2013
@@ -21,13 +21,14 @@ package org.apache.wss4j.policy.stax.tes
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.stax.ext.WSSConstants;
-import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityToken;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.KerberosServiceSecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.KerberosTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -76,10 +77,10 @@ public class KerberosTokenTest extends A
KerberosTokenSecurityEvent initiatorTokenSecurityEvent = new KerberosTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
- KerberosServiceSecurityToken kerberosServiceSecurityToken =
- new KerberosServiceSecurityToken(null, null, null, WSSConstants.NS_Kerberos5_AP_REQ, null,
- WSSConstants.WSSKeyIdentifierType.EMBEDDED_KEYIDENTIFIER_REF);
- kerberosServiceSecurityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ KerberosServiceSecurityTokenImpl kerberosServiceSecurityToken =
+ new KerberosServiceSecurityTokenImpl(null, null, null, WSSConstants.NS_Kerberos5_AP_REQ, null,
+ WSSecurityTokenConstants.KeyIdentifier_EmbeddedKeyIdentifierRef);
+ kerberosServiceSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(kerberosServiceSecurityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -87,20 +88,24 @@ public class KerberosTokenTest extends A
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
kerberosServiceSecurityToken =
- new KerberosServiceSecurityToken(null, null, null, WSSConstants.NS_Kerberos5_AP_REQ, null,
- WSSConstants.WSSKeyIdentifierType.EMBEDDED_KEYIDENTIFIER_REF);
- kerberosServiceSecurityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new KerberosServiceSecurityTokenImpl(null, null, null, WSSConstants.NS_Kerberos5_AP_REQ, null,
+ WSSecurityTokenConstants.KeyIdentifier_EmbeddedKeyIdentifierRef);
+ kerberosServiceSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(kerberosServiceSecurityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -148,10 +153,10 @@ public class KerberosTokenTest extends A
KerberosTokenSecurityEvent initiatorTokenSecurityEvent = new KerberosTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
- KerberosServiceSecurityToken kerberosServiceSecurityToken =
- new KerberosServiceSecurityToken(null, null, null, WSSConstants.NS_GSS_Kerberos5_AP_REQ, null,
- WSSConstants.WSSKeyIdentifierType.THUMBPRINT_IDENTIFIER);
- kerberosServiceSecurityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ KerberosServiceSecurityTokenImpl kerberosServiceSecurityToken =
+ new KerberosServiceSecurityTokenImpl(null, null, null, WSSConstants.NS_GSS_Kerberos5_AP_REQ, null,
+ WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier);
+ kerberosServiceSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(kerberosServiceSecurityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -159,20 +164,24 @@ public class KerberosTokenTest extends A
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
kerberosServiceSecurityToken =
- new KerberosServiceSecurityToken(null, null, null, WSSConstants.NS_Kerberos5_AP_REQ, null,
- WSSConstants.WSSKeyIdentifierType.THUMBPRINT_IDENTIFIER);
- kerberosServiceSecurityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new KerberosServiceSecurityTokenImpl(null, null, null, WSSConstants.NS_Kerberos5_AP_REQ, null,
+ WSSecurityTokenConstants.KeyIdentifier_ThumbprintIdentifier);
+ kerberosServiceSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(kerberosServiceSecurityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/KeyValueTokenTest.java Mon Apr 1 13:57:32 2013
@@ -22,12 +22,15 @@ import org.apache.wss4j.common.ext.WSSec
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.policy.stax.PolicyViolationException;
import org.apache.wss4j.stax.ext.WSSConstants;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.ECKeyValueSecurityTokenImpl;
+import org.apache.wss4j.stax.impl.securityToken.RsaKeyValueSecurityTokenImpl;
+import org.apache.wss4j.stax.securityEvent.KeyValueTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
-import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -71,25 +74,29 @@ public class KeyValueTokenTest extends A
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
KeyValueTokenSecurityEvent initiatorTokenSecurityEvent = new KeyValueTokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ RsaKeyValueSecurityTokenImpl securityToken = getRsaKeyValueSecurityToken();
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
KeyValueTokenSecurityEvent recipientTokenSecurityEvent = new KeyValueTokenSecurityEvent();
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getRsaKeyValueSecurityToken();
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -134,25 +141,29 @@ public class KeyValueTokenTest extends A
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
KeyValueTokenSecurityEvent initiatorTokenSecurityEvent = new KeyValueTokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token, "transmitter-ecdsa");
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ ECKeyValueSecurityTokenImpl securityToken = getECKeyValueSecurityToken();
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
KeyValueTokenSecurityEvent recipientTokenSecurityEvent = new KeyValueTokenSecurityEvent();
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getECKeyValueSecurityToken();
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -164,7 +175,7 @@ public class KeyValueTokenTest extends A
} catch (WSSecurityException e) {
Assert.assertTrue(e.getCause() instanceof PolicyViolationException);
Assert.assertEquals(e.getCause().getMessage(),
- "Policy enforces that a RsaKeyValue must be present in the KeyValueToken but we got a ECKeyValue");
+ "Policy enforces that a RsaKeyValue must be present in the KeyValueToken but we got a ECKeyValueSecurityTokenImpl");
Assert.assertEquals(e.getFaultCode(), WSSecurityException.INVALID_SECURITY);
}
}
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java Mon Apr 1 13:57:32 2013
@@ -45,8 +45,8 @@ public class LayoutTest extends Abstract
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SecurityToken securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
@@ -89,8 +89,8 @@ public class LayoutTest extends Abstract
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SecurityToken securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
@@ -118,8 +118,8 @@ public class LayoutTest extends Abstract
"</sp:Layout>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SecurityToken securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
@@ -145,8 +145,8 @@ public class LayoutTest extends Abstract
"</sp:Layout>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SecurityToken securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
@@ -171,8 +171,8 @@ public class LayoutTest extends Abstract
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SecurityToken securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java Mon Apr 1 13:57:32 2013
@@ -20,12 +20,14 @@ package org.apache.wss4j.policy.stax.tes
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.stax.ext.WSSConstants;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.X509SecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.RelTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
@@ -70,26 +72,30 @@ public class RelTokenTest extends Abstra
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
RelTokenSecurityEvent initiatorTokenSecurityEvent = new RelTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
RelTokenSecurityEvent recipientTokenSecurityEvent = new RelTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java Mon Apr 1 13:57:32 2013
@@ -21,16 +21,17 @@ package org.apache.wss4j.policy.stax.tes
import org.apache.wss4j.common.saml.SAMLCallback;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.bean.SubjectBean;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.opensaml.common.SAMLVersion;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.policy.stax.PolicyViolationException;
import org.apache.wss4j.stax.ext.WSSConstants;
-import org.apache.wss4j.stax.impl.securityToken.SAMLSecurityToken;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SamlTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.testng.Assert;
@@ -85,27 +86,31 @@ public class SamlTokenTest extends Abstr
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -159,9 +164,9 @@ public class SamlTokenTest extends Abstr
SamlAssertionWrapper samlAssertionWrapper = createSamlAssertionWrapper(samlCallback);
SamlTokenSecurityEvent initiatorTokenSecurityEvent = new SamlTokenSecurityEvent();
- SecurityToken securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ SamlSecurityTokenImpl securityToken =
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -170,19 +175,23 @@ public class SamlTokenTest extends Abstr
SamlTokenSecurityEvent recipientTokenSecurityEvent = new SamlTokenSecurityEvent();
securityToken =
- new SAMLSecurityToken(samlAssertionWrapper, getX509Token(WSSConstants.X509V3Token), null, null, "1", null, null);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ new SamlSecurityTokenImpl(samlAssertionWrapper, getX509Token(WSSecurityTokenConstants.X509V3Token), null, null, null, null);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java Mon Apr 1 13:57:32 2013
@@ -22,12 +22,14 @@ import org.apache.wss4j.common.ext.WSSec
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.policy.stax.PolicyViolationException;
import org.apache.wss4j.stax.ext.WSSConstants;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.X509SecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SecureConversationTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -74,27 +76,31 @@ public class SecureConversationTokenTest
SecureConversationTokenSecurityEvent initiatorTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecureConversationTokenSecurityEvent recipientTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
recipientTokenSecurityEvent.setExternalUriRef(true);
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -141,27 +147,31 @@ public class SecureConversationTokenTest
SecureConversationTokenSecurityEvent initiatorTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("sss");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ InboundSecurityToken securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecureConversationTokenSecurityEvent recipientTokenSecurityEvent = new SecureConversationTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("sss");
recipientTokenSecurityEvent.setExternalUriRef(true);
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java Mon Apr 1 13:57:32 2013
@@ -23,12 +23,14 @@ import org.apache.wss4j.common.ext.WSSec
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.policy.stax.PolicyViolationException;
import org.apache.wss4j.stax.ext.WSSConstants;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.X509SecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SecurityContextTokenSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -76,27 +78,31 @@ public class SecurityContextTokenTest ex
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecurityContextTokenSecurityEvent recipientTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
recipientTokenSecurityEvent.setExternalUriRef(true);
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
@@ -144,27 +150,31 @@ public class SecurityContextTokenTest ex
SecurityContextTokenSecurityEvent initiatorTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("sss");
initiatorTokenSecurityEvent.setExternalUriRef(true);
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SecurityContextTokenSecurityEvent recipientTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("sss");
recipientTokenSecurityEvent.setExternalUriRef(true);
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java?rev=1463136&r1=1463135&r2=1463136&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java Mon Apr 1 13:57:32 2013
@@ -20,12 +20,14 @@ package org.apache.wss4j.policy.stax.tes
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.stax.ext.WSSConstants;
+import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
+import org.apache.wss4j.stax.impl.securityToken.X509SecurityTokenImpl;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SpnegoContextTokenSecurityEvent;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
@@ -70,26 +72,30 @@ public class SpnegoContextTokenTest exte
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
SpnegoContextTokenSecurityEvent initiatorTokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
initiatorTokenSecurityEvent.setIssuerName("xs:anyURI");
- SecurityToken securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
+ X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
SpnegoContextTokenSecurityEvent recipientTokenSecurityEvent = new SpnegoContextTokenSecurityEvent();
recipientTokenSecurityEvent.setIssuerName("xs:anyURI");
- securityToken = getX509Token(WSSConstants.X509V3Token);
- securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
+ securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
+ securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
- SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = new ContentEncryptedElementSecurityEvent(recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
+ ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
+ new ContentEncryptedElementSecurityEvent(
+ (InboundSecurityToken)recipientTokenSecurityEvent.getSecurityToken(), true, protectionOrder);
contentEncryptedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(contentEncryptedElementSecurityEvent);