Skip to content

Commit

Permalink
Fixed potentially wrong response Content-Type in MIME encoded responses
Browse files Browse the repository at this point in the history
  • Loading branch information
@phax
phax committed Feb 18, 2025
1 parent fd012c5 commit 162c36c
Showing 1 changed file with 82 additions and 21 deletions.
103 changes: 82 additions & 21 deletions phase4-lib/src/main/java/com/helger/phase4/incoming/AS4RequestHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@
import com.helger.commons.collection.impl.ICommonsList;
import com.helger.commons.debug.GlobalDebug;
import com.helger.commons.http.CHttp;
import com.helger.commons.http.CHttpHeader;
import com.helger.commons.http.HttpHeaderMap;
import com.helger.commons.io.IHasInputStream;
import com.helger.commons.io.stream.HasInputStream;
import com.helger.commons.io.stream.NonBlockingByteArrayOutputStream;
import com.helger.commons.io.stream.StreamHelper;
import com.helger.commons.mime.EMimeContentType;
import com.helger.commons.mime.IMimeType;
import com.helger.commons.mime.MimeTypeParser;
import com.helger.commons.state.ISuccessIndicator;
import com.helger.commons.string.StringHelper;
import com.helger.httpclient.response.ResponseHandlerXml;
Expand Down Expand Up @@ -257,7 +259,12 @@ public void applyToResponse (@Nonnull final IAS4ResponseAbstraction aHttpRespons
}
});
aHttpResponse.setContent (m_aHttpHeaders, aContent);
aHttpResponse.setMimeType (MT_MULTIPART_RELATED);

// If the response HTTP headers already contain the "Content-Type" than
// use it. Otherwise the "boundary" parameters will be lost
final String sContentType = m_aHttpHeaders.getFirstHeaderValue (CHttpHeader.CONTENT_TYPE);
final IMimeType aMimeType = MimeTypeParser.safeParseMimeType (sContentType);
aHttpResponse.setMimeType (aMimeType != null ? aMimeType : MT_MULTIPART_RELATED);

