Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue #143 #166

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix for issue #143 #166

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38a5316
Added fix for issue #143
Sep 21, 2021
122d505
Refactored fix for issue #143
Oct 6, 2021
484f59f
Merge branch 'OxalisCommunity:master' into master
BuddhimaSan Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) th
// Organize input data
UserMessage userMessage = SOAPHeaderParser.getUserMessage(soapHeader);

validateUserMessage(userMessage);
As4EnvelopeHeader envelopeHeader = parseAs4EnvelopeHeader(userMessage);
messageContext.put(AS4MessageContextKey.ENVELOPE_HEADER, envelopeHeader);

Expand Down Expand Up @@ -166,6 +167,20 @@ public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) th
return response;
}

private void validateUserMessage(UserMessage userMessage) throws OxalisAs4Exception {

boolean isNull = Stream.of(userMessage.getMessageInfo(),
userMessage.getCollaborationInfo(),
userMessage.getPartyInfo(),
userMessage.getMessageProperties(),
userMessage.getPayloadInfo()).
anyMatch(Objects::isNull);

if(isNull){
throw new OxalisAs4Exception("Error processing User Message. Incomplete Data.");
}
}

private X509Certificate getSenderCertificate(SOAPHeader soapHeader) {
try {
return SOAPHeaderParser.getSenderCertificate(soapHeader);
Expand Down