Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -1,5 +1,5 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one + * 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 * regarding copyright ownership. The ASF licenses this file @@ -18,13 +18,24 @@ */ package org.apache.wss4j.stax.impl.processor.output; +import java.security.Key; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; -import org.apache.xml.security.stax.ext.*; +import org.apache.xml.security.stax.ext.AbstractOutputProcessor; +import org.apache.xml.security.stax.ext.OutputProcessorChain; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.ext.stax.XMLSecAttribute; import org.apache.xml.security.stax.ext.stax.XMLSecEvent; import org.apache.xml.security.stax.impl.securityToken.GenericOutboundSecurityToken; @@ -32,14 +43,6 @@ import org.apache.xml.security.stax.impl import org.apache.xml.security.stax.securityToken.OutboundSecurityToken; import org.apache.xml.security.stax.securityToken.SecurityTokenProvider; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import java.security.Key; -import java.security.PublicKey; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.List; - public class SecurityContextTokenOutputProcessor extends AbstractOutputProcessor { public SecurityContextTokenOutputProcessor() throws XMLSecurityException { @@ -154,7 +157,7 @@ public class SecurityContextTokenOutputP if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) { final QName headerElementName = getHeaderElementName(); - WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); + OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -18,10 +18,17 @@ */ package org.apache.wss4j.stax.impl.processor.output; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.AbstractOutputProcessor; import org.apache.xml.security.stax.ext.OutputProcessorChain; @@ -31,12 +38,6 @@ 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 javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import java.util.ArrayList; -import java.util.List; - /** * Processor to build the Security Header structure */ Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java Mon Oct 5 10:30:28 2015 @@ -18,11 +18,23 @@ */ package org.apache.wss4j.stax.impl.processor.output; +import java.util.ArrayDeque; +import java.util.Comparator; +import java.util.Deque; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.impl.SecurityHeaderOrder; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.AbstractOutputProcessor; import org.apache.xml.security.stax.ext.OutputProcessorChain; @@ -31,11 +43,6 @@ import org.apache.xml.security.stax.ext. import org.apache.xml.security.stax.ext.stax.XMLSecStartElement; import org.apache.xml.security.stax.impl.processor.output.FinalOutputProcessor; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; - -import java.util.*; - /** * The basic ordering (token dependencies) is given through the processor order * but we have more ordering criterias e.g. signed timestamp and strict header ordering ws-policy. Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -18,10 +18,16 @@ */ package org.apache.wss4j.stax.impl.processor.output; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import org.apache.commons.codec.binary.Base64; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.AbstractOutputProcessor; import org.apache.xml.security.stax.ext.OutputProcessorChain; @@ -32,11 +38,6 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityEvent.SecurityEventConstants; import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import java.util.ArrayList; -import java.util.List; - public class SignatureConfirmationOutputProcessor extends AbstractOutputProcessor { public SignatureConfirmationOutputProcessor() throws XMLSecurityException { @@ -66,7 +67,7 @@ public class SignatureConfirmationOutput aSignatureFound = true; SignatureValueSecurityEvent signatureValueSecurityEvent = (SignatureValueSecurityEvent) securityEvent; - WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); + OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); List<XMLSecAttribute> attributes = new ArrayList<>(2); attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null))); @@ -77,7 +78,7 @@ public class SignatureConfirmationOutput } if (!aSignatureFound) { - WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); + OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); List<XMLSecAttribute> attributes = new ArrayList<>(1); attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null))); createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes); Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -18,19 +18,22 @@ */ package org.apache.wss4j.stax.impl.processor.output; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.AbstractOutputProcessor; import org.apache.xml.security.stax.ext.OutputProcessorChain; import org.apache.xml.security.stax.ext.stax.XMLSecEvent; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import java.util.*; - public class TimestampOutputProcessor extends AbstractOutputProcessor { public TimestampOutputProcessor() throws XMLSecurityException { @@ -61,7 +64,7 @@ public class TimestampOutputProcessor ex if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) { final QName headerElementName = WSSConstants.TAG_wsu_Timestamp; - WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); + OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); XMLGregorianCalendar created = WSSConstants.datatypeFactory.newXMLGregorianCalendar(new GregorianCalendar(TimeZone.getTimeZone("UTC"))); Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -24,8 +24,8 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.common.util.UsernameTokenUtil; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.impl.securityToken.OutboundUsernameSecurityToken; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.*; import org.apache.xml.security.stax.ext.stax.XMLSecAttribute; @@ -179,7 +179,7 @@ public class UsernameTokenOutputProcesso if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, ((WSSSecurityProperties) getSecurityProperties()).getActor())) { final QName headerElementName = WSSConstants.TAG_wsse_UsernameToken; - WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); + OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false); OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this); Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -21,9 +21,9 @@ package org.apache.wss4j.stax.impl.proce import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.impl.SecurityHeaderOrder; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.OutputProcessorChain; import org.apache.xml.security.stax.ext.XMLSecurityConstants; @@ -252,7 +252,7 @@ public class WSSSignatureEndingOutputPro case XMLStreamConstants.START_ELEMENT: if (WSSUtils.isSecurityHeaderElement(xmlSecEvent, actor)) { - WSSUtils.updateSecurityHeaderOrder( + OutputProcessorUtils.updateSecurityHeaderOrder( outputProcessorChain, WSSConstants.TAG_dsig_Signature, getAction(), true); List<SecurityHeaderOrder> securityHeaderOrderList = Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java Mon Oct 5 10:30:28 2015 @@ -38,8 +38,8 @@ import org.apache.wss4j.common.ext.Attac import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.impl.transformer.AttachmentContentSignatureTransform; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.OutputProcessorChain; import org.apache.xml.security.stax.ext.SecurePart; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/DsaKeyValueSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/DsaKeyValueSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/DsaKeyValueSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/DsaKeyValueSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,10 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Principal; + +import javax.security.auth.Subject; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.PublicKeyPrincipalImpl; @@ -26,9 +30,6 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.binding.xmldsig.DSAKeyValueType; import org.apache.xml.security.exceptions.XMLSecurityException; -import javax.security.auth.Subject; -import java.security.Principal; - public class DsaKeyValueSecurityTokenImpl extends org.apache.xml.security.stax.impl.securityToken.DsaKeyValueSecurityToken implements DsaKeyValueSecurityToken { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/ECKeyValueSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/ECKeyValueSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/ECKeyValueSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/ECKeyValueSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,10 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Principal; + +import javax.security.auth.Subject; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.PublicKeyPrincipalImpl; @@ -26,9 +30,6 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.binding.xmldsig11.ECKeyValueType; import org.apache.xml.security.exceptions.XMLSecurityException; -import javax.security.auth.Subject; -import java.security.Principal; - public class ECKeyValueSecurityTokenImpl extends org.apache.xml.security.stax.impl.securityToken.ECKeyValueSecurityToken implements ECKeyValueSecurityToken { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/EncryptedKeySha1SecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -27,9 +27,9 @@ import org.apache.wss4j.common.ext.WSPas import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSInboundSecurityContext; import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.securityToken.EncryptedKeySha1SecurityToken; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.algorithms.JCEMapper; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.XMLSecurityConstants; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/HttpsSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/HttpsSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/HttpsSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/HttpsSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,11 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Principal; +import java.security.cert.X509Certificate; + +import javax.security.auth.Subject; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.securityToken.HttpsSecurityToken; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; @@ -25,10 +30,6 @@ import org.apache.xml.security.exception import org.apache.xml.security.stax.impl.securityToken.AbstractInboundSecurityToken; import org.apache.xml.security.stax.impl.util.IDGenerator; -import javax.security.auth.Subject; -import java.security.Principal; -import java.security.cert.X509Certificate; - public class HttpsSecurityTokenImpl extends AbstractInboundSecurityToken implements HttpsSecurityToken { private String username; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/KerberosServiceSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/KerberosServiceSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/KerberosServiceSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/KerberosServiceSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,9 +18,27 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.io.IOException; +import java.security.Key; +import java.security.Principal; +import java.security.PrivilegedActionException; +import java.util.Set; + +import javax.security.auth.Subject; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; + import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.ext.WSSecurityException.ErrorCode; -import org.apache.wss4j.common.kerberos.*; +import org.apache.wss4j.common.kerberos.KerberosContextAndServiceNameCallback; +import org.apache.wss4j.common.kerberos.KerberosServiceContext; +import org.apache.wss4j.common.kerberos.KerberosServiceExceptionAction; +import org.apache.wss4j.common.kerberos.KerberosTokenDecoder; +import org.apache.wss4j.common.kerberos.KerberosTokenDecoderException; +import org.apache.wss4j.common.kerberos.KerberosTokenDecoderImpl; import org.apache.wss4j.common.util.KeyUtils; import org.apache.wss4j.stax.ext.WSInboundSecurityContext; import org.apache.wss4j.stax.securityToken.KerberosServiceSecurityToken; @@ -29,19 +47,6 @@ import org.apache.xml.security.exception import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.impl.securityToken.AbstractInboundSecurityToken; -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; - -import java.io.IOException; -import java.security.Key; -import java.security.Principal; -import java.security.PrivilegedActionException; -import java.util.Set; - public class KerberosServiceSecurityTokenImpl extends AbstractInboundSecurityToken implements KerberosServiceSecurityToken { private CallbackHandler callbackHandler; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/RsaKeyValueSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/RsaKeyValueSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/RsaKeyValueSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/RsaKeyValueSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,10 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Principal; + +import javax.security.auth.Subject; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.PublicKeyPrincipalImpl; @@ -26,9 +30,6 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.binding.xmldsig.RSAKeyValueType; import org.apache.xml.security.exceptions.XMLSecurityException; -import javax.security.auth.Subject; -import java.security.Principal; - public class RsaKeyValueSecurityTokenImpl extends org.apache.xml.security.stax.impl.securityToken.RsaKeyValueSecurityToken implements RsaKeyValueSecurityToken { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,21 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.x500.X500Principal; + import org.apache.commons.codec.binary.Base64; import org.apache.wss4j.binding.wss10.KeyIdentifierType; import org.apache.wss4j.binding.wss10.SecurityTokenReferenceType; @@ -27,32 +42,31 @@ import org.apache.wss4j.common.ext.WSSec import org.apache.wss4j.stax.ext.WSInboundSecurityContext; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; -import org.apache.wss4j.stax.securityToken.*; -import org.apache.xml.security.binding.xmldsig.*; +import org.apache.wss4j.stax.securityToken.KerberosServiceSecurityToken; +import org.apache.wss4j.stax.securityToken.SamlSecurityToken; +import org.apache.wss4j.stax.securityToken.SecurityTokenReference; +import org.apache.wss4j.stax.securityToken.UsernameSecurityToken; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.securityToken.X509SecurityToken; +import org.apache.wss4j.stax.utils.WSSUtils; +import org.apache.xml.security.binding.xmldsig.DSAKeyValueType; +import org.apache.xml.security.binding.xmldsig.KeyInfoType; +import org.apache.xml.security.binding.xmldsig.KeyValueType; +import org.apache.xml.security.binding.xmldsig.RSAKeyValueType; +import org.apache.xml.security.binding.xmldsig.X509DataType; +import org.apache.xml.security.binding.xmldsig.X509IssuerSerialType; import org.apache.xml.security.binding.xmldsig11.ECKeyValueType; import org.apache.xml.security.exceptions.XMLSecurityException; -import org.apache.xml.security.stax.ext.*; +import org.apache.xml.security.stax.ext.InboundSecurityContext; +import org.apache.xml.security.stax.ext.SecurityContext; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; +import org.apache.xml.security.stax.ext.XMLSecurityProperties; +import org.apache.xml.security.stax.ext.XMLSecurityUtils; import org.apache.xml.security.stax.impl.util.IDGenerator; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; import org.apache.xml.security.stax.securityToken.SecurityTokenFactory; import org.apache.xml.security.stax.securityToken.SecurityTokenProvider; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.x500.X500Principal; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * Factory to create InboundSecurityToken Objects from keys in XML */ Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenReferenceImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenReferenceImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenReferenceImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenReferenceImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,12 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Key; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Deque; +import java.util.Map; + import org.apache.wss4j.stax.ext.WSInboundSecurityContext; import org.apache.wss4j.stax.securityToken.SecurityTokenReference; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; @@ -27,12 +33,6 @@ import org.apache.xml.security.stax.ext. import org.apache.xml.security.stax.impl.securityToken.AbstractInboundSecurityToken; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import java.security.Key; -import java.security.PublicKey; -import java.security.cert.X509Certificate; -import java.util.Deque; -import java.util.Map; - public class SecurityTokenReferenceImpl extends AbstractInboundSecurityToken implements SecurityTokenReference { private final InboundSecurityToken inboundSecurityToken; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/UsernameSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/UsernameSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/UsernameSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/UsernameSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,12 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Key; +import java.security.Principal; + +import javax.crypto.spec.SecretKeySpec; +import javax.security.auth.Subject; + import org.apache.wss4j.common.bsp.BSPRule; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.UsernameTokenPrincipal; @@ -31,11 +37,6 @@ import org.apache.xml.security.stax.conf import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.impl.securityToken.AbstractInboundSecurityToken; -import javax.crypto.spec.SecretKeySpec; -import javax.security.auth.Subject; -import java.security.Key; -import java.security.Principal; - public class UsernameSecurityTokenImpl extends AbstractInboundSecurityToken implements UsernameSecurityToken { private static final long DEFAULT_ITERATION = 1000; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509DefaultSecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509DefaultSecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509DefaultSecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509DefaultSecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,14 +18,14 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import javax.security.auth.callback.CallbackHandler; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.stax.ext.WSInboundSecurityContext; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.exceptions.XMLSecurityException; -import javax.security.auth.callback.CallbackHandler; - public class X509DefaultSecurityTokenImpl extends X509SecurityTokenImpl { private String alias = null; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509IssuerSerialTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,10 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.cert.X509Certificate; + +import javax.security.auth.callback.CallbackHandler; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.ext.WSSecurityException; @@ -27,9 +31,6 @@ import org.apache.wss4j.stax.securityTok import org.apache.xml.security.binding.xmldsig.X509IssuerSerialType; import org.apache.xml.security.exceptions.XMLSecurityException; -import javax.security.auth.callback.CallbackHandler; -import java.security.cert.X509Certificate; - public class X509IssuerSerialTokenImpl extends X509SecurityTokenImpl { private String alias = null; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,16 +18,6 @@ */ package org.apache.wss4j.stax.impl.securityToken; -import org.apache.wss4j.common.crypto.Crypto; -import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.WSInboundSecurityContext; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.apache.xml.security.exceptions.XMLSecurityException; -import org.apache.xml.security.stax.impl.util.UnsynchronizedByteArrayInputStream; - -import javax.security.auth.callback.CallbackHandler; - import java.io.IOException; import java.io.InputStream; import java.security.cert.CertPath; @@ -37,6 +27,16 @@ import java.security.cert.X509Certificat import java.util.Iterator; import java.util.List; +import javax.security.auth.callback.CallbackHandler; + +import org.apache.wss4j.common.crypto.Crypto; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.stax.ext.WSInboundSecurityContext; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.xml.security.exceptions.XMLSecurityException; +import org.apache.xml.security.stax.impl.util.UnsynchronizedByteArrayInputStream; + public class X509PKIPathv1SecurityTokenImpl extends X509SecurityTokenImpl { private String alias = null; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509SecurityTokenImpl.java Mon Oct 5 10:30:28 2015 @@ -18,28 +18,30 @@ */ package org.apache.wss4j.stax.impl.securityToken; +import java.security.Key; +import java.security.Principal; +import java.security.cert.X509Certificate; +import java.util.Collection; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.security.auth.Subject; +import javax.security.auth.callback.CallbackHandler; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.PublicKeyPrincipalImpl; -import org.apache.wss4j.stax.ext.*; +import org.apache.wss4j.stax.ext.WSInboundSecurityContext; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.wss4j.stax.securityToken.X509SecurityToken; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.XMLSecurityConstants; import org.apache.xml.security.stax.securityToken.SecurityTokenConstants.TokenType; -import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; - -import java.security.Key; -import java.security.Principal; -import java.security.cert.X509Certificate; -import java.util.Collection; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public abstract class X509SecurityTokenImpl extends org.apache.xml.security.stax.impl.securityToken.X509SecurityToken implements X509SecurityToken { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/RelTokenSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/RelTokenSecurityEvent.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/RelTokenSecurityEvent.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/RelTokenSecurityEvent.java Mon Oct 5 10:30:28 2015 @@ -18,7 +18,6 @@ */ package org.apache.wss4j.stax.securityEvent; - import org.apache.xml.security.stax.securityToken.SecurityToken; public class RelTokenSecurityEvent extends IssuedTokenSecurityEvent<SecurityToken> { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SecurityContextTokenSecurityEvent.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SecurityContextTokenSecurityEvent.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SecurityContextTokenSecurityEvent.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityEvent/SecurityContextTokenSecurityEvent.java Mon Oct 5 10:30:28 2015 @@ -18,7 +18,6 @@ */ package org.apache.wss4j.stax.securityEvent; - import org.apache.xml.security.stax.securityToken.SecurityToken; public class SecurityContextTokenSecurityEvent extends IssuedTokenSecurityEvent<SecurityToken> { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/HttpsSecurityToken.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/HttpsSecurityToken.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/HttpsSecurityToken.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/HttpsSecurityToken.java Mon Oct 5 10:30:28 2015 @@ -18,7 +18,6 @@ */ package org.apache.wss4j.stax.securityToken; - import org.apache.xml.security.stax.securityToken.InboundSecurityToken; public interface HttpsSecurityToken extends SubjectAndPrincipalSecurityToken, InboundSecurityToken { Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/WSSecurityTokenConstants.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/WSSecurityTokenConstants.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/WSSecurityTokenConstants.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/WSSecurityTokenConstants.java Mon Oct 5 10:30:28 2015 @@ -18,7 +18,6 @@ */ package org.apache.wss4j.stax.securityToken; - import org.apache.xml.security.stax.securityToken.SecurityTokenConstants; public class WSSecurityTokenConstants extends SecurityTokenConstants { Copied: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java (from r1706470, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java?p2=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java&p1=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java&r1=1706470&r2=1706788&rev=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java Mon Oct 5 10:30:28 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.stax; +package org.apache.wss4j.stax.setup; import java.util.ArrayList; import java.util.Collection; Copied: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/InboundWSSec.java (from r1706470, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/InboundWSSec.java?p2=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/InboundWSSec.java&p1=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java&r1=1706470&r2=1706788&rev=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/InboundWSSec.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/InboundWSSec.java Mon Oct 5 10:30:28 2015 @@ -16,9 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.stax.ext; +package org.apache.wss4j.stax.setup; + +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.InboundWSSecurityContextImpl; import org.apache.wss4j.stax.impl.WSSecurityStreamReader; import org.apache.wss4j.stax.impl.processor.input.OperationInputProcessor; @@ -38,13 +48,6 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityToken.InboundSecurityToken; import org.apache.xml.security.stax.securityToken.SecurityTokenProvider; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - /** * Inbound Streaming-WebService-Security * An instance of this class can be retrieved over the WSSec class Copied: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java (from r1706470, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java?p2=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java&p1=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java&r1=1706470&r2=1706788&rev=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/OutboundWSSec.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java Mon Oct 5 10:30:28 2015 @@ -16,15 +16,42 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.stax.ext; +package org.apache.wss4j.stax.setup; + +import java.io.OutputStream; +import java.security.Key; +import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; +import java.util.List; + +import javax.crypto.KeyGenerator; +import javax.crypto.spec.SecretKeySpec; +import javax.xml.stream.XMLStreamWriter; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoType; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.impl.processor.output.*; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.impl.processor.output.BinarySecurityTokenOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.CustomTokenOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.DerivedKeyTokenOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.EncryptEndingOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.EncryptOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.EncryptedKeyOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.ReferenceListOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.SAMLTokenOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.SecurityContextTokenOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.SecurityHeaderOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.SecurityHeaderReorderProcessor; +import org.apache.wss4j.stax.impl.processor.output.SignatureConfirmationOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.TimestampOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.UsernameTokenOutputProcessor; +import org.apache.wss4j.stax.impl.processor.output.WSSSignatureOutputProcessor; import org.apache.wss4j.stax.impl.securityToken.KerberosClientSecurityToken; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.config.JCEAlgorithmMapper; import org.apache.xml.security.stax.ext.OutboundSecurityContext; @@ -45,16 +72,6 @@ import org.apache.xml.security.stax.secu import org.apache.xml.security.stax.securityToken.SecurityToken; import org.apache.xml.security.stax.securityToken.SecurityTokenProvider; -import javax.crypto.KeyGenerator; -import javax.crypto.spec.SecretKeySpec; -import javax.xml.stream.XMLStreamWriter; - -import java.io.OutputStream; -import java.security.Key; -import java.security.NoSuchAlgorithmException; -import java.security.cert.X509Certificate; -import java.util.List; - /** * Outbound Streaming-WebService-Security * An instance of this class can be retrieved over the WSSec class Copied: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java (from r1706470, 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/setup/WSSec.java?p2=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java&p1=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java&r1=1706470&r2=1706788&rev=1706788&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/setup/WSSec.java Mon Oct 5 10:30:28 2015 @@ -16,31 +16,35 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.stax; +package org.apache.wss4j.stax.setup; import java.net.URISyntaxException; import java.util.HashSet; import java.util.List; +import javax.xml.XMLConstants; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; import org.apache.wss4j.common.crypto.WSProviderConfig; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConfigurationException; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.config.Init; import org.apache.xml.security.stax.ext.SecurePart; import org.apache.xml.security.stax.ext.XMLSecurityConstants; +import org.apache.xml.security.stax.impl.util.ConcreteLSInput; import org.apache.xml.security.utils.ClassLoaderUtils; +import org.w3c.dom.ls.LSInput; +import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.SAXException; /** @@ -72,7 +76,7 @@ public class WSSec { ) ); - Schema schema = WSSUtils.loadWSSecuritySchemas(); + Schema schema = loadWSSecuritySchemas(); WSSConstants.setJaxbSchemas(schema); } catch (XMLSecurityException | JAXBException | SAXException | URISyntaxException e) { @@ -432,4 +436,54 @@ public class WSSec { public static WSSSecurityProperties validateAndApplyDefaultsToInboundSecurityProperties(WSSSecurityProperties securityProperties) throws WSSConfigurationException { return new WSSSecurityProperties(securityProperties); } + + public static Schema loadWSSecuritySchemas() throws SAXException { + SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + schemaFactory.setResourceResolver(new LSResourceResolver() { + @Override + public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { + if ("http://www.w3.org/2001/XMLSchema.dtd".equals(systemId)) { + ConcreteLSInput concreteLSInput = new ConcreteLSInput(); + concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/XMLSchema.dtd", WSSec.class)); + return concreteLSInput; + } else if ("XMLSchema.dtd".equals(systemId)) { + ConcreteLSInput concreteLSInput = new ConcreteLSInput(); + concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/XMLSchema.dtd", WSSec.class)); + return concreteLSInput; + } else if ("datatypes.dtd".equals(systemId)) { + ConcreteLSInput concreteLSInput = new ConcreteLSInput(); + concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/datatypes.dtd", WSSec.class)); + return concreteLSInput; + } else if ("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd".equals(systemId)) { + ConcreteLSInput concreteLSInput = new ConcreteLSInput(); + concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig-core-schema.xsd", WSSec.class)); + return concreteLSInput; + } else if ("http://www.w3.org/2001/xml.xsd".equals(systemId)) { + ConcreteLSInput concreteLSInput = new ConcreteLSInput(); + concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/xml.xsd", WSSec.class)); + return concreteLSInput; + } + return null; + } + }); + + Schema schema = schemaFactory.newSchema( + new Source[] { + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xml.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/soap-1.1.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/soap-1.2.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/exc-c14n.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig-core-schema.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xenc-schema.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xenc-schema-11.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig11-schema.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-wss-wssecurity-secext-1.1.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/ws-secureconversation-200502.xsd", WSSec.class)), + new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/ws-secureconversation-1.3.xsd", WSSec.class)), + } + ); + return schema; + } } Copied: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java (from r1706470, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java) URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java?p2=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java&p1=webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java&r1=1706470&r2=1706788&rev=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java Mon Oct 5 10:30:28 2015 @@ -16,41 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.wss4j.stax.ext; - -import org.apache.commons.codec.binary.Base64; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.impl.SecurityHeaderOrder; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.apache.wss4j.stax.securityEvent.*; -import org.apache.xml.security.exceptions.XMLSecurityException; -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.EncryptionPartDef; -import org.apache.xml.security.stax.impl.util.ConcreteLSInput; -import org.apache.wss4j.common.crypto.Merlin; -import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent; -import org.apache.xml.security.stax.securityToken.InboundSecurityToken; -import org.apache.xml.security.stax.securityToken.SecurityToken; -import org.apache.xml.security.utils.ClassLoaderUtils; -import org.w3c.dom.ls.LSInput; -import org.w3c.dom.ls.LSResourceResolver; -import org.xml.sax.SAXException; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.xml.XMLConstants; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Attribute; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; +package org.apache.wss4j.stax.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -62,7 +28,47 @@ import java.security.cert.CertificateEnc import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; + +import org.apache.commons.codec.binary.Base64; +import org.apache.wss4j.common.crypto.Merlin; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.stax.ext.WSSConstants; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.securityEvent.DerivedKeyTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.EncryptedKeyTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.HttpsTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.KerberosTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.KeyValueTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.RelTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.SamlTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.SecurityContextTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.UsernameTokenSecurityEvent; +import org.apache.wss4j.stax.securityEvent.X509TokenSecurityEvent; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.xml.security.exceptions.XMLSecurityException; +import org.apache.xml.security.stax.ext.AbstractOutputProcessor; +import org.apache.xml.security.stax.ext.OutputProcessorChain; +import org.apache.xml.security.stax.ext.SecurePart; +import org.apache.xml.security.stax.ext.XMLSecurityConstants; +import org.apache.xml.security.stax.ext.XMLSecurityUtils; +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.EncryptionPartDef; +import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent; +import org.apache.xml.security.stax.securityToken.InboundSecurityToken; +import org.apache.xml.security.stax.securityToken.SecurityToken; public class WSSUtils extends XMLSecurityUtils { @@ -206,30 +212,6 @@ public class WSSUtils extends XMLSecurit return false; } - public static void updateSecurityHeaderOrder( - OutputProcessorChain outputProcessorChain, QName headerElementName, - XMLSecurityConstants.Action action, boolean onTop) { - - final OutboundSecurityContext securityContext = outputProcessorChain.getSecurityContext(); - - Map<Object, SecurePart> dynamicSecureParts = securityContext.getAsMap(WSSConstants.ENCRYPTION_PARTS); - boolean encrypted = false; - if (dynamicSecureParts != null) { - encrypted = dynamicSecureParts.containsKey(headerElementName); - } - - List<SecurityHeaderOrder> securityHeaderOrderList = securityContext.getAsList(SecurityHeaderOrder.class); - if (securityHeaderOrderList == null) { - securityContext.putList(SecurityHeaderOrder.class, Collections.<SecurityHeaderOrder>emptyList()); - securityHeaderOrderList = securityContext.getAsList(SecurityHeaderOrder.class); - } - if (onTop) { - securityHeaderOrderList.add(0, new SecurityHeaderOrder(headerElementName, action, encrypted)); - } else { - securityHeaderOrderList.add(new SecurityHeaderOrder(headerElementName, action, encrypted)); - } - } - public static boolean isResponsibleActorOrRole(XMLSecStartElement xmlSecStartElement, String responsibleActor) { final QName actorRole; final String soapVersionNamespace = getSOAPMessageVersionNamespace(xmlSecStartElement); @@ -658,53 +640,4 @@ public class WSSUtils extends XMLSecurit return tmp; } - public static Schema loadWSSecuritySchemas() throws SAXException { - SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - schemaFactory.setResourceResolver(new LSResourceResolver() { - @Override - public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { - if ("http://www.w3.org/2001/XMLSchema.dtd".equals(systemId)) { - ConcreteLSInput concreteLSInput = new ConcreteLSInput(); - concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/XMLSchema.dtd", WSSec.class)); - return concreteLSInput; - } else if ("XMLSchema.dtd".equals(systemId)) { - ConcreteLSInput concreteLSInput = new ConcreteLSInput(); - concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/XMLSchema.dtd", WSSec.class)); - return concreteLSInput; - } else if ("datatypes.dtd".equals(systemId)) { - ConcreteLSInput concreteLSInput = new ConcreteLSInput(); - concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/datatypes.dtd", WSSec.class)); - return concreteLSInput; - } else if ("http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd".equals(systemId)) { - ConcreteLSInput concreteLSInput = new ConcreteLSInput(); - concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig-core-schema.xsd", WSSec.class)); - return concreteLSInput; - } else if ("http://www.w3.org/2001/xml.xsd".equals(systemId)) { - ConcreteLSInput concreteLSInput = new ConcreteLSInput(); - concreteLSInput.setByteStream(ClassLoaderUtils.getResourceAsStream("schemas/xml.xsd", WSSec.class)); - return concreteLSInput; - } - return null; - } - }); - - Schema schema = schemaFactory.newSchema( - new Source[] { - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xml.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/soap-1.1.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/soap-1.2.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/exc-c14n.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig-core-schema.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xenc-schema.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xenc-schema-11.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/xmldsig11-schema.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/oasis-wss-wssecurity-secext-1.1.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/ws-secureconversation-200502.xsd", WSSec.class)), - new StreamSource(ClassLoaderUtils.getResourceAsStream("schemas/ws-secureconversation-1.3.xsd", WSSec.class)), - } - ); - return schema; - } } Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/SecurityContextTokenValidatorImpl.java Mon Oct 5 10:30:28 2015 @@ -21,8 +21,8 @@ package org.apache.wss4j.stax.validate; import org.apache.wss4j.binding.wssc.AbstractSecurityContextTokenType; import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.xml.security.algorithms.JCEMapper; import org.apache.xml.security.exceptions.XMLSecurityException; import org.apache.xml.security.stax.ext.XMLSecurityConstants; Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/validate/UsernameTokenValidatorImpl.java Mon Oct 5 10:30:28 2015 @@ -27,9 +27,9 @@ import org.apache.wss4j.binding.wsu10.At import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSUtils; import org.apache.wss4j.stax.securityToken.UsernameSecurityToken; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.utils.WSSUtils; import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl; import org.apache.xml.security.stax.ext.XMLSecurityUtils; import org.apache.xml.security.stax.securityToken.InboundSecurityToken; 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=1706788&r1=1706787&r2=1706788&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 Mon Oct 5 10:30:28 2015 @@ -34,13 +34,13 @@ 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; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.impl.processor.input.DecryptInputProcessor; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.SOAPUtil; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java Mon Oct 5 10:30:28 2015 @@ -52,11 +52,11 @@ import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.common.SOAPUtil; import org.apache.wss4j.dom.message.WSSecEncrypt; import org.apache.wss4j.dom.message.WSSecHeader; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.exceptions.XMLSecurityException; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java Mon Oct 5 10:30:28 2015 @@ -22,12 +22,12 @@ import java.util.HashMap; import java.util.Map; import org.apache.wss4j.common.ConfigurationConstants; -import org.apache.wss4j.stax.ConfigurationConverter; -import org.apache.wss4j.stax.WSSec; import org.apache.wss4j.stax.ext.WSSConstants; -import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.ext.WSSConstants.UsernameTokenPasswordType; +import org.apache.wss4j.stax.ext.WSSSecurityProperties; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.saml.SAMLCallbackHandlerImpl; import org.junit.Assert; import org.junit.Test; Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java Mon Oct 5 10:30:28 2015 @@ -18,6 +18,21 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Properties; + +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; @@ -26,17 +41,21 @@ import org.apache.wss4j.common.token.Sec import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.dom.message.*; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; -import org.apache.wss4j.stax.ext.OutboundWSSec; +import org.apache.wss4j.dom.message.WSSecDKEncrypt; +import org.apache.wss4j.dom.message.WSSecDKSign; +import org.apache.wss4j.dom.message.WSSecEncryptedKey; +import org.apache.wss4j.dom.message.WSSecHeader; +import org.apache.wss4j.dom.message.WSSecSecurityContextToken; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; -import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; -import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; +import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent; import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; +import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.SOAPUtil; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; @@ -52,21 +71,6 @@ import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Properties; - @RunWith(value = org.junit.runners.Parameterized.class) public class DerivedKeyTokenTest extends AbstractTestBase { 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=1706788&r1=1706787&r2=1706788&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 Mon Oct 5 10:30:28 2015 @@ -18,6 +18,32 @@ */ package org.apache.wss4j.stax.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.security.KeyStore; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; + import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.apache.wss4j.common.ConfigurationConstants; @@ -30,14 +56,16 @@ 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.OutboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.securityEvent.EncryptedPartSecurityEvent; +import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent; +import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants; import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants; -import org.apache.wss4j.stax.securityEvent.*; +import org.apache.wss4j.stax.setup.ConfigurationConverter; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.OutboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.apache.wss4j.stax.test.utils.XmlReaderToWriter; import org.apache.xml.security.exceptions.XMLSecurityException; @@ -56,32 +84,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpression; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.security.KeyStore; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - public class EncDecryptionTest extends AbstractTestBase { @Test Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java?rev=1706788&r1=1706787&r2=1706788&view=diff ============================================================================== --- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java (original) +++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/FaultTest.java Mon Oct 5 10:30:28 2015 @@ -30,10 +30,10 @@ import javax.xml.transform.dom.DOMSource import javax.xml.transform.stream.StreamResult; import org.apache.wss4j.dom.handler.WSHandlerConstants; -import org.apache.wss4j.stax.WSSec; -import org.apache.wss4j.stax.ext.InboundWSSec; import org.apache.wss4j.stax.ext.WSSConstants; import org.apache.wss4j.stax.ext.WSSSecurityProperties; +import org.apache.wss4j.stax.setup.InboundWSSec; +import org.apache.wss4j.stax.setup.WSSec; import org.apache.wss4j.stax.test.utils.StAX2DOM; import org.junit.Assert; import org.junit.Test;
