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/11 16:50:11 UTC
svn commit: r1360212 - in /webservices/wss4j/branches/swssf:
streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/
streaming-ws-security/src/main/java/org/swssf/wss/ext/
streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/inp...
Author: coheigea
Date: Wed Jul 11 14:50:10 2012
New Revision: 1360212
URL: http://svn.apache.org/viewvc?rev=1360212&view=rev
Log:
Moved some of the AbstractSecurityToken architecture to Santuario
Removed:
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/AbstractSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/DsaKeyValueSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/ECKeyValueSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/RsaKeyValueSecurityToken.java
Modified:
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SamlTokenAssertionState.java
webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/X509TokenAssertionState.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/EncryptedKeyInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SAMLTokenInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/EncryptedKeyOutputProcessor.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/HttpsSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenReference.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/securityEvent/HttpsTokenSecurityEvent.java
webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/VulnerabliltyVectorsTest.java
Modified: webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SamlTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SamlTokenAssertionState.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SamlTokenAssertionState.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-policy/src/main/java/org/swssf/policy/assertionStates/SamlTokenAssertionState.java Wed Jul 11 14:50:10 2012
@@ -24,10 +24,10 @@ import org.apache.ws.secpolicy.model.Abs
import org.apache.ws.secpolicy.model.SamlToken;
import org.opensaml.common.SAMLVersion;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.swssf.wss.securityEvent.SamlTokenSecurityEvent;
import org.swssf.wss.securityEvent.WSSecurityEventConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -23,9 +23,9 @@ import org.apache.ws.secpolicy.model.Abs
import org.apache.ws.secpolicy.model.AbstractToken;
import org.apache.ws.secpolicy.model.X509Token;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -23,7 +23,6 @@ import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityContext;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.ext.WSSecurityToken;
import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl;
import org.apache.xml.security.stax.crypto.Crypto;
import org.apache.xml.security.stax.ext.*;
@@ -64,7 +63,7 @@ public class BinarySecurityTokenInputHan
final SecurityTokenProvider securityTokenProvider = new SecurityTokenProvider() {
- private WSSecurityToken binarySecurityToken = null;
+ private SecurityToken binarySecurityToken = null;
public SecurityToken getSecurityToken() throws XMLSecurityException {
if (this.binarySecurityToken != null) {
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -23,7 +23,6 @@ import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityContext;
import org.swssf.wss.ext.WSSecurityException;
import org.swssf.wss.impl.derivedKey.DerivedKeyUtils;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl;
import org.swssf.wss.impl.securityToken.UsernameSecurityToken;
@@ -31,6 +30,7 @@ import org.swssf.wss.securityEvent.Deriv
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.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
@@ -78,7 +78,7 @@ public class DerivedKeyTokenInputHandler
}
this.derivedKeySecurityToken = new AbstractSecurityToken(
- (WSSecurityContext) inputProcessorChain.getSecurityContext(), null, null,
+ (WSSecurityContext) inputProcessorChain.getSecurityContext(), null,
derivedKeyTokenType.getId(), null) {
private SecurityToken referencedSecurityToken = null;
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -24,12 +24,12 @@ import org.swssf.binding.wss10.SecurityT
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmlenc.EncryptedKeyType;
import org.swssf.wss.ext.*;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.swssf.wss.securityEvent.EncryptedKeyTokenSecurityEvent;
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.AbstractSecurityToken;
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;
@@ -80,7 +80,7 @@ public class EncryptedKeyInputHandler ex
final SecurityTokenProvider securityTokenProvider = new SecurityTokenProvider() {
- private WSSecurityToken securityToken = null;
+ private SecurityToken securityToken = null;
public SecurityToken getSecurityToken() throws XMLSecurityException {
@@ -89,8 +89,7 @@ public class EncryptedKeyInputHandler ex
}
this.securityToken = new AbstractSecurityToken(
- securityContext, null, null,
- encryptedKeyType.getId(), null) {
+ securityContext, null, encryptedKeyType.getId(), null) {
private final Map<String, Key> keyTable = new Hashtable<String, Key>();
@@ -136,6 +135,7 @@ public class EncryptedKeyInputHandler ex
keyInfoType,
crypto,
securityProperties.getCallbackHandler(),
+ securityProperties,
securityContext
);
this.wrappingSecurityToken.addWrappedToken(wrappedSecurityToken);
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SAMLTokenInputHandler.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SAMLTokenInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SAMLTokenInputHandler.java Wed Jul 11 14:50:10 2012
@@ -84,7 +84,7 @@ public class SAMLTokenInputHandler exten
SecurityTokenProvider securityTokenProvider = new SecurityTokenProvider() {
- private WSSecurityToken securityToken = null;
+ private SecurityToken securityToken = null;
@Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java Wed Jul 11 14:50:10 2012
@@ -20,11 +20,11 @@ package org.swssf.wss.impl.processor.inp
import org.swssf.binding.wssc.AbstractSecurityContextTokenType;
import org.swssf.wss.ext.*;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.swssf.wss.securityEvent.SecurityContextTokenSecurityEvent;
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.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import javax.crypto.spec.SecretKeySpec;
@@ -61,9 +61,9 @@ public class SecurityContextTokenInputHa
final List<QName> elementPath = getElementPath(eventQueue);
final XMLSecEvent responsibleXMLSecStartXMLEvent = getResponsibleStartXMLEvent(eventQueue, index);
- final WSSecurityToken securityContextToken =
+ final SecurityToken securityContextToken =
new AbstractSecurityToken(
- (WSSecurityContext) inputProcessorChain.getSecurityContext(), null,
+ (WSSecurityContext) inputProcessorChain.getSecurityContext(),
null, securityContextTokenType.getId(), null) {
public boolean isAsymmetric() {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java Wed Jul 11 14:50:10 2012
@@ -192,7 +192,7 @@ public class UsernameTokenInputHandler e
SecurityTokenProvider securityTokenProvider = new SecurityTokenProvider() {
- private WSSecurityToken securityToken = null;
+ private SecurityToken securityToken = null;
public SecurityToken getSecurityToken() throws WSSecurityException {
if (this.securityToken != null) {
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -160,7 +160,7 @@ public class WSSSignatureInputHandler ex
SecurityContext securityContext) throws XMLSecurityException {
return SecurityTokenFactory.getInstance().getSecurityToken(keyInfoType,
((WSSSecurityProperties)securityProperties).getSignatureVerificationCrypto(), securityProperties.getCallbackHandler(),
- securityContext);
+ securityProperties, securityContext);
}
}
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -19,11 +19,11 @@
package org.swssf.wss.impl.processor.output;
import org.swssf.wss.ext.*;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
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.securityToken.AbstractSecurityToken;
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;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java Wed Jul 11 14:50:10 2012
@@ -23,12 +23,12 @@ import org.swssf.wss.ext.*;
import org.swssf.wss.impl.derivedKey.AlgoFactory;
import org.swssf.wss.impl.derivedKey.ConversationException;
import org.swssf.wss.impl.derivedKey.DerivationAlgorithm;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
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.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import javax.crypto.spec.SecretKeySpec;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/EncryptedKeyOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/EncryptedKeyOutputProcessor.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/EncryptedKeyOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/EncryptedKeyOutputProcessor.java Wed Jul 11 14:50:10 2012
@@ -23,12 +23,12 @@ import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
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.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import javax.crypto.Cipher;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SAMLTokenOutputProcessor.java Wed Jul 11 14:50:10 2012
@@ -26,7 +26,6 @@ import org.swssf.wss.impl.saml.SAMLCallb
import org.swssf.wss.impl.saml.SAMLKeyInfo;
import org.swssf.wss.impl.saml.bean.KeyInfoBean;
import org.swssf.wss.impl.saml.bean.SubjectBean;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
import org.swssf.wss.impl.securityToken.SAMLSecurityToken;
import org.apache.xml.security.stax.crypto.CryptoType;
import org.apache.xml.security.stax.ext.*;
@@ -34,6 +33,7 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.w3c.dom.*;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java Wed Jul 11 14:50:10 2012
@@ -22,11 +22,11 @@ import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
import org.swssf.wss.ext.WSSecurityException;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
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.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import javax.xml.stream.XMLStreamConstants;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/HttpsSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/HttpsSecurityToken.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/HttpsSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/HttpsSecurityToken.java Wed Jul 11 14:50:10 2012
@@ -23,6 +23,7 @@ import org.swssf.wss.ext.WSSecurityConte
import org.swssf.wss.ext.WSSecurityException;
import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import java.security.Key;
@@ -46,13 +47,13 @@ public class HttpsSecurityToken extends
}
public HttpsSecurityToken(X509Certificate x509Certificate, WSSecurityContext wsSecurityContext) throws WSSecurityException {
- super(wsSecurityContext, null, null, IDGenerator.generateID(null), null);
+ super(wsSecurityContext, null, IDGenerator.generateID(null), null);
this.x509Certificate = x509Certificate;
this.authenticationType = AuthenticationType.httpsClientAuthentication;
}
public HttpsSecurityToken(boolean basicAuthentication, String username, WSSecurityContext wsSecurityContext) throws WSSecurityException {
- super(wsSecurityContext, null, null, IDGenerator.generateID(null), null);
+ super(wsSecurityContext, null, IDGenerator.generateID(null), null);
if (basicAuthentication) {
this.authenticationType = AuthenticationType.httpBasicAuthentication;
} else {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SAMLSecurityToken.java Wed Jul 11 14:50:10 2012
@@ -26,6 +26,7 @@ import org.apache.xml.security.stax.cryp
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.impl.securityToken.AbstractSecurityToken;
import javax.security.auth.callback.CallbackHandler;
import java.security.Key;
@@ -44,21 +45,28 @@ public class SAMLSecurityToken extends A
private final SAMLKeyInfo samlKeyInfo;
private String issuer;
private X509Certificate[] x509Certificate;
+ private Crypto crypto;
public SAMLSecurityToken(SAMLVersion samlVersion, SAMLKeyInfo samlKeyInfo, String issuer,
WSSecurityContext wsSecurityContext, Crypto crypto, CallbackHandler callbackHandler,
String id, WSSConstants.KeyIdentifierType keyIdentifierType) {
- super(wsSecurityContext, crypto, callbackHandler, id, keyIdentifierType);
+ super(wsSecurityContext, callbackHandler, id, keyIdentifierType);
this.samlVersion = samlVersion;
this.samlKeyInfo = samlKeyInfo;
this.issuer = issuer;
+ this.crypto = crypto;
}
public SAMLSecurityToken(SAMLVersion samlVersion, SAMLKeyInfo samlKeyInfo, WSSecurityContext wsSecurityContext,
Crypto crypto, CallbackHandler callbackHandler, String id) {
- super(wsSecurityContext, crypto, callbackHandler, id, null);
+ super(wsSecurityContext, callbackHandler, id, null);
this.samlVersion = samlVersion;
this.samlKeyInfo = samlKeyInfo;
+ this.crypto = crypto;
+ }
+
+ public Crypto getCrypto() {
+ return crypto;
}
public boolean isAsymmetric() {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecureConversationSecurityToken.java Wed Jul 11 14:50:10 2012
@@ -24,6 +24,7 @@ import org.apache.xml.security.stax.cryp
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.impl.securityToken.AbstractSecurityToken;
import javax.security.auth.callback.CallbackHandler;
import java.security.Key;
@@ -41,7 +42,7 @@ public class SecureConversationSecurityT
public SecureConversationSecurityToken(WSSecurityContext wsSecurityContext, Crypto crypto,
CallbackHandler callbackHandler, String id,
WSSConstants.KeyIdentifierType keyIdentifierType) {
- super(wsSecurityContext, crypto, callbackHandler, id, keyIdentifierType);
+ super(wsSecurityContext, callbackHandler, id, keyIdentifierType);
}
public boolean isAsymmetric() {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java Wed Jul 11 14:50:10 2012
@@ -28,6 +28,9 @@ import org.swssf.wss.ext.*;
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.DsaKeyValueSecurityToken;
+import org.apache.xml.security.stax.impl.securityToken.ECKeyValueSecurityToken;
+import org.apache.xml.security.stax.impl.securityToken.RsaKeyValueSecurityToken;
import org.apache.xml.security.stax.impl.securityToken.SecurityTokenFactory;
import javax.security.auth.callback.CallbackHandler;
@@ -45,7 +48,7 @@ public class SecurityTokenFactoryImpl ex
}
public SecurityToken getSecurityToken(KeyInfoType keyInfoType, Crypto crypto, final CallbackHandler callbackHandler,
- SecurityContext securityContext) throws XMLSecurityException {
+ XMLSecurityProperties securityProperties, SecurityContext securityContext) throws XMLSecurityException {
if (keyInfoType != null) {
final SecurityTokenReferenceType securityTokenReferenceType
= XMLSecurityUtils.getQNameType(keyInfoType.getContent(), WSSConstants.TAG_wsse_SecurityTokenReference);
@@ -191,24 +194,24 @@ public class SecurityTokenFactoryImpl ex
= XMLSecurityUtils.getQNameType(keyValueType.getContent(), WSSConstants.TAG_dsig_RSAKeyValue);
if (rsaKeyValueType != null) {
return new RsaKeyValueSecurityToken(rsaKeyValueType, (WSSecurityContext) securityContext,
- crypto, callbackHandler, WSSConstants.WSSKeyIdentifierType.KEY_VALUE);
+ callbackHandler, WSSConstants.WSSKeyIdentifierType.KEY_VALUE);
}
final DSAKeyValueType dsaKeyValueType
= XMLSecurityUtils.getQNameType(keyValueType.getContent(), WSSConstants.TAG_dsig_DSAKeyValue);
if (dsaKeyValueType != null) {
return new DsaKeyValueSecurityToken(dsaKeyValueType, (WSSecurityContext) securityContext,
- crypto, callbackHandler, WSSConstants.WSSKeyIdentifierType.KEY_VALUE);
+ callbackHandler, WSSConstants.WSSKeyIdentifierType.KEY_VALUE);
}
final ECKeyValueType ecKeyValueType
= XMLSecurityUtils.getQNameType(keyValueType.getContent(), WSSConstants.TAG_dsig11_ECKeyValue);
if (ecKeyValueType != null) {
return new ECKeyValueSecurityToken(ecKeyValueType, (WSSecurityContext) securityContext,
- crypto, callbackHandler, WSSConstants.WSSKeyIdentifierType.KEY_VALUE);
+ callbackHandler, WSSConstants.WSSKeyIdentifierType.KEY_VALUE);
}
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY, "unsupportedKeyInfo");
}
- public static WSSecurityToken getSecurityToken(
+ public static SecurityToken getSecurityToken(
BinarySecurityTokenType binarySecurityTokenType, SecurityContext securityContext,
Crypto crypto, CallbackHandler callbackHandler) throws XMLSecurityException {
@@ -232,13 +235,13 @@ public class SecurityTokenFactoryImpl ex
}
}
- public static WSSecurityToken getSecurityToken(String username, String password, String created, byte[] nonce,
+ public static SecurityToken getSecurityToken(String username, String password, String created, byte[] nonce,
byte[] salt, Long iteration, WSSecurityContext wsSecurityContext,
String id) throws WSSecurityException {
return new UsernameSecurityToken(username, password, created, nonce, salt, iteration, wsSecurityContext, id, WSSConstants.WSSKeyIdentifierType.SECURITY_TOKEN_DIRECT_REFERENCE);
}
- public static WSSecurityToken getSecurityToken(String referencedTokenId, Deque<XMLSecEvent> xmlSecEvents,
+ public static SecurityToken getSecurityToken(String referencedTokenId, Deque<XMLSecEvent> xmlSecEvents,
CallbackHandler callbackHandler,
SecurityContext securityContext, String id)
throws XMLSecurityException {
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenReference.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenReference.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenReference.java Wed Jul 11 14:50:10 2012
@@ -24,6 +24,7 @@ import org.apache.xml.security.stax.ext.
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.impl.securityToken.AbstractSecurityToken;
import javax.security.auth.callback.CallbackHandler;
import java.security.Key;
@@ -42,7 +43,7 @@ public class SecurityTokenReference exte
public SecurityTokenReference(SecurityToken securityToken, Deque<XMLSecEvent> xmlSecEvents, WSSecurityContext wsSecurityContext,
CallbackHandler callbackHandler, String id, WSSConstants.KeyIdentifierType keyIdentifierType) {
- super(wsSecurityContext, null, callbackHandler, id, keyIdentifierType);
+ super(wsSecurityContext, callbackHandler, id, keyIdentifierType);
this.securityToken = securityToken;
this.xmlSecEvents = xmlSecEvents;
}
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/UsernameSecurityToken.java Wed Jul 11 14:50:10 2012
@@ -25,6 +25,7 @@ import org.apache.xml.security.stax.conf
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.impl.securityToken.AbstractSecurityToken;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
@@ -50,7 +51,7 @@ public class UsernameSecurityToken exten
public UsernameSecurityToken(String username, String password, String created, byte[] nonce, byte[] salt, Long iteration,
WSSecurityContext wsSecurityContext, String id, WSSConstants.KeyIdentifierType keyIdentifierType) {
- super(wsSecurityContext, null, null, id, keyIdentifierType);
+ super(wsSecurityContext, null, id, keyIdentifierType);
this.username = username;
this.password = password;
this.created = created;
@@ -61,7 +62,7 @@ public class UsernameSecurityToken exten
public UsernameSecurityToken(String username, String password, String created, byte[] nonce, byte[] salt, Long iteration,
String id) {
- super(null, null, null, id, null);
+ super(null, null, id, null);
this.username = username;
this.password = password;
this.created = created;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/X509SecurityToken.java Wed Jul 11 14:50:10 2012
@@ -18,52 +18,52 @@
*/
package org.swssf.wss.impl.securityToken;
-import org.swssf.wss.ext.WSPasswordCallback;
-import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.ext.WSSecurityContext;
-import org.apache.xml.security.stax.crypto.Crypto;
-import org.apache.xml.security.stax.crypto.CryptoType;
-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.XMLSecurityUtils;
-
-import javax.security.auth.callback.CallbackHandler;
import java.security.Key;
import java.security.PublicKey;
import java.security.cert.CertificateExpiredException;
import java.security.cert.CertificateNotYetValidException;
import java.security.cert.X509Certificate;
+import javax.security.auth.callback.CallbackHandler;
+
+import org.apache.xml.security.stax.crypto.Crypto;
+import org.apache.xml.security.stax.crypto.CryptoType;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.ext.XMLSecurityException;
+import org.apache.xml.security.stax.ext.XMLSecurityUtils;
+import org.swssf.wss.ext.WSPasswordCallback;
+import org.swssf.wss.ext.WSSConstants;
+import org.swssf.wss.ext.WSSecurityContext;
+
/**
* @author $Author$
* @version $Revision$ $Date$
*/
-public abstract class X509SecurityToken extends AbstractSecurityToken {
+public abstract class X509SecurityToken
+ extends org.apache.xml.security.stax.impl.securityToken.X509SecurityToken {
private X509Certificate[] x509Certificates = null;
- private final XMLSecurityConstants.TokenType tokenType;
+ private Crypto crypto;
protected X509SecurityToken(XMLSecurityConstants.TokenType tokenType, WSSecurityContext wsSecurityContext,
Crypto crypto, CallbackHandler callbackHandler, String id,
WSSConstants.KeyIdentifierType keyIdentifierType) {
- super(wsSecurityContext, crypto, callbackHandler, id, keyIdentifierType);
- this.tokenType = tokenType;
+ super(tokenType, wsSecurityContext, callbackHandler, id, keyIdentifierType);
+ this.crypto = crypto;
}
-
- @Override
- public boolean isAsymmetric() {
- return true;
+
+ protected Crypto getCrypto() {
+ return crypto;
}
@Override
- protected Key getKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage) throws XMLSecurityException {
+ public Key getKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage) throws XMLSecurityException {
WSPasswordCallback pwCb = new WSPasswordCallback(getAlias(), WSPasswordCallback.Usage.DECRYPT);
XMLSecurityUtils.doPasswordCallback(getCallbackHandler(), pwCb);
return getCrypto().getPrivateKey(getAlias(), pwCb.getPassword());
}
-
+
@Override
- protected PublicKey getPubKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage) throws XMLSecurityException {
+ public PublicKey getPubKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage) throws XMLSecurityException {
X509Certificate[] x509Certificates = getX509Certificates();
if (x509Certificates == null || x509Certificates.length == 0) {
return null;
@@ -96,15 +96,6 @@ public abstract class X509SecurityToken
}
}
- @Override
- public SecurityToken getKeyWrappingToken() {
- return null;
- }
-
protected abstract String getAlias() throws XMLSecurityException;
- @Override
- public XMLSecurityConstants.TokenType getTokenType() {
- return tokenType;
- }
}
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=1360212&r1=1360211&r2=1360212&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 Wed Jul 11 14:50:10 2012
@@ -19,10 +19,10 @@
package org.swssf.wss.securityEvent;
import org.swssf.wss.ext.WSSConstants;
-import org.swssf.wss.impl.securityToken.AbstractSecurityToken;
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.impl.securityToken.AbstractSecurityToken;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
import java.security.Key;
@@ -69,7 +69,7 @@ public class HttpsTokenSecurityEvent ext
public SecurityToken getSecurityToken() {
SecurityToken securityToken = super.getSecurityToken();
if (securityToken == null) {
- securityToken = new AbstractSecurityToken(null, null, null, null, null) {
+ securityToken = new AbstractSecurityToken(null, null, null, null) {
@Override
protected Key getKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage) throws XMLSecurityException {
return null;
Modified: webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/VulnerabliltyVectorsTest.java?rev=1360212&r1=1360211&r2=1360212&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/branches/swssf/streaming-ws-security/src/test/java/org/swssf/wss/test/VulnerabliltyVectorsTest.java Wed Jul 11 14:50:10 2012
@@ -108,7 +108,7 @@ public class VulnerabliltyVectorsTest ex
} catch (XMLStreamException e) {
Throwable throwable = e.getCause();
Assert.assertNotNull(throwable);
- Assert.assertTrue(throwable instanceof WSSecurityException);
+ Assert.assertTrue(throwable instanceof XMLSecurityException);
//we expect a "No SecurityToken found" since WSS says that a token must be declared before use.
//the declare before use is in the nature of streaming xml-security and therefore expected
//Assert.assertEquals(throwable.getMessage(), "An invalid security token was provided");