Added fix for issue OxalisCommunity#143

BuddhimaSan · Sep 21, 2021 · 38a5316 · 38a5316
1 parent 500b1d2
commit 38a5316
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java b/src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java
@@ -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);
 
@@ -166,6 +167,20 @@ public SOAPMessage handle(SOAPMessage request, MessageContext messageContext) th
         return response;
     }
 
+    private void validateUserMessage(UserMessage userMessage) throws OxalisAs4Exception {
+        if (userMessage.getMessageInfo() ==  null){
+            throw new OxalisAs4Exception("Error processing User Message. Message information not found");
+        }else if (userMessage.getCollaborationInfo() == null){
+            throw new OxalisAs4Exception("Error processing User Message. Collaboration information not found");
+        }else if (userMessage.getPartyInfo() == null){
+            throw new OxalisAs4Exception("Error processing User Message. Party information not found");
+        }else if (userMessage.getMessageProperties() == null){
+            throw new OxalisAs4Exception("Error processing User Message. Message properties not found");
+        }else if (userMessage.getPayloadInfo() ==  null){
+            throw new OxalisAs4Exception("Error processing User Message. Payload information not found");
+        }
+    }
+
     private X509Certificate getSenderCertificate(SOAPHeader soapHeader) {
         try {
             return SOAPHeaderParser.getSenderCertificate(soapHeader);