Author: ema
Date: Tue Apr 19 08:51:39 2011
New Revision: 1094935
URL: http://svn.apache.org/viewvc?rev=1094935&view=rev
Log:
Merged revisions 1094926 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1094926 | ema | 2011-04-19 16:40:09 +0800 (Tue, 19 Apr 2011) | 1 line
[CXF-3456]:Fix WSA implementation does not throw wsa:InvalidCardinality
exception when there is a greater than expected number of the specified header
........
Added:
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/duplicate-wsa-header-msg.xml
- copied unchanged from r1094926,
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/duplicate-wsa-header-msg.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Names.java
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/Messages.properties
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAClientServerTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1094926
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=1094935&r1=1094934&r2=1094935&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Tue Apr 19 08:51:39 2011
@@ -1250,6 +1250,10 @@ public class MAPAggregator extends Abstr
valid = false;
}
+ if
(Names.INVALID_CARDINALITY_NAME.equals(ContextUtils.retrieveMAPFaultName(message)))
{
+ valid = false;
+ }
+
return valid;
}
}
Modified:
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Names.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Names.java?rev=1094935&r1=1094934&r2=1094935&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Names.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/Names.java
Tue Apr 19 08:51:39 2011
@@ -171,6 +171,10 @@ public final class Names {
public static final QName ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_QNAME =
new QName(WSA_NAMESPACE_NAME,
ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_NAME);
+ public static final String INVALID_CARDINALITY_NAME = "InvalidCardinality";
+ public static final QName INVALID_CARDINALITY_QNAME = new
QName(WSA_NAMESPACE_NAME,
+
INVALID_CARDINALITY_NAME);
+
public static final String SOAP11HTTP_ADDRESSING_BINDING =
"http://schemas.xmlsoap.org/soap/envelope/?addressing=ms";;
public static final String SOAP12HTTP_ADDRESSING_BINDING =
Modified:
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=1094935&r1=1094934&r2=1094935&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Tue Apr 19 08:51:39 2011
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
@@ -76,6 +77,7 @@ public class MAPCodec extends AbstractSo
private static final Logger LOG = LogUtils.getL7dLogger(MAPCodec.class);
private static final String IS_REFERENCE_PARAM_ATTR_NAME =
"IsReferenceParameter";
+ private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
private static final String ONE_WAY_DECOUPLED_FAULT_SUPPORT =
"org.apache.cxf.ws.addressing.oneway.decoupled_fault_support";
@@ -495,7 +497,7 @@ public class MAPCodec extends AbstractSo
LOG.log(Level.FINE, "Inbound WS-Addressing headers");
Unmarshaller unmarshaller = null;
Set<Element> referenceParameterHeaders = null;
-
+ QName invalidCardinalityQName = null;
Iterator<Header> iter = header.iterator();
while (iter.hasNext()) {
Header hdr = iter.next();
@@ -518,12 +520,15 @@ public class MAPCodec extends AbstractSo
}
String localName = headerElement.getLocalName();
if (Names.WSA_MESSAGEID_NAME.equals(localName)) {
+ invalidCardinalityQName = maps.getMessageID()
!= null
+ ? Names.WSA_MESSAGEID_QNAME : null;
maps.setMessageID(decodeAsNative(
headerURI,
AttributedURIType.class,
headerElement,
unmarshaller));
} else if (Names.WSA_TO_NAME.equals(localName)) {
+ invalidCardinalityQName = maps.getTo() != null
? Names.WSA_TO_QNAME : null;
AttributedURIType addr = decodeAsNative(
headerURI,
AttributedURIType.class,
@@ -531,18 +536,26 @@ public class MAPCodec extends AbstractSo
unmarshaller);
maps.setTo(EndpointReferenceUtils.getEndpointReference(addr));
} else if (Names.WSA_FROM_NAME.equals(localName)) {
+ invalidCardinalityQName = maps.getFrom() !=
null
+ ? Names.WSA_FROM_QNAME : null;
maps.setFrom(decodeAsNative(
headerURI,
EndpointReferenceType.class,
headerElement,
unmarshaller));
} else if
(Names.WSA_REPLYTO_NAME.equals(localName)) {
+ invalidCardinalityQName = maps.getReplyTo() !=
null
+ ?
Names.WSA_REPLYTO_QNAME : null;
+
maps.setReplyTo(decodeAsNative(
headerURI,
EndpointReferenceType.class,
headerElement,
unmarshaller));
} else if
(Names.WSA_FAULTTO_NAME.equals(localName)) {
+ invalidCardinalityQName = maps.getFaultTo() !=
null
+ ? Names.WSA_FAULTTO_QNAME : null;
+
maps.setFaultTo(decodeAsNative(
headerURI,
EndpointReferenceType.class,
@@ -555,6 +568,8 @@ public class MAPCodec extends AbstractSo
headerElement,
unmarshaller));
} else if
(Names.WSA_ACTION_NAME.equals(localName)) {
+ invalidCardinalityQName = maps.getAction() !=
null
+ ? Names.WSA_ACTION_QNAME : null;
maps.setAction(decodeAsNative(
headerURI,
AttributedURIType.class,
@@ -576,13 +591,24 @@ public class MAPCodec extends AbstractSo
if (null != referenceParameterHeaders && null != maps) {
decodeReferenceParameters(referenceParameterHeaders, maps,
unmarshaller);
}
+ if (invalidCardinalityQName != null) {
+ storeInvalidCardinalityFault(message,
invalidCardinalityQName);
+ }
+
}
} catch (JAXBException je) {
LOG.log(Level.WARNING, "SOAP_HEADER_DECODE_FAILURE_MSG", je);
}
return maps;
}
-
+
+ private void storeInvalidCardinalityFault(SoapMessage message, QName
wsaHeaderName) {
+ LOG.log(Level.WARNING, "INVALID_CARDINALITY_MESSAGE", wsaHeaderName);
+ String reason =
BUNDLE.getString("INVALID_ADDRESSING_PROPERTY_MESSAGE");
+ ContextUtils.storeMAPFaultName(Names.INVALID_CARDINALITY_NAME,
message);
+ ContextUtils.storeMAPFaultReason(reason, message);
+ }
+
private void decodeReferenceParameters(Set<Element>
referenceParameterHeaders,
AddressingPropertiesImpl maps,
Unmarshaller unmarshaller)
Modified:
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/Messages.properties?rev=1094935&r1=1094934&r2=1094935&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/Messages.properties
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/Messages.properties
Tue Apr 19 08:51:39 2011
@@ -24,3 +24,5 @@ UNSUPPORTED_VERSION_MSG = Unsupported WS
IGNORE_NON_ELEMENT_REF_PARAM_MSG = Ignoring reference parameter {0} because it
is not a JAXBElement
CORRELATION_FAILURE_MSG = Failed to correlate message, aborting dispatch.
RESPONSE_NOT_USING_WSADDRESSING = Response message does not contain
WS-Addressing properties. Not correlating response.
+INVALID_CARDINALITY_MESSAGE = Duplicate WS-Addressing header {0}
+INVALID_ADDRESSING_PROPERTY_MESSAGE = A header representing a Message
Addressing Property is not valid and the message cannot be processed
Modified:
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAClientServerTest.java?rev=1094935&r1=1094934&r2=1094935&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAClientServerTest.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/WSAClientServerTest.java
Tue Apr 19 08:51:39 2011
@@ -19,11 +19,20 @@
package org.apache.cxf.systest.ws.addr_feature;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.soap.SOAPFaultException;
+import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.systest.ws.AbstractWSATestBase;
import org.apache.cxf.ws.addressing.WSAddressingFeature;
@@ -101,7 +110,39 @@ public class WSAClientServerTest extends
assertTrue(output.toString().indexOf(expectedOut) != -1);
assertTrue(input.toString().indexOf(expectedIn) != -1);
}
+
+ //CXF-3456
+ @Test
+ public void testDuplicateHeaders() throws Exception {
+ URL wsdl =
getClass().getResource("/wsdl_systest_wsspec/add_numbers.wsdl");
+ assertNotNull("WSDL is null", wsdl);
+ AddNumbersService service = new AddNumbersService(wsdl, serviceName);
+ QName portName = new
QName("http://apache.org/cxf/systest/ws/addr_feature/";, "AddNumbersPort");
+ Dispatch<SOAPMessage> disp = service.createDispatch(portName,
SOAPMessage.class,
+
Service.Mode.MESSAGE,
+ new
AddressingFeature(false, false));
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + PORT + "/jaxws/add");
+
+ InputStream msgIns =
getClass().getResourceAsStream("./duplicate-wsa-header-msg.xml");
+ String msg = new String(IOUtils.readBytesFromStream(msgIns));
+ msg = msg.replaceAll("$PORT", PORT);
+
+ ByteArrayInputStream bout = new ByteArrayInputStream(msg.getBytes());
+
+ SOAPMessage soapReqMsg =
MessageFactory.newInstance().createMessage(null, bout);
+ assertNotNull(soapReqMsg);
+
+ try {
+ disp.invoke(soapReqMsg);
+ fail("SOAPFaultFxception is expected");
+ } catch (SOAPFaultException ex) {
+ assertTrue("WSA header exception is expected",
+ ex.getMessage().indexOf("A header representing a
Message Addressing") > -1);
+ }
+ }
+
private AddNumbersPortType getPort() throws Exception {
URL wsdl =
getClass().getResource("/wsdl_systest_wsspec/add_numbers.wsdl");
assertNotNull("WSDL is null", wsdl);
