You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/07/10 17:39:43 UTC
svn commit: r1359731 [2/4] - in /webservices/wss4j/branches/swssf:
cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/
streaming-ws-policy/src/main/java/org/swssf/policy/
streaming-ws-policy/src/main/java/org/swssf/policy/assertionState...
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/UsernameTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/UsernameTokenAssertionState.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/UsernameTokenAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/UsernameTokenAssertionState.java Tue Jul 10 15:39:40 2012
@@ -24,10 +24,11 @@ import org.apache.ws.secpolicy.model.Abs
import org.apache.ws.secpolicy.model.UsernameToken;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.TokenSecurityEvent;
import org.swssf.wss.securityEvent.UsernameTokenSecurityEvent;
+import org.swssf.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
/**
* WSP1.3, 5.4.1 UsernameToken Assertion
@@ -43,9 +44,9 @@ public class UsernameTokenAssertionState
}
@Override
- public SecurityEvent.Event[] getSecurityEventType() {
- return new SecurityEvent.Event[]{
- SecurityEvent.Event.UsernameToken
+ public SecurityEventConstants.Event[] getSecurityEventType() {
+ return new SecurityEventConstants.Event[]{
+ WSSecurityEventConstants.UsernameToken
};
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java Tue Jul 10 15:39:40 2012
@@ -24,11 +24,11 @@ import org.apache.ws.secpolicy.model.Abs
import org.apache.ws.secpolicy.model.X509Token;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.TokenSecurityEvent;
-import org.swssf.wss.securityEvent.X509TokenSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import java.security.cert.X509Certificate;
@@ -46,9 +46,9 @@ public class X509TokenAssertionState ext
}
@Override
- public SecurityEvent.Event[] getSecurityEventType() {
- return new SecurityEvent.Event[]{
- SecurityEvent.Event.X509Token
+ public SecurityEventConstants.Event[] getSecurityEventType() {
+ return new SecurityEventConstants.Event[]{
+ SecurityEventConstants.X509Token
};
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AlgorithmSuiteTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/AlgorithmSuiteTest.java Tue Jul 10 15:39:40 2012
@@ -18,11 +18,11 @@
*/
package org.swssf.policy.test;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
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.AlgorithmSuiteSecurityEvent;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
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=1359731&r1=1359730&r2=1359731&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 Tue Jul 10 15:39:40 2012
@@ -25,6 +25,7 @@ import org.swssf.wss.ext.WSSecurityExcep
import org.swssf.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/DerivedKeyTests.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/DerivedKeyTests.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/DerivedKeyTests.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/DerivedKeyTests.java Tue Jul 10 15:39:40 2012
@@ -26,6 +26,7 @@ import org.swssf.wss.impl.securityToken.
import org.swssf.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
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=1359731&r1=1359730&r2=1359731&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 Tue Jul 10 15:39:40 2012
@@ -23,11 +23,11 @@ import org.swssf.policy.PolicyViolationE
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
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.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ProtectionOrderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ProtectionOrderTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ProtectionOrderTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/ProtectionOrderTest.java Tue Jul 10 15:39:40 2012
@@ -24,6 +24,7 @@ import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
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=1359731&r1=1359730&r2=1359731&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 Tue Jul 10 15:39:40 2012
@@ -23,8 +23,8 @@ import org.swssf.policy.PolicyViolationE
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
-import org.swssf.wss.securityEvent.SignedElementSecurityEvent;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SupportingTokensTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SupportingTokensTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SupportingTokensTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/SupportingTokensTest.java Tue Jul 10 15:39:40 2012
@@ -29,6 +29,8 @@ import org.swssf.wss.impl.securityToken.
import org.swssf.wss.impl.securityToken.X509SecurityToken;
import org.swssf.wss.securityEvent.*;
import org.apache.xml.security.stax.ext.SecurityToken;
+import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TokenProtectionTest.java Tue Jul 10 15:39:40 2012
@@ -24,10 +24,10 @@ 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.SignedElementSecurityEvent;
-import org.swssf.wss.securityEvent.X509TokenSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingIntegrationTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingIntegrationTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/TransportBindingIntegrationTest.java Tue Jul 10 15:39:40 2012
@@ -25,10 +25,10 @@ import org.swssf.wss.ext.WSSSecurityProp
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.impl.securityToken.HttpsSecurityToken;
import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
-import org.swssf.wss.securityEvent.SecurityEvent;
import org.swssf.wss.test.CallbackHandlerImpl;
import org.apache.xml.security.stax.ext.SecurePart;
import org.apache.xml.security.stax.ext.SecurityToken;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/WSP13SpecTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/WSP13SpecTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/WSP13SpecTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/WSP13SpecTest.java Tue Jul 10 15:39:40 2012
@@ -19,9 +19,11 @@
package org.swssf.policy.test;
import org.apache.ws.secpolicy.WSSPolicyException;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.swssf.policy.PolicyEnforcer;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.WSSecurityEventConstants;
import org.swssf.wss.test.InboundWSSecurityContextImplTest;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
@@ -41,15 +43,15 @@ public class WSP13SpecTest extends Abstr
public Object[][] ignoreEventsTransportBindingC11a() {
return new Object[][]{
{null, null, null},
- {SecurityEvent.Event.HttpsToken, 0, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}HttpsToken not satisfied"},
- {SecurityEvent.Event.RequiredElement, 2, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
- {SecurityEvent.Event.UsernameToken, 3, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
- {SecurityEvent.Event.X509Token, 4, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
+ {WSSecurityEventConstants.HttpsToken, 0, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}HttpsToken not satisfied"},
+ {WSSecurityEventConstants.RequiredElement, 2, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
+ {WSSecurityEventConstants.UsernameToken, 3, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
+ {SecurityEventConstants.X509Token, 4, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
};
}
@Test(dataProvider = "ignoreEventsTransportBindingC11a")
- public void testTransportBindingC11a(SecurityEvent.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
+ public void testTransportBindingC11a(SecurityEventConstants.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
String policyString = loadResourceAsString("testdata/policy/transportBindingPolicyC11.xml", "UTF-8");
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
@@ -62,14 +64,14 @@ public class WSP13SpecTest extends Abstr
public Object[][] ignoreEventsAsymmetricBindingC31a() {
return new Object[][]{
{null, null, null},
- {SecurityEvent.Event.RequiredElement, 1, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
- {SecurityEvent.Event.X509Token, 2, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
- {SecurityEvent.Event.UsernameToken, 7, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
+ {WSSecurityEventConstants.RequiredElement, 1, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
+ {SecurityEventConstants.X509Token, 2, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
+ {WSSecurityEventConstants.UsernameToken, 7, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
};
}
@Test(dataProvider = "ignoreEventsAsymmetricBindingC31a")
- public void testAsymmetricBindingC31a(SecurityEvent.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
+ public void testAsymmetricBindingC31a(SecurityEventConstants.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
String policyString = loadResourceAsString("testdata/policy/asymmetricBindingPolicyC31.xml", "UTF-8");
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
@@ -82,15 +84,15 @@ public class WSP13SpecTest extends Abstr
public Object[][] ignoreEventsSymmetricBindingC21a() {
return new Object[][]{
{null, null, null},
- {SecurityEvent.Event.RequiredElement, 1, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
- {SecurityEvent.Event.SamlToken, -1, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}IssuedToken not satisfied"},
- {SecurityEvent.Event.UsernameToken, 4, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
- {SecurityEvent.Event.X509Token, 15, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
+ {WSSecurityEventConstants.RequiredElement, 1, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
+ {WSSecurityEventConstants.SamlToken, -1, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}IssuedToken not satisfied"},
+ {WSSecurityEventConstants.UsernameToken, 4, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
+ {SecurityEventConstants.X509Token, 15, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
};
}
@Test(dataProvider = "ignoreEventsSymmetricBindingC21a")
- public void testSymmetricBindingC21a(SecurityEvent.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
+ public void testSymmetricBindingC21a(SecurityEventConstants.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
String policyString = loadResourceAsString("testdata/policy/symmetricBindingPolicyC21a.xml", "UTF-8");
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
@@ -103,15 +105,15 @@ public class WSP13SpecTest extends Abstr
public Object[][] ignoreEventsSymmetricBindingC21b() {
return new Object[][]{
{null, null, null},
- {SecurityEvent.Event.RequiredElement, 1, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
- {SecurityEvent.Event.SamlToken, -1, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}IssuedToken not satisfied"},
- {SecurityEvent.Event.UsernameToken, 4, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
- {SecurityEvent.Event.X509Token, 15, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
+ {WSSecurityEventConstants.RequiredElement, 1, "\nElement /{http://schemas.xmlsoap.org/soap/envelope/}Envelope/{http://schemas.xmlsoap.org/soap/envelope/}Header/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}Security/{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp must be present"},
+ {WSSecurityEventConstants.SamlToken, -1, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}IssuedToken not satisfied"},
+ {WSSecurityEventConstants.UsernameToken, 4, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}UsernameToken not satisfied"},
+ {SecurityEventConstants.X509Token, 15, "Assertion {http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702}X509Token not satisfied"},
};
}
@Test(dataProvider = "ignoreEventsSymmetricBindingC21b")
- public void testSymmetricBindingC21b(SecurityEvent.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
+ public void testSymmetricBindingC21b(SecurityEventConstants.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage) throws Exception {
String policyString = loadResourceAsString("testdata/policy/symmetricBindingPolicyC21b.xml", "UTF-8");
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
@@ -120,7 +122,7 @@ public class WSP13SpecTest extends Abstr
applyPolicy(ignoreEvent, eventIndex, expectedErrorMessage, policyEnforcer, securityEventList);
}
- private void applyPolicy(SecurityEvent.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage, PolicyEnforcer policyEnforcer, List<SecurityEvent> securityEventList) throws WSSecurityException {
+ private void applyPolicy(SecurityEventConstants.Event ignoreEvent, Integer eventIndex, String expectedErrorMessage, PolicyEnforcer policyEnforcer, List<SecurityEvent> securityEventList) throws WSSecurityException {
try {
for (int i = 0; i < securityEventList.size(); i++) {
SecurityEvent securityEvent = securityEventList.get(i);
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/test/java/org/swssf/policy/test/X509TokenTest.java Tue Jul 10 15:39:40 2012
@@ -24,9 +24,9 @@ import org.swssf.wss.ext.WSSecurityExcep
import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
import org.swssf.wss.securityEvent.OperationSecurityEvent;
import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
-import org.swssf.wss.securityEvent.X509TokenSecurityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import org.testng.Assert;
import org.testng.annotations.Test;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/InboundWSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/InboundWSSec.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/InboundWSSec.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/InboundWSSec.java Tue Jul 10 15:39:40 2012
@@ -24,14 +24,16 @@ import org.swssf.wss.impl.InboundWSSecur
import org.swssf.wss.impl.processor.input.OperationInputProcessor;
import org.swssf.wss.impl.processor.input.SecurityHeaderInputProcessor;
import org.swssf.wss.impl.processor.input.SignatureConfirmationInputProcessor;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.SecurityEventListener;
+import org.swssf.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.InputProcessor;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.impl.DocumentContextImpl;
import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
import org.apache.xml.security.stax.impl.XMLSecurityStreamReader;
import org.apache.xml.security.stax.impl.processor.input.LogInputProcessor;
import org.apache.xml.security.stax.impl.processor.input.XMLEventReaderInputProcessor;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
@@ -86,9 +88,9 @@ public class InboundWSSec {
* @param xmlStreamReader The original XMLStreamReader
* @return A new XMLStreamReader which does transparently the security processing.
* @throws XMLStreamException thrown when a streaming error occurs
- * @throws WSSecurityException thrown when a Security failure occurs
+ * @throws XMLSecurityException
*/
- public XMLStreamReader processInMessage(XMLStreamReader xmlStreamReader) throws XMLStreamException, WSSecurityException {
+ public XMLStreamReader processInMessage(XMLStreamReader xmlStreamReader) throws XMLStreamException, XMLSecurityException {
return this.processInMessage(xmlStreamReader, null, null);
}
@@ -108,9 +110,9 @@ public class InboundWSSec {
* @param securityEventListener A SecurityEventListener to receive security-relevant events.
* @return A new XMLStreamReader which does transparently the security processing.
* @throws XMLStreamException thrown when a streaming error occurs
- * @throws WSSecurityException thrown when a Security failure occurs
+ * @throws XMLSecurityException
*/
- public XMLStreamReader processInMessage(XMLStreamReader xmlStreamReader, List<SecurityEvent> requestSecurityEvents, SecurityEventListener securityEventListener) throws XMLStreamException, WSSecurityException {
+ public XMLStreamReader processInMessage(XMLStreamReader xmlStreamReader, List<SecurityEvent> requestSecurityEvents, SecurityEventListener securityEventListener) throws XMLStreamException, XMLSecurityException {
if (requestSecurityEvents == null) {
requestSecurityEvents = Collections.emptyList();
@@ -125,7 +127,7 @@ public class InboundWSSec {
Iterator<SecurityEvent> securityEventIterator = requestSecurityEvents.iterator();
while (securityEventIterator.hasNext()) {
SecurityEvent securityEvent = securityEventIterator.next();
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.HttpsToken) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.HttpsToken) {
securityContextImpl.registerSecurityEvent(securityEvent);
securityContextImpl.put(WSSConstants.TRANSPORT_SECURITY_ACTIVE, Boolean.TRUE);
break;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/OutboundWSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/OutboundWSSec.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/OutboundWSSec.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/OutboundWSSec.java Tue Jul 10 15:39:40 2012
@@ -20,8 +20,6 @@ package org.swssf.wss.ext;
import org.swssf.wss.impl.WSSecurityContextImpl;
import org.swssf.wss.impl.processor.output.*;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.SecurityEventListener;
import org.apache.xml.security.stax.ext.OutputProcessor;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
@@ -29,6 +27,8 @@ import org.apache.xml.security.stax.impl
import org.apache.xml.security.stax.impl.OutputProcessorChainImpl;
import org.apache.xml.security.stax.impl.XMLSecurityStreamWriter;
import org.apache.xml.security.stax.impl.processor.output.FinalOutputProcessor;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
import javax.xml.stream.XMLStreamWriter;
import java.io.OutputStream;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java Tue Jul 10 15:39:40 2012
@@ -264,31 +264,16 @@ public class WSSConstants extends XMLSec
}
//todo rename KeyUsage because C14N, etc are not keys...
- public static final KeyUsage Sym_Sig = new KeyUsage(XMLSecurityConstants.Sym_Sig.toString());
- public static final KeyUsage Asym_Sig = new KeyUsage(XMLSecurityConstants.Asym_Sig.toString());
- public static final KeyUsage Enc = new KeyUsage(XMLSecurityConstants.Enc.toString());
- public static final KeyUsage Dig = new KeyUsage("Dig");
public static final KeyUsage Sym_Key_Wrap = new KeyUsage("Sym_Key_Wrap");
public static final KeyUsage Asym_Key_Wrap = new KeyUsage("Asym_Key_Wrap");
public static final KeyUsage Comp_Key = new KeyUsage("Comp_Key");
public static final KeyUsage Enc_KD = new KeyUsage("Enc_KD");
public static final KeyUsage Sig_KD = new KeyUsage("Sig_KD");
- public static final KeyUsage C14n = new KeyUsage("C14n");
public static final KeyUsage Soap_Norm = new KeyUsage("Soap_Norm");
public static final KeyUsage STR_Trans = new KeyUsage("STR_Trans");
public static final KeyUsage XPath = new KeyUsage("XPath");
- public static class KeyUsage extends XMLSecurityConstants.KeyUsage {
- protected KeyUsage(String name) {
- super(name);
- }
- }
-
public static final TokenType EncryptedKeyToken = new TokenType("EncryptedKeyToken");
- public static final TokenType X509V3Token = new TokenType("X509V3Token");
- public static final TokenType X509V1Token = new TokenType("X509V1Token");
- public static final TokenType X509Pkcs7Token = new TokenType("X509Pkcs7Token");
- public static final TokenType X509PkiPathV1Token = new TokenType("X509PkiPathV1Token");
public static final TokenType UsernameToken = new TokenType("UsernameToken");
public static final TokenType SecurityContextToken = new TokenType("SecurityContextToken");
public static final TokenType Saml10Token = new TokenType("Saml10Token");
@@ -300,15 +285,8 @@ public class WSSConstants extends XMLSec
public static final TokenType KerberosToken = new TokenType("KerberosToken");
public static final TokenType SpnegoContextToken = new TokenType("SpnegoContextToken");
public static final TokenType RelToken = new TokenType("RelToken");
- public static final TokenType KeyValueToken = new TokenType("KeyValueToken");
public static final TokenType DerivedKeyToken = new TokenType("DerivedKeyToken");
- public static class TokenType extends XMLSecurityConstants.TokenType {
- protected TokenType(String name) {
- super(name);
- }
- }
-
public enum WSSKeyIdentifierType implements KeyIdentifierType {
ISSUER_SERIAL,
SECURITY_TOKEN_DIRECT_REFERENCE,
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSUtils.java Tue Jul 10 15:39:40 2012
@@ -24,7 +24,19 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import org.swssf.wss.securityEvent.*;
+import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
+import org.swssf.wss.securityEvent.DerivedKeyTokenSecurityEvent;
+import org.swssf.wss.securityEvent.EncryptedKeyTokenSecurityEvent;
+import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
+import org.swssf.wss.securityEvent.KerberosTokenSecurityEvent;
+import org.swssf.wss.securityEvent.RelTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SamlTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SecureConversationTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityContextTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SpnegoContextTokenSecurityEvent;
+import org.swssf.wss.securityEvent.UsernameTokenSecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSecurityContext.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSecurityContext.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSecurityContext.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSecurityContext.java Tue Jul 10 15:39:40 2012
@@ -18,7 +18,6 @@
*/
package org.swssf.wss.ext;
-import org.swssf.wss.securityEvent.SecurityEventListener;
import org.apache.xml.security.stax.ext.SecurityContext;
import java.util.List;
@@ -29,14 +28,7 @@ import java.util.List;
* @author $Author$
* @version $Revision$ $Date$
*/
-public interface WSSecurityContext extends SecurityContext, SecurityEventListener {
-
- /**
- * Registers a SecurityEventListener to receive Security-Events
- *
- * @param securityEventListener The SecurityEventListener
- */
- public void addSecurityEventListener(SecurityEventListener securityEventListener);
+public interface WSSecurityContext extends SecurityContext {
public void handleBSPRule(WSSConstants.BSPRule bspRule) throws WSSecurityException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/InboundWSSecurityContextImpl.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/InboundWSSecurityContextImpl.java Tue Jul 10 15:39:40 2012
@@ -24,9 +24,15 @@ import org.apache.commons.logging.LogFac
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSUtils;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.*;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.EncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.HttpsTokenSecurityEvent;
+import org.swssf.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import javax.xml.namespace.QName;
import java.util.*;
@@ -47,7 +53,7 @@ public class InboundWSSecurityContextImp
private List<WSSConstants.BSPRule> ignoredBSPRules = Collections.emptyList();
- public synchronized void registerSecurityEvent(SecurityEvent securityEvent) throws WSSecurityException {
+ public synchronized void registerSecurityEvent(SecurityEvent securityEvent) throws XMLSecurityException {
if (operationSecurityEventOccured) {
if (!this.messageEncryptionTokenOccured) {
@@ -75,7 +81,7 @@ public class InboundWSSecurityContextImp
return;
}
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.Operation) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.Operation) {
operationSecurityEventOccured = true;
try {
@@ -120,7 +126,7 @@ public class InboundWSSecurityContextImp
while (securityEventIterator.hasNext()) {
SecurityEvent securityEvent = securityEventIterator.next();
if (securityEvent instanceof TokenSecurityEvent) {
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.HttpsToken) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.HttpsToken) {
HttpsTokenSecurityEvent actHttpsTokenSecurityEvent = (HttpsTokenSecurityEvent) securityEvent;
actHttpsTokenSecurityEvent.getSecurityToken().getTokenUsages().clear();
actHttpsTokenSecurityEvent.getSecurityToken().addTokenUsage(SecurityToken.TokenUsage.MainSignature);
@@ -380,7 +386,7 @@ public class InboundWSSecurityContextImp
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignedElement) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.SignedElement) {
SignedElementSecurityEvent signedElementSecurityEvent = (SignedElementSecurityEvent) securityEvent;
if (signedElementSecurityEvent.isSigned()
&& WSSUtils.pathMatches(signedElementSecurityEvent.getElementPath(), tokenSecurityEvent.getSecurityToken().getElementPath(), true, false)) {
@@ -419,7 +425,7 @@ public class InboundWSSecurityContextImp
}
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignedElement) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.SignedElement) {
SignedElementSecurityEvent signedElementSecurityEvent = (SignedElementSecurityEvent) securityEvent;
if (signedElementSecurityEvent.isSigned()
&& tokenSecurityEvent.getSecurityToken() != null
@@ -444,7 +450,7 @@ public class InboundWSSecurityContextImp
List<SecurityToken> securityTokenList = new ArrayList<SecurityToken>();
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.EncryptedElement) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.EncryptedElement) {
EncryptedElementSecurityEvent encryptedElementSecurityEvent = (EncryptedElementSecurityEvent) securityEvent;
if (encryptedElementSecurityEvent.isEncrypted()
&& tokenSecurityEvent.getSecurityToken() != null
@@ -464,7 +470,7 @@ public class InboundWSSecurityContextImp
Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignedElement) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.SignedElement) {
SignedElementSecurityEvent signedElementSecurityEvent = (SignedElementSecurityEvent) securityEvent;
if (signedElementSecurityEvent.isSigned()
&& signedElementSecurityEvent.getSecurityToken() == tokenSecurityEvent.getSecurityToken()
@@ -480,14 +486,14 @@ public class InboundWSSecurityContextImp
Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
SecurityEvent securityEvent = iterator.next();
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.EncryptedElement) {
+ if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.EncryptedElement) {
EncryptedElementSecurityEvent encryptedElementSecurityEvent = (EncryptedElementSecurityEvent) securityEvent;
if (encryptedElementSecurityEvent.isEncrypted()
&& encryptedElementSecurityEvent.getSecurityToken() == tokenSecurityEvent.getSecurityToken()
&& WSSUtils.pathMatches(elementPath, encryptedElementSecurityEvent.getElementPath(), true, false)) {
return true;
}
- } else if (securityEvent.getSecurityEventType() == SecurityEvent.Event.ContentEncrypted) {
+ } else if (securityEvent.getSecurityEventType() == WSSecurityEventConstants.ContentEncrypted) {
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent = (ContentEncryptedElementSecurityEvent) securityEvent;
if (contentEncryptedElementSecurityEvent.isEncrypted()
&& contentEncryptedElementSecurityEvent.getSecurityToken() == tokenSecurityEvent.getSecurityToken()
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/WSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/WSSecurityContextImpl.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/WSSecurityContextImpl.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/WSSecurityContextImpl.java Tue Jul 10 15:39:40 2012
@@ -21,11 +21,8 @@ package org.swssf.wss.impl;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityContext;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.SecurityEventListener;
import org.apache.xml.security.stax.impl.SecurityContextImpl;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -36,25 +33,6 @@ import java.util.List;
*/
public class WSSecurityContextImpl extends SecurityContextImpl implements WSSecurityContext {
- private final List<SecurityEventListener> securityEventListeners = new ArrayList<SecurityEventListener>(2);
-
- public void addSecurityEventListener(SecurityEventListener securityEventListener) {
- if (securityEventListener != null) {
- this.securityEventListeners.add(securityEventListener);
- }
- }
-
- public synchronized void registerSecurityEvent(SecurityEvent securityEvent) throws WSSecurityException {
- forwardSecurityEvent(securityEvent);
- }
-
- protected void forwardSecurityEvent(SecurityEvent securityEvent) throws WSSecurityException {
- for (int i = 0; i < securityEventListeners.size(); i++) {
- SecurityEventListener securityEventListener = securityEventListeners.get(i);
- securityEventListener.registerSecurityEvent(securityEvent);
- }
- }
-
public void handleBSPRule(WSSConstants.BSPRule bspRule) throws WSSecurityException {
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java Tue Jul 10 15:39:40 2012
@@ -25,11 +25,11 @@ import org.swssf.wss.ext.WSSecurityConte
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.ext.WSSecurityToken;
import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl;
-import org.swssf.wss.securityEvent.X509TokenSecurityEvent;
import org.apache.xml.security.stax.crypto.Crypto;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java Tue Jul 10 15:39:40 2012
@@ -27,10 +27,10 @@ import org.swssf.wss.ext.*;
import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
import org.swssf.wss.securityEvent.EncryptedElementSecurityEvent;
import org.swssf.wss.securityEvent.EncryptedPartSecurityEvent;
-import org.swssf.wss.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.processor.input.AbstractDecryptInputProcessor;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
@@ -121,7 +121,7 @@ public class DecryptInputProcessor exten
EncryptedDataType encryptedDataType) throws XMLSecurityException {
securityToken.addTokenUsage(SecurityToken.TokenUsage.Encryption);
TokenSecurityEvent tokenSecurityEvent = WSSUtils.createTokenSecurityEvent(securityToken);
- ((WSSecurityContext) securityContext).registerSecurityEvent(tokenSecurityEvent);
+ securityContext.registerSecurityEvent(tokenSecurityEvent);
}
/*
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java Tue Jul 10 15:39:40 2012
@@ -27,12 +27,12 @@ import org.swssf.wss.impl.securityToken.
import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl;
import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
-import org.swssf.wss.securityEvent.AlgorithmSuiteSecurityEvent;
import org.swssf.wss.securityEvent.DerivedKeyTokenSecurityEvent;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.JAXBElement;
@@ -148,7 +148,7 @@ public class DerivedKeyTokenInputHandler
algorithmSuiteSecurityEvent.setAlgorithmURI(derivedKeyAlgorithm);
algorithmSuiteSecurityEvent.setKeyUsage(derivedKeyUsage);
algorithmSuiteSecurityEvent.setKeyLength(keyBytes.length * 8);
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(algorithmSuiteSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(algorithmSuiteSecurityEvent);
String algo = JCEAlgorithmMapper.getJCERequiredKeyFromURI(algorithmURI);
return new SecretKeySpec(keyBytes, algo);
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java Tue Jul 10 15:39:40 2012
@@ -26,13 +26,13 @@ import org.apache.xml.security.binding.x
import org.swssf.wss.ext.*;
import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.swssf.wss.securityEvent.EncryptedKeyTokenSecurityEvent;
-import org.swssf.wss.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
import org.apache.xml.security.stax.crypto.Crypto;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.securityToken.SecurityTokenFactory;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.xmlsecurity.ns.configuration.AlgorithmType;
import javax.crypto.BadPaddingException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java Tue Jul 10 15:39:40 2012
@@ -22,13 +22,13 @@ import org.swssf.binding.wss11.Signature
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.SignatureValueSecurityEvent;
import org.apache.xml.security.stax.ext.AbstractInputProcessor;
import org.apache.xml.security.stax.ext.InputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java Tue Jul 10 15:39:40 2012
@@ -30,12 +30,12 @@ import org.swssf.wss.ext.WSSSecurityProp
import org.swssf.wss.ext.WSSUtils;
import org.swssf.wss.ext.WSSecurityContext;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.securityEvent.AlgorithmSuiteSecurityEvent;
-import org.swssf.wss.securityEvent.SignatureValueSecurityEvent;
-import org.swssf.wss.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.impl.processor.input.AbstractSignatureInputHandler;
import org.apache.xml.security.stax.impl.securityToken.SecurityTokenFactory;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import java.math.BigInteger;
import java.util.Iterator;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java Tue Jul 10 15:39:40 2012
@@ -29,23 +29,19 @@ import org.apache.xml.security.binding.x
import org.apache.xml.security.binding.xmldsig.TransformType;
import org.swssf.wss.ext.*;
import org.swssf.wss.impl.securityToken.SecurityTokenReference;
-import org.swssf.wss.securityEvent.AlgorithmSuiteSecurityEvent;
-import org.swssf.wss.securityEvent.SignedElementSecurityEvent;
import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
import org.swssf.wss.securityEvent.TimestampSecurityEvent;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.processor.input.AbstractSignatureReferenceVerifyInputProcessor;
-import org.xmlsecurity.ns.configuration.AlgorithmType;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
import java.lang.reflect.InvocationTargetException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -148,47 +144,37 @@ public class WSSSignatureReferenceVerify
detectReplayAttack(inputProcessorChain);
}
- XMLSecEvent xmlSecEvent = inputProcessorChain.processEvent();
-
- if (xmlSecEvent.getEventType() == XMLStreamConstants.START_ELEMENT) {
- final DocumentContext documentContext = inputProcessorChain.getDocumentContext();
- XMLSecStartElement xmlSecStartElement = xmlSecEvent.asStartElement();
- ReferenceType referenceType = matchesReferenceId(xmlSecStartElement);
- if (referenceType != null) {
-
- if (getProcessedReferences().contains(referenceType)) {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_CHECK, "duplicateId");
- }
- InternalSignatureReferenceVerifier internalSignatureReferenceVerifier =
- new InternalSignatureReferenceVerifier(
- ((WSSSecurityProperties) getSecurityProperties()), inputProcessorChain,
- referenceType, xmlSecStartElement.getName());
- if (!internalSignatureReferenceVerifier.isFinished()) {
- internalSignatureReferenceVerifier.processEvent(xmlSecEvent, inputProcessorChain);
- inputProcessorChain.addProcessor(internalSignatureReferenceVerifier);
- }
- getProcessedReferences().add(referenceType);
- documentContext.setIsInSignedContent(inputProcessorChain.getProcessors().indexOf(internalSignatureReferenceVerifier), internalSignatureReferenceVerifier);
-
- List<QName> elementPath = xmlSecStartElement.getElementPath();
-
- //fire a SecurityEvent:
- if (elementPath.size() == 3 && WSSUtils.isInSOAPHeader(elementPath)) {
- SignedPartSecurityEvent signedPartSecurityEvent =
- new SignedPartSecurityEvent(getSecurityToken(), true, documentContext.getProtectionOrder());
- signedPartSecurityEvent.setElementPath(elementPath);
- signedPartSecurityEvent.setXmlSecEvent(xmlSecEvent);
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(signedPartSecurityEvent);
- } else {
- SignedElementSecurityEvent signedElementSecurityEvent =
- new SignedElementSecurityEvent(getSecurityToken(), true, documentContext.getProtectionOrder());
- signedElementSecurityEvent.setElementPath(elementPath);
- signedElementSecurityEvent.setXmlSecEvent(xmlSecEvent);
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(signedElementSecurityEvent);
- }
- }
+ return super.processNextEvent(inputProcessorChain);
+ }
+
+ @Override
+ protected void processElementPath(List<QName> elementPath,
+ InputProcessorChain inputProcessorChain, XMLSecEvent xmlSecEvent)
+ throws XMLSecurityException {
+ //fire a SecurityEvent:
+ final DocumentContext documentContext = inputProcessorChain.getDocumentContext();
+ if (elementPath.size() == 3 && WSSUtils.isInSOAPHeader(elementPath)) {
+ SignedPartSecurityEvent signedPartSecurityEvent =
+ new SignedPartSecurityEvent(getSecurityToken(), true, documentContext.getProtectionOrder());
+ signedPartSecurityEvent.setElementPath(elementPath);
+ signedPartSecurityEvent.setXmlSecEvent(xmlSecEvent);
+ ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(signedPartSecurityEvent);
+ } else {
+ SignedElementSecurityEvent signedElementSecurityEvent =
+ new SignedElementSecurityEvent(getSecurityToken(), true, documentContext.getProtectionOrder());
+ signedElementSecurityEvent.setElementPath(elementPath);
+ signedElementSecurityEvent.setXmlSecEvent(xmlSecEvent);
+ ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(signedElementSecurityEvent);
}
- return xmlSecEvent;
+ }
+
+ @Override
+ protected InternalSignatureReferenceVerifier getSignatureReferenceVerifier(
+ XMLSecurityProperties securityProperties, InputProcessorChain inputProcessorChain,
+ ReferenceType referenceType, QName startElement) throws XMLSecurityException {
+ return new InternalSignatureReferenceVerifier((WSSSecurityProperties)securityProperties,
+ inputProcessorChain, referenceType,
+ startElement);
}
private void detectReplayAttack(InputProcessorChain inputProcessorChain) throws WSSecurityException {
@@ -232,17 +218,6 @@ public class WSSSignatureReferenceVerify
this.addAfterProcessor(WSSSignatureReferenceVerifyInputProcessor.class.getName());
}
- protected AlgorithmType createMessageDigest(SecurityContext securityContext)
- throws XMLSecurityException, NoSuchAlgorithmException, NoSuchProviderException {
- AlgorithmType digestAlgorithm = super.createMessageDigest(securityContext);
-
- AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
- algorithmSuiteSecurityEvent.setAlgorithmURI(digestAlgorithm.getURI());
- algorithmSuiteSecurityEvent.setKeyUsage(WSSConstants.Dig);
- ((WSSecurityContext) securityContext).registerSecurityEvent(algorithmSuiteSecurityEvent);
- return digestAlgorithm;
- }
-
protected void buildTransformerChain(ReferenceType referenceType, InputProcessorChain inputProcessorChain)
throws XMLSecurityException, XMLStreamException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
@@ -318,4 +293,5 @@ public class WSSSignatureReferenceVerify
super.processEvent(xmlSecEvent, inputProcessorChain);
}
}
+
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java Tue Jul 10 15:39:40 2012
@@ -20,13 +20,13 @@ package org.swssf.wss.impl.processor.out
import org.swssf.wss.ext.*;
import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.crypto.CryptoType;
import org.apache.xml.security.stax.ext.*;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java Tue Jul 10 15:39:40 2012
@@ -22,8 +22,6 @@ import org.apache.commons.codec.binary.B
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.securityEvent.SecurityEvent;
-import org.swssf.wss.securityEvent.SignatureValueSecurityEvent;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityException;
@@ -31,6 +29,9 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
+import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -63,7 +64,7 @@ public class SignatureConfirmationOutput
List<SecurityEvent> requestSecurityEvents = outputProcessorChain.getSecurityContext().getAsList(SecurityEvent.class);
for (int i = 0; i < requestSecurityEvents.size(); i++) {
SecurityEvent securityEvent = requestSecurityEvents.get(i);
- if (securityEvent.getSecurityEventType() == SecurityEvent.Event.SignatureValue) {
+ if (securityEvent.getSecurityEventType() == SecurityEventConstants.SignatureValue) {
aSignatureFound = true;
SignatureValueSecurityEvent signatureValueSecurityEvent = (SignatureValueSecurityEvent) securityEvent;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/WSSSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/WSSSignatureEndingOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/WSSSignatureEndingOutputProcessor.java Tue Jul 10 15:39:40 2012
@@ -28,11 +28,10 @@ import org.apache.xml.security.stax.impl
import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithm;
import org.apache.xml.security.stax.impl.processor.output.AbstractSignatureEndingOutputProcessor;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
-import org.swssf.wss.ext.WSSecurityContext;
-import org.swssf.wss.securityEvent.SignatureValueSecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
@@ -84,7 +83,7 @@ public class WSSSignatureEndingOutputPro
SignatureValueSecurityEvent signatureValueSecurityEvent = new SignatureValueSecurityEvent();
signatureValueSecurityEvent.setSignatureValue(this.signedInfoProcessor.getSignatureValue());
- ((WSSecurityContext) outputProcessorChain.getSecurityContext()).registerSecurityEvent(signatureValueSecurityEvent);
+ outputProcessorChain.getSecurityContext().registerSecurityEvent(signatureValueSecurityEvent);
}
@Override
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/AbstractSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/AbstractSecurityToken.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/AbstractSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/AbstractSecurityToken.java Tue Jul 10 15:39:40 2012
@@ -22,12 +22,12 @@ import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityContext;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.ext.WSSecurityToken;
-import org.swssf.wss.securityEvent.AlgorithmSuiteSecurityEvent;
import org.apache.xml.security.stax.crypto.Crypto;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
import javax.crypto.SecretKey;
import javax.security.auth.callback.CallbackHandler;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/ContentEncryptedElementSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -20,6 +20,7 @@ package org.swssf.wss.securityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent;
import java.util.List;
@@ -30,6 +31,6 @@ import java.util.List;
public class ContentEncryptedElementSecurityEvent extends AbstractSecuredElementSecurityEvent {
public ContentEncryptedElementSecurityEvent(SecurityToken securityToken, boolean encrypted, List<XMLSecurityConstants.ContentType> protectionOrder) {
- super(Event.ContentEncrypted, securityToken, protectionOrder, false, encrypted);
+ super(WSSecurityEventConstants.ContentEncrypted, securityToken, protectionOrder, false, encrypted);
}
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/DerivedKeyTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/DerivedKeyTokenSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/DerivedKeyTokenSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/DerivedKeyTokenSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -18,6 +18,8 @@
*/
package org.swssf.wss.securityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
+
/**
* @author $Author$
* @version $Revision$ $Date$
@@ -27,6 +29,6 @@ public class DerivedKeyTokenSecurityEven
//todo implement
public DerivedKeyTokenSecurityEvent() {
- super(Event.DerivedKeyToken);
+ super(WSSecurityEventConstants.DerivedKeyToken);
}
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedElementSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -20,6 +20,7 @@ package org.swssf.wss.securityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent;
import java.util.List;
@@ -30,6 +31,6 @@ import java.util.List;
public class EncryptedElementSecurityEvent extends AbstractSecuredElementSecurityEvent {
public EncryptedElementSecurityEvent(SecurityToken securityToken, boolean encrypted, List<XMLSecurityConstants.ContentType> protectionOrder) {
- super(Event.EncryptedElement, securityToken, protectionOrder, false, encrypted);
+ super(WSSecurityEventConstants.EncryptedElement, securityToken, protectionOrder, false, encrypted);
}
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedKeyTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedKeyTokenSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedKeyTokenSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedKeyTokenSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -18,6 +18,8 @@
*/
package org.swssf.wss.securityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
+
/**
* @author $Author$
* @version $Revision$ $Date$
@@ -27,6 +29,6 @@ public class EncryptedKeyTokenSecurityEv
//todo implement
public EncryptedKeyTokenSecurityEvent() {
- super(Event.EncryptedKeyToken);
+ super(WSSecurityEventConstants.EncryptedKeyToken);
}
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/EncryptedPartSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -20,6 +20,7 @@ package org.swssf.wss.securityEvent;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityEvent.AbstractSecuredElementSecurityEvent;
import java.util.List;
@@ -30,6 +31,6 @@ import java.util.List;
public class EncryptedPartSecurityEvent extends AbstractSecuredElementSecurityEvent {
public EncryptedPartSecurityEvent(SecurityToken securityToken, boolean encrypted, List<XMLSecurityConstants.ContentType> protectionOrder) {
- super(Event.EncryptedPart, securityToken, protectionOrder, false, encrypted);
+ super(WSSecurityEventConstants.EncryptedPart, securityToken, protectionOrder, false, encrypted);
}
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/HttpsTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/HttpsTokenSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/HttpsTokenSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/HttpsTokenSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -23,6 +23,7 @@ import org.swssf.wss.impl.securityToken.
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import java.security.Key;
import java.security.PublicKey;
@@ -45,7 +46,7 @@ public class HttpsTokenSecurityEvent ext
private String issuerName;
public HttpsTokenSecurityEvent() {
- super(Event.HttpsToken);
+ super(WSSecurityEventConstants.HttpsToken);
}
public AuthenticationType getAuthenticationType() {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/IssuedTokenSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -18,12 +18,14 @@
*/
package org.swssf.wss.securityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
+
/**
* @author $Author$
* @version $Revision$ $Date$
*/
public abstract class IssuedTokenSecurityEvent extends TokenSecurityEvent {
- public IssuedTokenSecurityEvent(Event securityEventType) {
+ public IssuedTokenSecurityEvent(WSSecurityEventConstants.Event securityEventType) {
super(securityEventType);
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/KerberosTokenSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -18,6 +18,8 @@
*/
package org.swssf.wss.securityEvent;
+import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
+
/**
* @author $Author$
* @version $Revision$ $Date$
@@ -27,7 +29,7 @@ public class KerberosTokenSecurityEvent
private String issuerName;
public KerberosTokenSecurityEvent() {
- super(Event.KerberosToken);
+ super(WSSecurityEventConstants.KerberosToken);
}
public String getIssuerName() {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/OperationSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/OperationSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/OperationSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/OperationSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -20,6 +20,8 @@ package org.swssf.wss.securityEvent;
import javax.xml.namespace.QName;
+import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+
/**
* @author $Author$
* @version $Revision$ $Date$
@@ -29,7 +31,7 @@ public class OperationSecurityEvent exte
private QName operation;
public OperationSecurityEvent() {
- super(Event.Operation);
+ super(WSSecurityEventConstants.Operation);
}
public QName getOperation() {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RelTokenSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -28,7 +28,7 @@ public class RelTokenSecurityEvent exten
private String issuerName;
public RelTokenSecurityEvent() {
- super(Event.RelToken);
+ super(WSSecurityEventConstants.RelToken);
}
@Override
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RequiredElementSecurityEvent.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RequiredElementSecurityEvent.java?rev=1359731&r1=1359730&r2=1359731&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RequiredElementSecurityEvent.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/RequiredElementSecurityEvent.java Tue Jul 10 15:39:40 2012
@@ -18,6 +18,8 @@
*/
package org.swssf.wss.securityEvent;
+import org.apache.xml.security.stax.securityEvent.AbstractElementSecurityEvent;
+
/**
* @author $Author$
* @version $Revision$ $Date$
@@ -25,6 +27,6 @@ package org.swssf.wss.securityEvent;
public class RequiredElementSecurityEvent extends AbstractElementSecurityEvent {
public RequiredElementSecurityEvent() {
- super(Event.RequiredElement);
+ super(WSSecurityEventConstants.RequiredElement);
}
}