if (aOutgoingDumper != null)
{
Expand Down Expand Up @@ -848,8 +855,9 @@ private void _invokeSPIsForIncoming (@Nonnull final HttpHeaderMap aHttpHeaders,
"Only one of User OR Signal Message may be present");

final boolean bIsUserMessage = aEbmsUserMessage != null;
final String sMessageID = bIsUserMessage ? aEbmsUserMessage.getMessageInfo ().getMessageId ()
: aEbmsSignalMessage.getMessageInfo ().getMessageId ();
final String sMessageID = bIsUserMessage ? aEbmsUserMessage.getMessageInfo ().getMessageId () : aEbmsSignalMessage
.getMessageInfo ()
.getMessageId ();

// Get all processors
final ICommonsList <IAS4IncomingMessageProcessorSPI> aAllProcessors = m_aProcessorSupplier.get ();
Expand Down Expand Up @@ -1084,8 +1092,8 @@ private void _invokeSPIsForResponse (@Nonnull final IAS4IncomingMessageState aIn
byte [] aResponsePayload = null;
if (aResponseFactory != null)
{
final HttpEntity aRealHttpEntity = aHttpEntity != null ? aHttpEntity
: aResponseFactory.getHttpEntityForSending (aMimeType);
final HttpEntity aRealHttpEntity = aHttpEntity != null ? aHttpEntity : aResponseFactory.getHttpEntityForSending (
aMimeType);
if (aRealHttpEntity.isRepeatable ())
{
int nContentLength = (int) aRealHttpEntity.getContentLength ();
Expand Down Expand Up @@ -1364,8 +1372,7 @@ private IAS4ResponseFactory _createResponseReceiptMessage (@Nonnull final IAS4In
aUserMessage,
aSoapDocument,
_isSendNonRepudiationInformation (aEffectiveLeg),
null)
.setMustUnderstand (true);
null).setMustUnderstand (true);

final ESoapVersion eResponseSoapVersion = aEffectiveLeg.getProtocol ().getSoapVersion ();
if (eResponseSoapVersion != eSoapVersion)
Expand All @@ -1384,6 +1391,23 @@ private IAS4ResponseFactory _createResponseReceiptMessage (@Nonnull final IAS4In
eResponseSoapVersion,
aReceiptMessage.getMessagingID ());

if (false)
{
// This is just demo code, to show how to squeeze an AS4 Receipt into a
// MIME message
try
{
final AS4MimeMessage aMimeMsg = AS4MimeMessageHelper.generateMimeMessage (eSoapVersion,
aSignedDoc,
aResponseAttachments);
return new AS4ResponseFactoryMIME (m_aMessageMetadata, aIncomingState, sResponseMessageID, aMimeMsg);
}
catch (final MessagingException ex)
{
// fall through
}
}

// Return the signed receipt
return new AS4ResponseFactoryXML (m_aMessageMetadata,
aIncomingState,
Expand Down Expand Up @@ -1453,6 +1477,24 @@ private IAS4ResponseFactory _createResponseErrorMessage (@Nonnull final IAS4Inco
LOGGER.debug ("Cannot sign AS4 Error response, because no PMode Leg was provided");
}

if (false)
{
// This is just demo code, to show how to squeeze an AS4 Error into a MIME
// message
try
{
final ICommonsList <WSS4JAttachment> aResponseAttachments = null;
final AS4MimeMessage aMimeMsg = AS4MimeMessageHelper.generateMimeMessage (eSoapVersion,
aResponseDoc,
aResponseAttachments);
return new AS4ResponseFactoryMIME (m_aMessageMetadata, aIncomingState, sResponseMessageID, aMimeMsg);
}
catch (final MessagingException ex)
{
// fall through
}
}

return new AS4ResponseFactoryXML (m_aMessageMetadata,
aIncomingState,
sResponseMessageID,
Expand Down Expand Up @@ -1486,6 +1528,7 @@ private AS4MimeMessage _createMimeMessageForResponse (@Nonnull final Document aR
final AS4MimeMessage aMimeMsg;
if (aCryptParms.isCryptEnabled (LOGGER::warn))
{
// Encryption is enabled
if (aResponseAttachments.isNotEmpty ())
{
final boolean bMustUnderstand = true;
Expand All @@ -1505,6 +1548,7 @@ private AS4MimeMessage _createMimeMessageForResponse (@Nonnull final Document aR
}
else
{
// Encryption is not enabled
aMimeMsg = AS4MimeMessageHelper.generateMimeMessage (eSoapVersion, aResponseDoc, aResponseAttachments);
}
if (aMimeMsg == null)
Expand Down Expand Up @@ -1573,6 +1617,32 @@ private IAS4ResponseFactory _createResponseUserMessage (@Nonnull final IAS4Incom
return ret;
}

/**
* This message is called, independent if the source message was sent as a
* MIME message or as a SOAP message.
*
* @param aHttpHeaders
* The HTTP headers used. Never <code>null</code>.
* @param aSoapDocument
* The SOAP XML document retrieved. Never <code>null</code>.
* @param eSoapVersion
* The SOAP version used. Never <code>null</code>.
* @param aIncomingAttachments
* A list of additional attachments submitted together with the SOAP
* message. This list MUST be empty when a SOAP message was received,
* and MAY contain something when a MIME message was received. Never
* <code>null</code>.
* @param aEbmsErrorMessagesTarget
* The list of EBMS error messages to be filled from within. Never
* <code>null</code>.
* @return The processing result producer - may be <code>null</code>.
* @throws WSSecurityException
* On message encryption / signature issues.
* @throws MessagingException
* On MIME issues.
* @throws Phase4Exception
* On phase4 issues.
*/
@Nullable
private IAS4ResponseFactory _handleSoapMessage (@Nonnull final HttpHeaderMap aHttpHeaders,
@Nonnull final Document aSoapDocument,
Expand Down Expand Up @@ -1813,10 +1883,9 @@ private IAS4ResponseFactory _handleSoapMessage (@Nonnull final HttpHeaderMap aHt
sResponseMessageID);

// invoke client with new document
final BasicHttpPoster aSender = new BasicHttpPoster ();
final Document aAsyncResponse;
if (true)
{
final BasicHttpPoster aSender = new BasicHttpPoster ();
final HttpHeaderMap aResponseHttpHeaders = null;
// TODO make async send parameters customizable
final HttpRetrySettings aRetrySettings = new HttpRetrySettings ();
Expand All @@ -1829,17 +1898,9 @@ private IAS4ResponseFactory _handleSoapMessage (@Nonnull final HttpHeaderMap aHt
m_aOutgoingDumper,
m_aRetryCallback);
}
else
{
aAsyncResponse = aSender.sendGenericMessage (sAsyncResponseURL,
null,
aHttpEntity,
new ResponseHandlerXml ());
}
AS4HttpDebug.debug ( () -> "SEND-RESPONSE [async sent] received: " +
(aAsyncResponse == null ? "null"
: XMLWriter.getNodeAsString (aAsyncResponse,
AS4HttpDebug.getDebugXMLWriterSettings ())));
(aAsyncResponse == null ? "null" : XMLWriter.getNodeAsString (aAsyncResponse,
AS4HttpDebug.getDebugXMLWriterSettings ())));
};

final CompletableFuture <Void> aFuture = PhotonWorkerPool.getInstance ()
Expand Down Expand Up @@ -2057,8 +2118,8 @@ public void handleRequest (@Nonnull @WillClose final InputStream aRequestInputSt
if (aResponder != null)
{
// Response present -> send back
final IAS4OutgoingDumper aRealOutgoingDumper = m_aOutgoingDumper != null ? m_aOutgoingDumper
: AS4DumpManager.getOutgoingDumper ();
final IAS4OutgoingDumper aRealOutgoingDumper = m_aOutgoingDumper != null ? m_aOutgoingDumper : AS4DumpManager
.getOutgoingDumper ();
aResponder.applyToResponse (aHttpResponse, aRealOutgoingDumper);
}
else
Expand Down

0 comments on commit 162c36c

Please sign in to comment.