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 2011/10/11 20:03:15 UTC
svn commit: r1181995 [2/26] - in /webservices/wss4j/branches/swssf: ./
cxf-integration/ cxf-integration/src/main/java/org/swssf/cxfIntegration/
cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/
cxf-integration/src/main/java/org/swssf/...
Modified: webservices/wss4j/branches/swssf/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/pom.xml?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/pom.xml (original)
+++ webservices/wss4j/branches/swssf/pom.xml Tue Oct 11 18:03:00 2011
@@ -17,6 +17,7 @@
</developers>
<modules>
+ <module>streaming-xml-security</module>
<module>streaming-ws-security</module>
<module>streaming-ws-policy</module>
<module>cxf-integration</module>
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/pom.xml Tue Oct 11 18:03:00 2011
@@ -20,9 +20,27 @@
<artifactId>streaming-ws-security</artifactId>
<version>1.0.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>2.0.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.swssf</groupId>
+ <artifactId>streaming-xml-security</artifactId>
+ <version>1.0.0</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.swssf</groupId>
<artifactId>streaming-ws-security</artifactId>
<version>1.0.0</version>
<classifier>tests</classifier>
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcer.java Tue Oct 11 18:03:00 2011
@@ -21,11 +21,11 @@ package org.swssf.policy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.*;
-import org.swssf.ext.WSSecurityException;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.WSSPolicyException;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.*;
+import org.swssf.wss.ext.WSSecurityException;
+import org.swssf.wss.securityEvent.*;
import java.util.*;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyEnforcerFactory.java Tue Oct 11 18:03:00 2011
@@ -26,10 +26,10 @@ import org.apache.commons.logging.LogFac
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.swssf.ext.Constants;
-import org.swssf.impl.util.ConcreteLSInput;
import org.swssf.policy.secpolicy.WSSPolicyException;
import org.swssf.policy.secpolicybuilder.*;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.xmlsec.impl.util.ConcreteLSInput;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.ls.LSInput;
@@ -253,12 +253,12 @@ public class PolicyEnforcerFactory {
SOAPOperation soapOperation = (SOAPOperation) extensibilityElement;
String soapActionUri = soapOperation.getSoapActionURI();
operationPolicy.setOperationAction(soapActionUri);
- operationPolicy.setSoapMessageVersionNamespace(Constants.NS_SOAP11);
+ operationPolicy.setSoapMessageVersionNamespace(WSSConstants.NS_SOAP11);
} else if (extensibilityElement instanceof SOAP12Operation) {
SOAP12Operation soap12Operation = (SOAP12Operation) extensibilityElement;
String soapActionUri = soap12Operation.getSoapActionURI();
operationPolicy.setOperationAction(soapActionUri);
- operationPolicy.setSoapMessageVersionNamespace(Constants.NS_SOAP12);
+ operationPolicy.setSoapMessageVersionNamespace(WSSConstants.NS_SOAP12);
}
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/PolicyInputProcessor.java Tue Oct 11 18:03:00 2011
@@ -18,9 +18,15 @@
*/
package org.swssf.policy;
-import org.swssf.ext.*;
-import org.swssf.impl.processor.input.SecurityHeaderInputProcessor;
-import org.swssf.securityEvent.*;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.ext.WSSDocumentContext;
+import org.swssf.wss.ext.WSSecurityException;
+import org.swssf.wss.impl.processor.input.SecurityHeaderInputProcessor;
+import org.swssf.wss.securityEvent.*;
+import org.swssf.xmlsec.ext.AbstractInputProcessor;
+import org.swssf.xmlsec.ext.InputProcessorChain;
+import org.swssf.xmlsec.ext.XMLSecurityException;
+import org.swssf.xmlsec.ext.XMLSecurityProperties;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
@@ -37,15 +43,15 @@ public class PolicyInputProcessor extend
private boolean firstHeaderCall = true;
private boolean firstBodyCall = true;
- public PolicyInputProcessor(PolicyEnforcer policyEnforcer, SecurityProperties securityProperties) {
+ public PolicyInputProcessor(PolicyEnforcer policyEnforcer, XMLSecurityProperties securityProperties) {
super(securityProperties);
- this.setPhase(Constants.Phase.POSTPROCESSING);
+ this.setPhase(WSSConstants.Phase.POSTPROCESSING);
this.getBeforeProcessors().add(SecurityHeaderInputProcessor.class.getName());
this.policyEnforcer = policyEnforcer;
}
@Override
- public XMLEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, WSSecurityException {
+ public XMLEvent processNextHeaderEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
if (firstHeaderCall) {
firstHeaderCall = false;
if (policyEnforcer.isTransportSecurityActive()) {
@@ -55,10 +61,10 @@ public class PolicyInputProcessor extend
}
XMLEvent xmlEvent = inputProcessorChain.processHeaderEvent();
//test if non encrypted element have to be encrypted per policy
- if (!inputProcessorChain.getDocumentContext().isInEncryptedContent() && inputProcessorChain.getDocumentContext().isInSecurityHeader()) {
+ if (!inputProcessorChain.getDocumentContext().isInEncryptedContent() && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSecurityHeader()) {
testEncryptionPolicy(xmlEvent, inputProcessorChain);
}
- if (xmlEvent.isStartElement() && inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && inputProcessorChain.getDocumentContext().isInSOAPHeader()) {
+ if (xmlEvent.isStartElement() && inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPHeader()) {
RequiredPartSecurityEvent requiredPartSecurityEvent = new RequiredPartSecurityEvent(SecurityEvent.Event.RequiredPart);
requiredPartSecurityEvent.setElement(xmlEvent.asStartElement().getName());
policyEnforcer.registerSecurityEvent(requiredPartSecurityEvent);
@@ -70,7 +76,7 @@ public class PolicyInputProcessor extend
}
@Override
- public XMLEvent processNextEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, WSSecurityException {
+ public XMLEvent processNextEvent(InputProcessorChain inputProcessorChain) throws XMLStreamException, XMLSecurityException {
if (firstBodyCall) {
firstBodyCall = false;
if (policyEnforcer.isTransportSecurityActive()) {
@@ -81,7 +87,7 @@ public class PolicyInputProcessor extend
XMLEvent xmlEvent = inputProcessorChain.processEvent();
if (xmlEvent.isStartElement()) {
- if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && inputProcessorChain.getDocumentContext().isInSOAPBody()) {
+ if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPBody()) {
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent(SecurityEvent.Event.Operation);
operationSecurityEvent.setOperation(xmlEvent.asStartElement().getName());
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
@@ -89,12 +95,12 @@ public class PolicyInputProcessor extend
} else if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 0
&& xmlEvent.isEndElement()
//ns mismatch should be detected by the xml parser so a local-name equality check should be enough
- && xmlEvent.asEndElement().getName().getLocalPart().equals(Constants.TAG_soap_Envelope_LocalName)) {
+ && xmlEvent.asEndElement().getName().getLocalPart().equals(WSSConstants.TAG_soap_Envelope_LocalName)) {
policyEnforcer.doFinal();
}
//test if non encrypted element have to be encrypted per policy
- if (!inputProcessorChain.getDocumentContext().isInEncryptedContent() && !inputProcessorChain.getDocumentContext().isInSecurityHeader()) {
+ if (!inputProcessorChain.getDocumentContext().isInEncryptedContent() && !((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSecurityHeader()) {
testEncryptionPolicy(xmlEvent, inputProcessorChain);
}
@@ -108,11 +114,11 @@ public class PolicyInputProcessor extend
private void testSignaturePolicy(InputProcessorChain inputProcessorChain, XMLEvent xmlEvent) throws WSSecurityException {
if (xmlEvent.isStartElement()) {
- if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && inputProcessorChain.getDocumentContext().isInSOAPHeader()) {
+ if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPHeader()) {
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(SecurityEvent.Event.SignedPart, true);
signedPartSecurityEvent.setElement(xmlEvent.asStartElement().getName());
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- } else if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 2 && inputProcessorChain.getDocumentContext().isInSOAPBody()) {
+ } else if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 2 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPBody()) {
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(SecurityEvent.Event.SignedPart, true);
signedPartSecurityEvent.setElement(xmlEvent.asStartElement().getName());
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
@@ -128,11 +134,11 @@ public class PolicyInputProcessor extend
//the following events are only interesting for policy verification. So call directly the policyEnforcer for these
if (xmlEvent.isStartElement()) {
- if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && inputProcessorChain.getDocumentContext().isInSOAPHeader()) {
+ if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPHeader()) {
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(SecurityEvent.Event.EncryptedPart, true);
encryptedPartSecurityEvent.setElement(xmlEvent.asStartElement().getName());
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
- } else if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && inputProcessorChain.getDocumentContext().isInSOAPBody()) {
+ } else if (inputProcessorChain.getDocumentContext().getDocumentLevel() == 3 && ((WSSDocumentContext) inputProcessorChain.getDocumentContext()).isInSOAPBody()) {
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(SecurityEvent.Event.EncryptedPart, true);
encryptedPartSecurityEvent.setElement(inputProcessorChain.getDocumentContext().getParentElement(xmlEvent.getEventType()));
policyEnforcer.registerSecurityEvent(encryptedPartSecurityEvent);
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AlgorithmSuiteAssertionState.java Tue Oct 11 18:03:00 2011
@@ -20,8 +20,10 @@ package org.swssf.policy.assertionStates
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
import org.swssf.policy.secpolicy.model.AlgorithmSuite;
-import org.swssf.securityEvent.AlgorithmSuiteSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.securityEvent.AlgorithmSuiteSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.xmlsec.ext.XMLSecurityConstants;
/**
* @author $Author$
@@ -38,86 +40,72 @@ public class AlgorithmSuiteAssertionStat
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = (AlgorithmSuiteSecurityEvent) securityEvent;
AlgorithmSuite algorithmSuite = (AlgorithmSuite) getAssertion();
- switch (algorithmSuiteSecurityEvent.getKeyUsage()) {
- case Sym_Sig:
- if (!algorithmSuite.getSymmetricSignature().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Symmetric signature algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Asym_Sig:
- if (!algorithmSuite.getAsymmetricSignature().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Asymmetric signature algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Dig:
- if (!algorithmSuite.getDigest().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Digest algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Enc:
- if (!algorithmSuite.getEncryption().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Encryption algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Sym_Key_Wrap:
- if (!algorithmSuite.getSymmetricKeyWrap().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Symmetric key wrap algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Asym_Key_Wrap:
- if (!algorithmSuite.getAsymmetricKeyWrap().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Asymmetric key wrap algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Comp_Key:
- if (!algorithmSuite.getComputedKey().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Computed key algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Enc_KD:
- if (!algorithmSuite.getEncryptionKeyDerivation().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Encryption key derivation algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Sig_KD:
- if (!algorithmSuite.getSignatureKeyDerivation().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Signature key derivation algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case C14n:
- if (!algorithmSuite.getC14n().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("C14N algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case Soap_Norm:
- if (!algorithmSuite.getSoapNormalization().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("Soap normalization algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case STR_Trans:
- if (!algorithmSuite.getStrTransform().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("STR transformation algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
- case XPath:
- if (!algorithmSuite.getXPath().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
- setAsserted(false);
- setErrorMessage("XPath algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
- }
- break;
-
+ XMLSecurityConstants.KeyUsage keyUsage = algorithmSuiteSecurityEvent.getKeyUsage();
+ if (WSSConstants.Sym_Sig.equals(keyUsage)) {
+ if (!algorithmSuite.getSymmetricSignature().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Symmetric signature algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Asym_Sig.equals(keyUsage)) {
+ if (!algorithmSuite.getAsymmetricSignature().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Asymmetric signature algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Dig.equals(keyUsage)) {
+ if (!algorithmSuite.getDigest().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Digest algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Enc.equals(keyUsage)) {
+ if (!algorithmSuite.getEncryption().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Encryption algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Sym_Key_Wrap.equals(keyUsage)) {
+ if (!algorithmSuite.getSymmetricKeyWrap().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Symmetric key wrap algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Asym_Key_Wrap.equals(keyUsage)) {
+ if (!algorithmSuite.getAsymmetricKeyWrap().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Asymmetric key wrap algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Comp_Key.equals(keyUsage)) {
+ if (!algorithmSuite.getComputedKey().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Computed key algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Enc_KD.equals(keyUsage)) {
+ if (!algorithmSuite.getEncryptionKeyDerivation().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Encryption key derivation algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Sig_KD.equals(keyUsage)) {
+ if (!algorithmSuite.getSignatureKeyDerivation().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Signature key derivation algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.C14n.equals(keyUsage)) {
+ if (!algorithmSuite.getC14n().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("C14N algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.Soap_Norm.equals(keyUsage)) {
+ if (!algorithmSuite.getSoapNormalization().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("Soap normalization algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.STR_Trans.equals(keyUsage)) {
+ if (!algorithmSuite.getStrTransform().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("STR transformation algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
+ } else if (WSSConstants.XPath.equals(keyUsage)) {
+ if (!algorithmSuite.getXPath().equals(algorithmSuiteSecurityEvent.getAlgorithmURI())) {
+ setAsserted(false);
+ setErrorMessage("XPath algorithm " + algorithmSuiteSecurityEvent.getAlgorithmURI() + " does not meet policy");
+ }
}
return isAsserted();
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/AssertionState.java Tue Oct 11 18:03:00 2011
@@ -19,7 +19,7 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
/**
* @author $Author$
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ContentEncryptedElementAssertionState.java Tue Oct 11 18:03:00 2011
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.ContentEncryptedElementSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.ContentEncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import java.util.List;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedElementAssertionState.java Tue Oct 11 18:03:00 2011
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.EncryptedElementSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.EncryptedElementSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import java.util.List;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/EncryptedPartAssertionState.java Tue Oct 11 18:03:00 2011
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.EncryptedPartSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.EncryptedPartSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import java.util.List;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/IncludeTimeStampAssertionState.java Tue Oct 11 18:03:00 2011
@@ -20,8 +20,8 @@ package org.swssf.policy.assertionStates
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
import org.swssf.policy.secpolicy.model.Binding;
-import org.swssf.securityEvent.SecurityEvent;
-import org.swssf.securityEvent.TimestampSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.TimestampSecurityEvent;
/**
* @author $Author$
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/ProtectionOrderAssertionState.java Tue Oct 11 18:03:00 2011
@@ -1,4 +1,4 @@
- /**
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,9 +21,9 @@ package org.swssf.policy.assertionStates
import org.swssf.policy.secpolicy.SPConstants;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
import org.swssf.policy.secpolicy.model.SymmetricAsymmetricBindingBase;
-import org.swssf.securityEvent.EncryptionTokenSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
-import org.swssf.securityEvent.SignatureTokenSecurityEvent;
+import org.swssf.wss.securityEvent.EncryptionTokenSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SignatureTokenSecurityEvent;
/**
* @author $Author: giger $
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredElementAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredElementAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredElementAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredElementAssertionState.java Tue Oct 11 18:03:00 2011
@@ -1,4 +1,4 @@
- /**
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.RequiredElementSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.RequiredElementSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredPartAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredPartAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredPartAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/RequiredPartAssertionState.java Tue Oct 11 18:03:00 2011
@@ -1,4 +1,4 @@
- /**
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.RequiredPartSecurityEvent;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.RequiredPartSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedElementAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedElementAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedElementAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedElementAssertionState.java Tue Oct 11 18:03:00 2011
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.SecurityEvent;
-import org.swssf.securityEvent.SignedElementSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SignedElementSecurityEvent;
import javax.xml.namespace.QName;
import java.util.List;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedPartAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedPartAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedPartAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SignedPartAssertionState.java Tue Oct 11 18:03:00 2011
@@ -19,8 +19,8 @@
package org.swssf.policy.assertionStates;
import org.swssf.policy.secpolicy.model.AbstractSecurityAssertion;
-import org.swssf.securityEvent.SecurityEvent;
-import org.swssf.securityEvent.SignedPartSecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
import javax.xml.namespace.QName;
import java.util.List;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/TokenAssertionState.java Tue Oct 11 18:03:00 2011
@@ -1,4 +1,4 @@
- /**
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,14 +19,15 @@
package org.swssf.policy.assertionStates;
import org.opensaml.common.SAMLVersion;
-import org.swssf.ext.Constants;
-import org.swssf.ext.SecurityToken;
-import org.swssf.ext.WSSecurityException;
-import org.swssf.impl.securityToken.DelegatingSecurityToken;
-import org.swssf.impl.securityToken.UsernameSecurityToken;
import org.swssf.policy.secpolicy.SPConstants;
import org.swssf.policy.secpolicy.model.*;
-import org.swssf.securityEvent.*;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.impl.securityToken.DelegatingSecurityToken;
+import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
+import org.swssf.wss.securityEvent.*;
+import org.swssf.xmlsec.ext.SecurityToken;
+import org.swssf.xmlsec.ext.XMLSecurityConstants;
+import org.swssf.xmlsec.ext.XMLSecurityException;
import java.security.cert.X509Certificate;
import java.util.Arrays;
@@ -88,7 +89,7 @@ public class TokenAssertionState extends
setAsserted(false);
setErrorMessage("IssuerName in Policy (" + samlToken.getIssuerName() + ") didn't match with the one in the SamlToken (" + samlTokenSecurityEvent.getIssuerName() + ")");
}
- if (samlToken.isRequireKeyIdentifierReference() && ((DelegatingSecurityToken) samlTokenSecurityEvent.getSecurityToken()).getKeyIdentifierType() != Constants.KeyIdentifierType.X509_KEY_IDENTIFIER) {
+ if (samlToken.isRequireKeyIdentifierReference() && ((DelegatingSecurityToken) samlTokenSecurityEvent.getSecurityToken()).getKeyIdentifierType() != WSSConstants.KeyIdentifierType.X509_KEY_IDENTIFIER) {
setAsserted(false);
setErrorMessage("Policy enforces KeyIdentifierReference but we got " + samlTokenSecurityEvent.getSecurityToken().getTokenType());
}
@@ -187,26 +188,26 @@ public class TokenAssertionState extends
//todo how to verify the issuer of the UsernameToken??
setAsserted(true);
- if (usernameToken.isNoPassword() && usernameTokenSecurityEvent.getUsernameTokenPasswordType() != Constants.UsernameTokenPasswordType.PASSWORD_NONE) {
+ if (usernameToken.isNoPassword() && usernameTokenSecurityEvent.getUsernameTokenPasswordType() != WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE) {
setAsserted(false);
setErrorMessage("UsernameToken contains a password but the policy prohibits it");
- } else if (usernameToken.isHashPassword() && usernameTokenSecurityEvent.getUsernameTokenPasswordType() != Constants.UsernameTokenPasswordType.PASSWORD_DIGEST) {
+ } else if (usernameToken.isHashPassword() && usernameTokenSecurityEvent.getUsernameTokenPasswordType() != WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST) {
setAsserted(false);
setErrorMessage("UsernameToken does not contain a hashed password");
}
- if (usernameToken.isCreatedTimestamp() && (usernameSecurityToken.getCreated() == null || usernameTokenSecurityEvent.getUsernameTokenPasswordType() != Constants.UsernameTokenPasswordType.PASSWORD_TEXT)) {
+ if (usernameToken.isCreatedTimestamp() && (usernameSecurityToken.getCreated() == null || usernameTokenSecurityEvent.getUsernameTokenPasswordType() != WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT)) {
setAsserted(false);
setErrorMessage("UsernameToken does not contain a created timestamp or password is not plain text");
}
- if (usernameToken.isNonce() && (usernameSecurityToken.getNonce() == null || usernameTokenSecurityEvent.getUsernameTokenPasswordType() != Constants.UsernameTokenPasswordType.PASSWORD_TEXT)) {
+ if (usernameToken.isNonce() && (usernameSecurityToken.getNonce() == null || usernameTokenSecurityEvent.getUsernameTokenPasswordType() != WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT)) {
setAsserted(false);
setErrorMessage("UsernameToken does not contain a nonce or password is not plain text");
}
//todo how does the profile 1.0 and 1.1 differ?? Both spec refer to the same namespace
- if (usernameToken.isUseUTProfile10() && !usernameTokenSecurityEvent.getUsernameTokenProfile().equals(Constants.NS_USERNAMETOKEN_PROFILE11)) {
+ if (usernameToken.isUseUTProfile10() && !usernameTokenSecurityEvent.getUsernameTokenProfile().equals(WSSConstants.NS_USERNAMETOKEN_PROFILE11)) {
setAsserted(false);
setErrorMessage("Policy enforces UsernameToken profile 1.0 but we got 1.1");
- } else if (usernameToken.isUseUTProfile11() && !usernameTokenSecurityEvent.getUsernameTokenProfile().equals(Constants.NS_USERNAMETOKEN_PROFILE11)) {
+ } else if (usernameToken.isUseUTProfile11() && !usernameTokenSecurityEvent.getUsernameTokenProfile().equals(WSSConstants.NS_USERNAMETOKEN_PROFILE11)) {
setAsserted(false);
setErrorMessage("Policy enforces UsernameToken profile 1.1 but we got 1.0");
}
@@ -215,15 +216,14 @@ public class TokenAssertionState extends
private void assertX509Token(X509Token x509Token, TokenSecurityEvent tokenSecurityEvent) {
SecurityToken securityToken = tokenSecurityEvent.getSecurityToken();
- loop:
while (securityToken.getKeyWrappingToken() != null) {
securityToken = securityToken.getKeyWrappingToken();
- switch (securityToken.getTokenType()) {
- case X509V3Token:
- case X509V1Token:
- case X509Pkcs7Token:
- case X509PkiPathV1Token:
- break loop;
+ XMLSecurityConstants.TokenType tokenType = securityToken.getTokenType();
+ if (WSSConstants.X509V3Token.equals(tokenType)
+ || WSSConstants.X509V1Token.equals(tokenType)
+ || WSSConstants.X509Pkcs7Token.equals(tokenType)
+ || WSSConstants.X509PkiPathV1Token.equals(tokenType)) {
+ break;
}
}
if (!(securityToken instanceof DelegatingSecurityToken)) {
@@ -241,30 +241,30 @@ public class TokenAssertionState extends
setErrorMessage("IssuerName in Policy (" + x509Token.getIssuerName() + ") didn't match with the one in the certificate (" + certificateIssuerName + ")");
}
}
- if (x509Token.isRequireKeyIdentifierReference() && delegatingSecurityToken.getKeyIdentifierType() != Constants.KeyIdentifierType.X509_KEY_IDENTIFIER) {
+ if (x509Token.isRequireKeyIdentifierReference() && delegatingSecurityToken.getKeyIdentifierType() != WSSConstants.KeyIdentifierType.X509_KEY_IDENTIFIER) {
setAsserted(false);
setErrorMessage("Policy enforces KeyIdentifierReference but we got " + delegatingSecurityToken.getTokenType());
- } else if (x509Token.isRequireIssuerSerialReference() && delegatingSecurityToken.getKeyIdentifierType() != Constants.KeyIdentifierType.ISSUER_SERIAL) {
+ } else if (x509Token.isRequireIssuerSerialReference() && delegatingSecurityToken.getKeyIdentifierType() != WSSConstants.KeyIdentifierType.ISSUER_SERIAL) {
setAsserted(false);
setErrorMessage("Policy enforces IssuerSerialReference but we got " + delegatingSecurityToken.getTokenType());
- } else if (x509Token.isRequireEmbeddedTokenReference() && delegatingSecurityToken.getKeyIdentifierType() != Constants.KeyIdentifierType.BST_EMBEDDED) {
+ } else if (x509Token.isRequireEmbeddedTokenReference() && delegatingSecurityToken.getKeyIdentifierType() != WSSConstants.KeyIdentifierType.BST_EMBEDDED) {
setAsserted(false);
setErrorMessage("Policy enforces EmbeddedTokenReference but we got " + delegatingSecurityToken.getTokenType());
- } else if (x509Token.isRequireThumbprintReference() && delegatingSecurityToken.getKeyIdentifierType() != Constants.KeyIdentifierType.THUMBPRINT_IDENTIFIER) {
+ } else if (x509Token.isRequireThumbprintReference() && delegatingSecurityToken.getKeyIdentifierType() != WSSConstants.KeyIdentifierType.THUMBPRINT_IDENTIFIER) {
setAsserted(false);
setErrorMessage("Policy enforces ThumbprintReference but we got " + delegatingSecurityToken.getTokenType());
}
if (x509Token.getTokenVersionAndType() != null) {
- if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V3_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V3_TOKEN11)) && delegatingSecurityToken.getTokenType() != Constants.TokenType.X509V3Token && x509Certificate.getVersion() != 3) {
+ if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V3_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V3_TOKEN11)) && !WSSConstants.X509V3Token.equals(delegatingSecurityToken.getTokenType()) && x509Certificate.getVersion() != 3) {
setAsserted(false);
setErrorMessage("X509Certificate Version " + x509Certificate.getVersion() + " mismatch; Policy enforces " + x509Token.getTokenVersionAndType());
- } else if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V1_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V1_TOKEN11)) && delegatingSecurityToken.getTokenType() != Constants.TokenType.X509V1Token && x509Certificate.getVersion() != 1) {
+ } else if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V1_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_V1_TOKEN11)) && !WSSConstants.X509V1Token.equals(delegatingSecurityToken.getTokenType()) && x509Certificate.getVersion() != 1) {
setAsserted(false);
setErrorMessage("X509Certificate Version " + x509Certificate.getVersion() + " mismatch; Policy enforces " + x509Token.getTokenVersionAndType());
} else if (x509Certificate.getVersion() == 2) {
setAsserted(false);
setErrorMessage("X509Certificate Version " + x509Certificate.getVersion() + " not supported");
- } else if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11)) && delegatingSecurityToken.getTokenType() != Constants.TokenType.X509PkiPathV1Token) {
+ } else if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11)) && delegatingSecurityToken.getTokenType() != WSSConstants.X509PkiPathV1Token) {
setAsserted(false);
setErrorMessage("Policy enforces " + x509Token.getTokenVersionAndType() + " but we got " + delegatingSecurityToken.getTokenType());
} else if ((x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_PKCS7_TOKEN10) || x509Token.getTokenVersionAndType().equals(SPConstants.WSS_X509_PKCS7_TOKEN11))) {
@@ -272,7 +272,7 @@ public class TokenAssertionState extends
setErrorMessage("Unsupported token type: " + delegatingSecurityToken.getTokenType());
}
}
- } catch (WSSecurityException e) {
+ } catch (XMLSecurityException e) {
setAsserted(false);
setErrorMessage(e.getMessage());
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/WSSPolicyException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/WSSPolicyException.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/WSSPolicyException.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/WSSPolicyException.java Tue Oct 11 18:03:00 2011
@@ -19,7 +19,8 @@
package org.swssf.policy.secpolicy;
-import org.swssf.ext.WSSecurityException;
+
+import org.swssf.wss.ext.WSSecurityException;
/**
* class lent from apache cxf
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AbstractSecurityAssertion.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AbstractSecurityAssertion.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AbstractSecurityAssertion.java Tue Oct 11 18:03:00 2011
@@ -23,7 +23,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import java.util.ArrayList;
import java.util.Iterator;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AlgorithmSuite.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AlgorithmSuite.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AlgorithmSuite.java Tue Oct 11 18:03:00 2011
@@ -25,7 +25,7 @@ import org.swssf.policy.assertionStates.
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
import org.swssf.policy.secpolicy.WSSPolicyException;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AsymmetricBinding.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AsymmetricBinding.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/AsymmetricBinding.java Tue Oct 11 18:03:00 2011
@@ -23,7 +23,7 @@ import org.apache.neethi.*;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Binding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Binding.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Binding.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Binding.java Tue Oct 11 18:03:00 2011
@@ -20,14 +20,14 @@
package org.swssf.policy.secpolicy.model;
import org.apache.neethi.Assertion;
-import org.swssf.ext.Constants;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.IncludeTimeStampAssertionState;
import org.swssf.policy.assertionStates.SignedElementAssertionState;
import org.swssf.policy.secpolicy.PolicyUtil;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -140,7 +140,7 @@ public abstract class Binding extends Ab
Map<Assertion, List<AssertionState>> signedElementAssertionStates = assertionStateMap.get(SecurityEvent.Event.SignedElement);
List<QName> qNames = new ArrayList<QName>();
- qNames.add(Constants.TAG_wsu_Timestamp);
+ qNames.add(WSSConstants.TAG_wsu_Timestamp);
SignedEncryptedElements signedEncryptedElements = null;
List<Assertion> assertions = PolicyUtil.getPolicyAssertionsInSameAlternative(operationPolicy.getPolicy(), this, SignedEncryptedElements.class, Boolean.TRUE, spConstants);
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ContentEncryptedElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ContentEncryptedElements.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ContentEncryptedElements.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ContentEncryptedElements.java Tue Oct 11 18:03:00 2011
@@ -26,7 +26,7 @@ import org.swssf.policy.assertionStates.
import org.swssf.policy.assertionStates.ContentEncryptedElementAssertionState;
import org.swssf.policy.secpolicy.SP12Constants;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/EncryptionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/EncryptionToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/EncryptionToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/EncryptionToken.java Tue Oct 11 18:03:00 2011
@@ -23,7 +23,7 @@ import org.apache.neethi.Assertion;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/HttpsToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/HttpsToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/HttpsToken.java Tue Oct 11 18:03:00 2011
@@ -25,7 +25,7 @@ import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.TokenAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/InitiatorToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/InitiatorToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/InitiatorToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/InitiatorToken.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/IssuedToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/IssuedToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/IssuedToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/IssuedToken.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.Assertion;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Layout.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Layout.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Layout.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Layout.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ProtectionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ProtectionToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ProtectionToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/ProtectionToken.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RecipientToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RecipientToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RecipientToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RecipientToken.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredElements.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredElements.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredElements.java Tue Oct 11 18:03:00 2011
@@ -25,7 +25,7 @@ import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.RequiredElementAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredParts.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredParts.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/RequiredParts.java Tue Oct 11 18:03:00 2011
@@ -26,7 +26,7 @@ import org.swssf.policy.assertionStates.
import org.swssf.policy.assertionStates.RequiredPartAssertionState;
import org.swssf.policy.secpolicy.SP12Constants;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SamlToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SamlToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SamlToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SamlToken.java Tue Oct 11 18:03:00 2011
@@ -22,7 +22,7 @@ import org.apache.neethi.Assertion;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecureConversationToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecureConversationToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecureConversationToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecureConversationToken.java Tue Oct 11 18:03:00 2011
@@ -22,7 +22,7 @@ package org.swssf.policy.secpolicy.model
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Policy;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecurityContextToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecurityContextToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecurityContextToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SecurityContextToken.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignatureToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignatureToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignatureToken.java Tue Oct 11 18:03:00 2011
@@ -23,7 +23,7 @@ import org.apache.neethi.Assertion;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedElements.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedElements.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedElements.java Tue Oct 11 18:03:00 2011
@@ -26,7 +26,7 @@ import org.swssf.policy.assertionStates.
import org.swssf.policy.assertionStates.EncryptedElementAssertionState;
import org.swssf.policy.assertionStates.SignedElementAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedParts.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedParts.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SignedEncryptedParts.java Tue Oct 11 18:03:00 2011
@@ -21,13 +21,13 @@ package org.swssf.policy.secpolicy.model
import org.apache.neethi.Assertion;
import org.apache.neethi.PolicyComponent;
-import org.swssf.ext.Constants;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.EncryptedPartAssertionState;
import org.swssf.policy.assertionStates.SignedPartAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -180,14 +180,14 @@ public class SignedEncryptedParts extend
Map<Assertion, List<AssertionState>> signedPartsAssertionStates = assertionStateMap.get(SecurityEvent.Event.SignedPart);
List<QName> qNames = getQNamesFromHeaders();
if (isBody()) {
- qNames.add(new QName(operationPolicy.getSoapMessageVersionNamespace(), Constants.TAG_soap_Body_LocalName));
+ qNames.add(new QName(operationPolicy.getSoapMessageVersionNamespace(), WSSConstants.TAG_soap_Body_LocalName));
}
addAssertionState(signedPartsAssertionStates, this, new SignedPartAssertionState(this, true, qNames));
} else {
Map<Assertion, List<AssertionState>> encryptedPartsAssertionStates = assertionStateMap.get(SecurityEvent.Event.EncryptedPart);
List<QName> qNames = getQNamesFromHeaders();
if (isBody()) {
- qNames.add(new QName(operationPolicy.getSoapMessageVersionNamespace(), Constants.TAG_soap_Body_LocalName));
+ qNames.add(new QName(operationPolicy.getSoapMessageVersionNamespace(), WSSConstants.TAG_soap_Body_LocalName));
}
addAssertionState(encryptedPartsAssertionStates, this, new EncryptedPartAssertionState(this, true, qNames));
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SupportingToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SupportingToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SupportingToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SupportingToken.java Tue Oct 11 18:03:00 2011
@@ -28,7 +28,7 @@ import org.swssf.policy.assertionStates.
import org.swssf.policy.secpolicy.PolicyUtil;
import org.swssf.policy.secpolicy.SP12Constants;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricAsymmetricBindingBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricAsymmetricBindingBase.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricAsymmetricBindingBase.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricAsymmetricBindingBase.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.ProtectionOrderAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import java.util.List;
import java.util.Map;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricBinding.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricBinding.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/SymmetricBinding.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.ExactlyOne;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Token.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Token.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Token.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Token.java Tue Oct 11 18:03:00 2011
@@ -22,7 +22,7 @@ package org.swssf.policy.secpolicy.model
import org.apache.neethi.Assertion;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import java.util.List;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportBinding.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportBinding.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportBinding.java Tue Oct 11 18:03:00 2011
@@ -23,7 +23,7 @@ import org.apache.neethi.*;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/TransportToken.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust10.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust10.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust10.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust13.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust13.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Trust13.java Tue Oct 11 18:03:00 2011
@@ -25,7 +25,7 @@ import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SP12Constants;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/UsernameToken.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/UsernameToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/UsernameToken.java Tue Oct 11 18:03:00 2011
@@ -21,12 +21,12 @@ package org.swssf.policy.secpolicy.model
import org.apache.neethi.Assertion;
import org.apache.neethi.PolicyComponent;
-import org.swssf.ext.Constants;
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.TokenAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -194,7 +194,7 @@ public class UsernameToken extends Token
}
public QName getXmlName() {
- return Constants.TAG_wsse_UsernameToken;
+ return WSSConstants.TAG_wsse_UsernameToken;
}
@Override
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Wss10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Wss10.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Wss10.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/Wss10.java Tue Oct 11 18:03:00 2011
@@ -24,7 +24,7 @@ import org.apache.neethi.PolicyComponent
import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/X509Token.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/X509Token.java?rev=1181995&r1=1181994&r2=1181995&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/X509Token.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/secpolicy/model/X509Token.java Tue Oct 11 18:03:00 2011
@@ -25,7 +25,7 @@ import org.swssf.policy.OperationPolicy;
import org.swssf.policy.assertionStates.AssertionState;
import org.swssf.policy.assertionStates.TokenAssertionState;
import org.swssf.policy.secpolicy.SPConstants;
-import org.swssf.securityEvent.SecurityEvent;
+import org.swssf.wss.securityEvent.SecurityEvent;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;