Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addes setDocument/getDocument to SoapMessage, for use in Wss4jSecurityInterceptor

Browse Source
This commit is contained in:
Arjen Poutsma
2010-09-13 11:48:09 +00:00
parent 9e2a646aed
commit aeee118f96
15 changed files with 408 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
View File

@@ -16,8 +16,6 @@
package org.springframework.ws.soap.security.wss4j;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.Principal;
import java.security.cert.X509Certificate;
@@ -25,20 +23,13 @@ import java.util.Vector;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.xml.soap.MessageFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.ws.context.DefaultMessageContext;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.axiom.AxiomSoapMessage;
import org.springframework.ws.soap.axiom.support.AxiomUtils;
import org.springframework.ws.soap.saaj.SaajSoapMessage;
import org.springframework.ws.soap.saaj.SaajSoapMessageException;
import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
import org.springframework.ws.soap.security.AbstractWsSecurityInterceptor;
import org.springframework.ws.soap.security.WsSecuritySecurementException;
import org.springframework.ws.soap.security.WsSecurityValidationException;
@@ -46,9 +37,6 @@ import org.springframework.ws.soap.security.callback.CallbackHandlerChain;
import org.springframework.ws.soap.security.callback.CleanupCallback;
import org.springframework.ws.soap.security.wss4j.callback.UsernameTokenPrincipalCallback;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
@@ -484,7 +472,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
}
RequestData requestData = initializeRequestData(messageContext);
Document envelopeAsDocument = toDocument(soapMessage, messageContext);
Document envelopeAsDocument = soapMessage.getDocument();
try {
// In case on signature confirmation with no other securement
// action, we need to pass an empty securementActionsVector to avoid
@@ -499,7 +487,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
throw new Wss4jSecuritySecurementException(ex.getMessage(), ex);
}
replaceMessage(soapMessage, envelopeAsDocument);
soapMessage.setDocument(envelopeAsDocument);
}
/** Creates and initializes a request data */
@@ -534,7 +522,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
return;
}
Document envelopeAsDocument = toDocument(soapMessage, messageContext);
Document envelopeAsDocument = soapMessage.getDocument();
// Header processing
@@ -564,7 +552,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
throw new Wss4jSecurityValidationException(ex.getMessage(), ex);
}
replaceMessage(soapMessage, envelopeAsDocument);
soapMessage.setDocument(envelopeAsDocument);
soapMessage.getEnvelope().getHeader().removeHeaderElement(WS_SECURITY_NAME);
}
@@ -649,60 +637,6 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
}
}
/** Converts the given {@link SoapMessage} into a {@link Document}. */
private Document toDocument(SoapMessage soapMessage, MessageContext messageContext) {
if (soapMessage instanceof SaajSoapMessage) {
SaajSoapMessage saajSoapMessage = (SaajSoapMessage) soapMessage;
// return saajSoapMessage.getSaajMessage().getSOAPPart(); // does not work, see SWS-345
Assert.isInstanceOf(DefaultMessageContext.class, messageContext);
DefaultMessageContext defaultMessageContext = (DefaultMessageContext) messageContext;
Assert.isInstanceOf(SaajSoapMessageFactory.class, defaultMessageContext.getMessageFactory());
MessageFactory messageFactory =
((SaajSoapMessageFactory) defaultMessageContext.getMessageFactory()).getMessageFactory();
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
saajSoapMessage.writeTo(bos);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
javax.xml.soap.SOAPMessage saajMessage =
messageFactory.createMessage(saajSoapMessage.getSaajMessage().getMimeHeaders(), bis);
saajSoapMessage.setSaajMessage(saajMessage);
return saajMessage.getSOAPPart();
}
catch (Exception ex) {
throw new SaajSoapMessageException("Could not save changes", ex);
}
}
else if (soapMessage instanceof AxiomSoapMessage) {
AxiomSoapMessage axiomMessage = (AxiomSoapMessage) soapMessage;
return AxiomUtils.toDocument(axiomMessage.getAxiomMessage().getSOAPEnvelope());
}
else {
throw new IllegalArgumentException("Message type not supported [" + soapMessage + "]");
}
}
/**
* Replaces the contents of the given {@link SoapMessage} with that of the document parameter. Only required when
* using Axiom, since the document returned by {@link #toDocument} is live for a {@link SaajSoapMessage}.
*/
private void replaceMessage(SoapMessage soapMessage, Document envelope) {
if (soapMessage instanceof AxiomSoapMessage) {
// construct a new Axiom message with the processed envelope
AxiomSoapMessage axiomMessage = (AxiomSoapMessage) soapMessage;
// save the Soap Action
String soapAction = axiomMessage.getSoapAction();
SOAPEnvelope envelopeFromDOMDocument = AxiomUtils.toEnvelope(envelope);
SOAPFactory factory = (SOAPFactory) axiomMessage.getAxiomMessage().getOMFactory();
SOAPMessage newMessage = factory.createSOAPMessage();
newMessage.setSOAPEnvelope(envelopeFromDOMDocument);
// replace the Axiom message
axiomMessage.setAxiomMessage(newMessage);
// restore the Soap Action
axiomMessage.setSoapAction(soapAction);
}
}
@Override
protected void cleanUp() {
if (validationCallbackHandler != null) {

4
security/src/test/java/org/springframework/ws/soap/security/wss4j/SaajWss4jMessageInterceptorSignTest.java
View File

@@ -53,7 +53,7 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor
interceptor.setSecurementUsername("rsaKey");
SOAPMessage saajMessage = saajSoap11MessageFactory.createMessage();
transformer.transform(new StringSource(PAYLOAD), new DOMResult(saajMessage.getSOAPBody()));
SoapMessage message = new SaajSoapMessage(saajMessage);
SoapMessage message = new SaajSoapMessage(saajMessage, saajSoap11MessageFactory);
MessageContext messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(saajSoap11MessageFactory));
interceptor.secureMessage(message, messageContext);
@@ -74,7 +74,7 @@ public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptor
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
SOAPMessage signed = saajSoap11MessageFactory.createMessage(mimeHeaders, bis);
message = new SaajSoapMessage(signed);
message = new SaajSoapMessage(signed, saajSoap11MessageFactory);
messageContext = new DefaultMessageContext(message, new SaajSoapMessageFactory(saajSoap11MessageFactory));
interceptor.validateMessage(message, messageContext);

4
security/src/test/java/org/springframework/ws/soap/security/wss4j/Wss4jTestCase.java
View File

@@ -125,7 +125,7 @@ public abstract class Wss4jTestCase {
try {
assertTrue("Could not load SAAJ message [" + resource + "]", resource.exists());
is = resource.getInputStream();
return new SaajSoapMessage(saajSoap11MessageFactory.createMessage(mimeHeaders, is));
return new SaajSoapMessage(saajSoap11MessageFactory.createMessage(mimeHeaders, is), saajSoap11MessageFactory);
}
finally {
is.close();
@@ -140,7 +140,7 @@ public abstract class Wss4jTestCase {
try {
assertTrue("Could not load SAAJ message [" + resource + "]", resource.exists());
is = resource.getInputStream();
return new SaajSoapMessage(saajSoap12MessageFactory.createMessage(mimeHeaders, is));
return new SaajSoapMessage(saajSoap12MessageFactory.createMessage(mimeHeaders, is), saajSoap12MessageFactory);
}
finally {
is.close();