You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by dk...@apache.org on 2013/03/08 21:13:49 UTC
svn commit: r1454526 - in /webservices/wss4j/trunk:
ws-security-common/src/main/java/org/apache/wss4j/common/ext/
ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/
ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/tes...
Author: dkulp
Date: Fri Mar 8 20:13:48 2013
New Revision: 1454526
URL: http://svn.apache.org/r1454526
Log:
Fix a bunch of eclipse warnings, cleanup some generics usage
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyViolationException.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConfigurationException.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.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/InboundWSSecurityContextImplTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceTimingTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.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/VulnerabliltyVectorsTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java Fri Mar 8 20:13:48 2013
@@ -29,6 +29,9 @@ import javax.xml.namespace.QName;
*/
public class WSSecurityException extends XMLSecurityException {
+ private static final long serialVersionUID = 4703352039717763655L;
+
+
/****************************************************************************
* Fault codes defined in the WSS 1.1 spec under section 12, Error handling
*/
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcerFactory.java Fri Mar 8 20:13:48 2013
@@ -53,16 +53,16 @@ public class PolicyEnforcerFactory {
protected static final transient Log log = LogFactory.getLog(PolicyEnforcerFactory.class);
- private final List<AssertionBuilder> assertionBuilders;
+ private final List<AssertionBuilder<Element>> assertionBuilders;
private Definition wsdlDefinition;
private List<OperationPolicy> operationPolicies;
private final Map<Element, Policy> elementPolicyCache;
- private PolicyEnforcerFactory(List<AssertionBuilder> customAssertionBuilders) {
+ private PolicyEnforcerFactory(List<AssertionBuilder<Element>> customAssertionBuilders) {
elementPolicyCache = new HashMap<Element, Policy>();
- assertionBuilders = new ArrayList<AssertionBuilder>();
+ assertionBuilders = new ArrayList<AssertionBuilder<Element>>();
assertionBuilders.add(new AlgorithmSuiteBuilder());
assertionBuilders.add(new AsymmetricBindingBuilder());
assertionBuilders.add(new ContentEncryptedElementsBuilder());
@@ -104,7 +104,7 @@ public class PolicyEnforcerFactory {
if (customAssertionBuilders != null) {
for (int i = 0; i < customAssertionBuilders.size(); i++) {
- AssertionBuilder customAssertionBuilder = customAssertionBuilders.get(i);
+ AssertionBuilder<Element> customAssertionBuilder = customAssertionBuilders.get(i);
assertionBuilders.add(customAssertionBuilder);
}
}
@@ -114,7 +114,7 @@ public class PolicyEnforcerFactory {
return newInstance(wsdlUrl, null);
}
- public static PolicyEnforcerFactory newInstance(URL wsdlUrl, List<AssertionBuilder> customAssertionBuilders)
+ public static PolicyEnforcerFactory newInstance(URL wsdlUrl, List<AssertionBuilder<Element>> customAssertionBuilders)
throws WSSPolicyException {
PolicyEnforcerFactory policyEnforcerFactory = new PolicyEnforcerFactory(customAssertionBuilders);
@@ -126,7 +126,7 @@ public class PolicyEnforcerFactory {
return newInstance(document, null);
}
- public static PolicyEnforcerFactory newInstance(Document document, List<AssertionBuilder> customAssertionBuilders)
+ public static PolicyEnforcerFactory newInstance(Document document, List<AssertionBuilder<Element>> customAssertionBuilders)
throws WSSPolicyException {
PolicyEnforcerFactory policyEnforcerFactory = new PolicyEnforcerFactory(customAssertionBuilders);
@@ -163,13 +163,13 @@ public class PolicyEnforcerFactory {
private List<OperationPolicy> findPoliciesByOperation(Definition wsdlDefinition) throws WSSPolicyException {
List<OperationPolicy> operationPolicyList = new ArrayList<OperationPolicy>();
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
Iterator<Map.Entry> services = wsdlDefinition.getAllServices().entrySet().iterator();
while (services.hasNext()) {
@SuppressWarnings("unchecked")
Map.Entry<QName, Service> serviceEntry = services.next();
Service service = serviceEntry.getValue();
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
Iterator<Map.Entry> ports = service.getPorts().entrySet().iterator();
while (ports.hasNext()) {
@SuppressWarnings("unchecked")
@@ -363,7 +363,7 @@ public class PolicyEnforcerFactory {
private void registerDefaultBuilders(AssertionBuilderFactory assertionBuilderFactory) {
for (int i = 0; i < assertionBuilders.size(); i++) {
- AssertionBuilder assertionBuilder = assertionBuilders.get(i);
+ AssertionBuilder<Element> assertionBuilder = assertionBuilders.get(i);
assertionBuilderFactory.registerBuilder(assertionBuilder);
}
}
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyViolationException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyViolationException.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyViolationException.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyViolationException.java Fri Mar 8 20:13:48 2013
@@ -28,6 +28,8 @@ import org.apache.wss4j.policy.WSSPolicy
*/
public class PolicyViolationException extends WSSPolicyException {
+ private static final long serialVersionUID = 4162351775688661849L;
+
public PolicyViolationException(String message) {
super(message);
}
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AbstractPolicyTestBase.java Fri Mar 8 20:13:48 2013
@@ -33,7 +33,6 @@ import org.apache.wss4j.stax.impl.securi
import org.apache.wss4j.stax.test.AbstractTestBase;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
-import org.opensaml.common.SAMLVersion;
import org.testng.annotations.BeforeClass;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -50,7 +49,6 @@ import java.io.InputStreamReader;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -76,7 +74,7 @@ public class AbstractPolicyTestBase exte
}
protected PolicyEnforcer buildAndStartPolicyEngine(
- String policyString, boolean replacePolicyElement, List<AssertionBuilder> customAssertionBuilders)
+ String policyString, boolean replacePolicyElement, List<AssertionBuilder<Element>> customAssertionBuilders)
throws ParserConfigurationException, SAXException, IOException, WSSPolicyException {
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java Fri Mar 8 20:13:48 2013
@@ -35,6 +35,9 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
import java.util.ArrayList;
import java.util.List;
@@ -252,7 +255,7 @@ public class AlgorithmSuiteTest extends
}
}
- List<AssertionBuilder> customAssertionBuilders = new ArrayList<AssertionBuilder>();
+ List<AssertionBuilder<Element>> customAssertionBuilders = new ArrayList<AssertionBuilder<Element>>();
customAssertionBuilders.add(new GCMAlgorithmSuiteBuilder());
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString, false, customAssertionBuilders);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java Fri Mar 8 20:13:48 2013
@@ -22,7 +22,6 @@ import org.apache.wss4j.common.ext.WSSec
import org.apache.wss4j.policy.stax.PolicyEnforcer;
import org.apache.wss4j.policy.stax.PolicyViolationException;
import org.apache.wss4j.stax.ext.WSSConstants;
-import org.apache.wss4j.stax.ext.WSSecurityContext;
import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityToken;
import org.apache.wss4j.stax.securityEvent.OperationSecurityEvent;
import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConfigurationException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConfigurationException.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConfigurationException.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConfigurationException.java Fri Mar 8 20:13:48 2013
@@ -28,6 +28,8 @@ import org.apache.wss4j.common.ext.WSSec
*/
public class WSSConfigurationException extends WSSecurityException {
+ private static final long serialVersionUID = 689628294822027113L;
+
public WSSConfigurationException(ErrorCode errorCode, String msgId, Throwable exception, Object ... args) {
super(errorCode, msgId, exception, args);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java Fri Mar 8 20:13:48 2013
@@ -380,7 +380,7 @@ public class SAMLTokenInputHandler exten
}
if (object instanceof JAXBElement) {
- object = ((JAXBElement) object).getValue();
+ object = ((JAXBElement<?>) object).getValue();
}
KeyInfoType keyInfoType = null;
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=1454526&r1=1454525&r2=1454526&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 Fri Mar 8 20:13:48 2013
@@ -28,7 +28,6 @@ import org.apache.wss4j.common.util.XMLU
import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSSConfig;
import org.apache.wss4j.dom.WSSecurityEngineResult;
-import org.apache.wss4j.dom.WsuIdAllocator;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandler;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
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=1454526&r1=1454525&r2=1454526&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 Fri Mar 8 20:13:48 2013
@@ -20,8 +20,6 @@ package org.apache.wss4j.stax.test;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
-import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
-import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
import org.apache.wss4j.common.bsp.BSPRule;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.WSSec;
@@ -1408,6 +1406,7 @@ public class EncDecryptionTest extends A
}
@Test
+ @SuppressWarnings("unchecked")
public void testCompressedEncDecryption() throws Exception {
Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java Fri Mar 8 20:13:48 2013
@@ -20,11 +20,9 @@ package org.apache.wss4j.stax.test;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLKeyInfo;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
import org.apache.wss4j.common.saml.bean.SubjectBean;
import org.apache.wss4j.stax.ext.WSSConstants;
-import org.apache.wss4j.stax.ext.WSSecurityContext;
import org.apache.wss4j.stax.impl.InboundWSSecurityContextImpl;
import org.apache.wss4j.stax.impl.securityToken.SAMLSecurityToken;
import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityToken;
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceMemoryTest.java Fri Mar 8 20:13:48 2013
@@ -353,6 +353,7 @@ public class PerformanceMemoryTest exten
}
inputStream.close();
}
+ fileOutputStream.close();
fileWriter = new FileWriter(target, true);
fileWriter.write("</test></env:Body>\n" +
"</env:Envelope>");
@@ -423,7 +424,6 @@ public class PerformanceMemoryTest exten
private ThreadStopper threadStopper;
private FileWriter fileWriter;
private long memoryDiff = 0;
- private Thread parentThread;
private List<Integer> memory = new LinkedList<Integer>();
@@ -431,7 +431,6 @@ public class PerformanceMemoryTest exten
this.threadStopper = threadStopper;
this.fileWriter = fileWriter;
this.memoryDiff = memoryDiff;
- this.parentThread = Thread.currentThread();
}
@Override
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceTimingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceTimingTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceTimingTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PerformanceTimingTest.java Fri Mar 8 20:13:48 2013
@@ -272,6 +272,7 @@ public class PerformanceTimingTest exten
}
inputStream.close();
}
+ fileOutputStream.close();
fileWriter = new FileWriter(target, true);
fileWriter.write("</test></env:Body>\n" +
"</env:Envelope>");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureCRLTest.java Fri Mar 8 20:13:48 2013
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.util.Enumeration;
import java.util.Map;
import java.util.Properties;
-import java.util.UUID;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerException;
@@ -32,8 +31,6 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.dom.WSSConfig;
-import org.apache.wss4j.dom.WsuIdAllocator;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.stax.WSSec;
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=1454526&r1=1454525&r2=1454526&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 Fri Mar 8 20:13:48 2013
@@ -944,7 +944,7 @@ public class SignatureTest extends Abstr
};
final TestSecurityEventListener securityEventListener = new TestSecurityEventListener(expectedSecurityEvents);
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())), null, securityEventListener);
- Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
securityEventListener.compare();
@@ -1029,6 +1029,7 @@ public class SignatureTest extends Abstr
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ Assert.assertNotNull(document);
}
}
@@ -1085,6 +1086,7 @@ public class SignatureTest extends Abstr
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ Assert.assertNotNull(document);
}
}
@@ -1114,7 +1116,8 @@ public class SignatureTest extends Abstr
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
- Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ Assert.fail("Should have thrown XMLStreamException");
} catch (XMLStreamException e) {
Assert.assertTrue(e.getCause() instanceof WSSecurityException);
Assert.assertEquals(e.getCause().getMessage(), "cvc-datatype-valid.1.2.1: 'abc' is not a valid value for 'integer'.");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java Fri Mar 8 20:13:48 2013
@@ -28,7 +28,6 @@ import org.apache.wss4j.stax.ext.Inbound
import org.apache.wss4j.stax.ext.WSSConstants;
import org.apache.wss4j.stax.ext.WSSSecurityProperties;
import org.apache.wss4j.stax.test.utils.StAX2DOM;
-import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.config.TransformerAlgorithmMapper;
import org.testng.Assert;
@@ -332,7 +331,7 @@ public class VulnerabliltyVectorsTest ex
securityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
try {
- Document document = doInboundSecurity(securityProperties,
+ doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -367,7 +366,7 @@ public class VulnerabliltyVectorsTest ex
try {
Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
oldval = changeValueOfMaximumAllowedTransformsPerReference(0);
- Document document = doInboundSecurity(securityProperties,
+ doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -404,7 +403,7 @@ public class VulnerabliltyVectorsTest ex
inboundsecurityProperties.addIgnoreBSPRule(BSPRule.R5421);
try {
- Document document = doInboundSecurity(inboundsecurityProperties,
+ doInboundSecurity(inboundsecurityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -451,6 +450,7 @@ public class VulnerabliltyVectorsTest ex
Document document = doInboundSecurity(inboundsecurityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
+ Assert.assertNotNull(document);
} finally {
switchAllowMD5Algorithm(false);
}
@@ -484,7 +484,7 @@ public class VulnerabliltyVectorsTest ex
try {
Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
oldval = changeValueOfMaximumAllowedXMLStructureDepth(10);
- Document document = doInboundSecurity(securityProperties,
+ doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -525,7 +525,7 @@ public class VulnerabliltyVectorsTest ex
try {
Init.init(WSSec.class.getClassLoader().getResource("wss/wss-config.xml").toURI());
oldval = changeValueOfMaximumAllowedXMLStructureDepth(10);
- Document document = doInboundSecurity(securityProperties,
+ doInboundSecurity(securityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -541,6 +541,7 @@ public class VulnerabliltyVectorsTest ex
}
@Test
+ @SuppressWarnings("unchecked")
public void testMaximumAllowedDecompressedBytes() throws Exception {
long oldval = 0;
@@ -575,7 +576,7 @@ public class VulnerabliltyVectorsTest ex
inboundSecurityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
inboundSecurityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- Document document = doInboundSecurity(inboundSecurityProperties,
+ doInboundSecurity(inboundSecurityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -624,7 +625,7 @@ public class VulnerabliltyVectorsTest ex
inboundsecurityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
try {
- Document document = doInboundSecurity(inboundsecurityProperties,
+ doInboundSecurity(inboundsecurityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
@@ -659,7 +660,7 @@ public class VulnerabliltyVectorsTest ex
inboundsecurityProperties.addIgnoreBSPRule(BSPRule.R5421);
try {
- Document document = doInboundSecurity(inboundsecurityProperties,
+ doInboundSecurity(inboundsecurityProperties,
xmlInputFactory.createXMLStreamReader(
new ByteArrayInputStream(baos.toByteArray())));
Assert.fail("Expected XMLStreamException");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java?rev=1454526&r1=1454525&r2=1454526&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java Fri Mar 8 20:13:48 2013
@@ -159,6 +159,7 @@ public class SamlConditionsTest extends
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ Assert.assertNotNull(document);
}
}
@@ -199,7 +200,7 @@ public class SamlConditionsTest extends
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
- Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("XMLStreamException expected");
} catch (XMLStreamException e) {
Assert.assertNotNull(e.getCause());
@@ -245,7 +246,7 @@ public class SamlConditionsTest extends
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
try {
- Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
Assert.fail("XMLStreamException expected");
} catch (XMLStreamException e) {
Assert.assertNotNull(e.getCause());
@@ -290,6 +291,7 @@ public class SamlConditionsTest extends
XMLStreamReader xmlStreamReader = wsSecIn.processInMessage(xmlInputFactory.createXMLStreamReader(new ByteArrayInputStream(baos.toByteArray())));
Document document = StAX2DOM.readDoc(documentBuilderFactory.newDocumentBuilder(), xmlStreamReader);
+ Assert.assertNotNull(document);
}
}
}