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 2013/05/08 17:10:44 UTC
svn commit: r1480314 - in /webservices/wss4j/trunk/ws-security-stax/src:
main/java/org/apache/wss4j/stax/ test/java/org/apache/wss4j/stax/test/
test/java/org/apache/wss4j/stax/test/saml/
Author: coheigea
Date: Wed May 8 15:10:44 2013
New Revision: 1480314
URL: http://svn.apache.org/r1480314
Log:
Take ConfigurationConverter out of WSSec
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java Wed May 8 15:10:44 2013
@@ -19,7 +19,6 @@
package org.apache.wss4j.stax;
import java.net.URISyntaxException;
-import java.util.Map;
import org.apache.wss4j.common.crypto.WSProviderConfig;
import org.apache.wss4j.common.ext.WSSecurityException;
@@ -70,26 +69,6 @@ public class WSSec {
}
/**
- * Creates and configures an outbound streaming security engine
- *
- * @param config The user-defined security configuration
- * @return A new OutboundWSSec
- * @throws WSSecurityException
- * if the initialisation failed
- * @throws org.apache.wss4j.stax.ext.WSSConfigurationException
- * if the configuration is invalid
- */
- public static OutboundWSSec getOutboundWSSec(Map<String, Object> config) throws WSSecurityException {
- if (config == null) {
- throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE, "missingSecurityProperties");
- }
-
- WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
- securityProperties = validateAndApplyDefaultsToOutboundSecurityProperties(securityProperties);
- return new OutboundWSSec(securityProperties);
- }
-
- /**
* Creates and configures an inbound streaming security engine
*
* @param securityProperties The user-defined security configuration
@@ -109,26 +88,6 @@ public class WSSec {
}
/**
- * Creates and configures an inbound streaming security engine
- *
- * @param config The user-defined security configuration
- * @return A new InboundWSSec
- * @throws WSSecurityException
- * if the initialisation failed
- * @throws org.apache.wss4j.stax.ext.WSSConfigurationException
- * if the configuration is invalid
- */
- public static InboundWSSec getInboundWSSec(Map<String, Object> config) throws WSSecurityException {
- if (config == null) {
- throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE, "missingSecurityProperties");
- }
-
- WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
- securityProperties = validateAndApplyDefaultsToInboundSecurityProperties(securityProperties);
- return new InboundWSSec(securityProperties);
- }
-
- /**
* Validates the user supplied configuration and applies default values as apropriate for the outbound security engine
*
* @param securityProperties The configuration to validate
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java Wed May 8 15:10:44 2013
@@ -31,6 +31,7 @@ import org.apache.wss4j.dom.handler.WSHa
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.OutboundWSSec;
@@ -153,7 +154,8 @@ public abstract class AbstractTestBase {
protected ByteArrayOutputStream doOutboundSecurity(Map<String, Object> config, InputStream sourceDocument)
throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, "UTF-8", new ArrayList<SecurityEvent>());
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(sourceDocument);
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Wed May 8 15:10:44 2013
@@ -28,6 +28,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.message.WSSecEncrypt;
import org.apache.wss4j.dom.message.WSSecHeader;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.WSSConstants;
@@ -2401,7 +2402,8 @@ public class EncDecryptionTest extends A
};
final TestSecurityEventListener securityEventListener = new TestSecurityEventListener(expectedSecurityEvents);
- InboundWSSec wsSecIn = WSSec.getInboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
XMLStreamReader outXmlStreamReader =
wsSecIn.processInMessage(
xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())),
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java Wed May 8 15:10:44 2013
@@ -52,6 +52,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.message.WSSecHeader;
import org.apache.wss4j.dom.message.WSSecSignature;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.OutboundWSSec;
@@ -1474,7 +1475,8 @@ public class SignatureTest extends Abstr
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
config.put(ConfigurationConstants.SIG_PROP_FILE, "transmitter-crypto.properties");
- OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, "UTF-8", new ArrayList<SecurityEvent>());
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"));
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
@@ -1528,7 +1530,8 @@ public class SignatureTest extends Abstr
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
config.put(ConfigurationConstants.SIG_VER_PROP_FILE, "transmitter-crypto.properties");
- InboundWSSec wsSecIn = WSSec.getInboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java Wed May 8 15:10:44 2013
@@ -23,6 +23,7 @@ import org.apache.wss4j.common.bsp.BSPRu
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.*;
import org.apache.wss4j.stax.test.utils.StAX2DOM;
@@ -609,7 +610,8 @@ public class TimestampTest extends Abstr
Map<String, Object> config = new HashMap<String, Object>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
- OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, "UTF-8", new ArrayList<SecurityEvent>());
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"));
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
@@ -664,7 +666,8 @@ public class TimestampTest extends Abstr
{
Map<String, Object> config = new HashMap<String, Object>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
- InboundWSSec wsSecIn = WSSec.getInboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java Wed May 8 15:10:44 2013
@@ -40,6 +40,7 @@ import org.apache.wss4j.common.Configura
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.OutboundWSSec;
@@ -825,7 +826,8 @@ public class UsernameTokenTest extends A
config.put(ConfigurationConstants.USER, "transmitter");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
- OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, "UTF-8", new ArrayList<SecurityEvent>());
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"));
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
@@ -873,7 +875,8 @@ public class UsernameTokenTest extends A
Map<String, Object> config = new HashMap<String, Object>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
- InboundWSSec wsSecIn = WSSec.getInboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
WSSecurityEventConstants.Event[] expectedSecurityEvents = new WSSecurityEventConstants.Event[]{
WSSecurityEventConstants.UsernameToken,
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1480314&r1=1480313&r2=1480314&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Wed May 8 15:10:44 2013
@@ -21,6 +21,7 @@ package org.apache.wss4j.stax.test.saml;
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.saml.builder.SAML1Constants;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.stax.ConfigurationConverter;
import org.apache.wss4j.stax.WSSec;
import org.apache.wss4j.stax.ext.InboundWSSec;
import org.apache.wss4j.stax.ext.OutboundWSSec;
@@ -755,7 +756,8 @@ public class SAMLTokenTest extends Abstr
callbackHandler.setSignAssertion(false);
config.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
- OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, "UTF-8", new ArrayList<SecurityEvent>());
XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"));
XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
@@ -803,7 +805,8 @@ public class SAMLTokenTest extends Abstr
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
config.put(ConfigurationConstants.SIG_VER_PROP_FILE, "receiver-crypto.properties");
- InboundWSSec wsSecIn = WSSec.getInboundWSSec(config);
+ WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
+ InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);