From 26eb6e489cf5c0ec62c74d2a8926ec44244b22bc Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Fri, 23 Jun 2023 09:58:15 +0200
Subject: [PATCH 1/2] fix: prevent errors from causing errors

- An error had the chance of causing a "Content not allowed in prolog" error. This has been prevented with IsXML checks.
---
 .../Configuration_WebformulierenVerwerker.xml | 99 ++++++++++++++++---
 1 file changed, 88 insertions(+), 11 deletions(-)

diff --git a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
index 140af98..87a6f34 100644
--- a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
+++ b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
@@ -93,6 +93,13 @@
                 <Forward name="exception" path="buildErrorMsg1" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsConnectErrorXML">
+                <Forward name="then" path="buildErrorMsg1" />
+                <Forward name="else" path="ConnectError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="ConnectError2XML"/>
+
             <XsltPipe name="buildErrorMsg1"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -122,10 +129,17 @@
 
             <SenderPipe name="sendQueryToCorsa">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/QueryExecute" soap="false" />
-                <Forward name="success" path="UnwrapQueryResponse" />
-                <Forward name="exception" path="buildQueryErrorMsg" />
+                <Forward name="success" path="IsQueryExecuteErrorXML" />
+                <Forward name="exception" path="IsQueryExecuteErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsQueryExecuteErrorXML">
+                <Forward name="then" path="buildQueryErrorMsg" />
+                <Forward name="else" path="QueryExecuteError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="QueryExecuteError2XML"/>
+
             <XsltPipe name="buildQueryErrorMsg"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -164,9 +178,16 @@
                 <WebServiceSender methodType="POST" url="${corsa.url}"
                     soapAction="http://bct.nl/CreateMetaPerson" soap="false" />
                 <Forward name="success" path="Unwrapper2" />
-                <Forward name="exception" path="buildErrorMsg2" />
+                <Forward name="exception" path="IsCreatePersonErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsCreatePersonErrorXML">
+                <Forward name="then" path="buildErrorMsg2" />
+                <Forward name="else" path="CreatePersonError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="CreatePersonError2XML"/>
+
             <XsltPipe name="buildErrorMsg2"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -199,8 +220,15 @@
             <SenderPipe name="sendToCorsa3">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateMetaDocument" soap="false" />
                 <Forward name="success" path="UnwrapAndStoreDocumentDetails" />
-                <Forward name="exception" path="buildErrorMsg3" />
+                <Forward name="exception" path="IsCreateMetaDocumentErrorXML" />
             </SenderPipe>
+
+            <IsXmlIfPipe name="IsCreateMetaDocumentErrorXML">
+                <Forward name="then" path="buildErrorMsg3" />
+                <Forward name="else" path="CreateMetaDocumentError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="CreateMetaDocumentError2XML"/>
             
             <XsltPipe name="buildErrorMsg3"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
@@ -228,9 +256,16 @@
             <SenderPipe name="sendToCorsa4">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateFileVersion" soap="false" />
                 <Forward name="success" path="RemoveXMLDeclaration" />
-                <Forward name="exception" path="buildErrorMsg4" />
+                <Forward name="exception" path="IsCreateFileVersionErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsCreateFileVersionErrorXML">
+                <Forward name="then" path="buildErrorMsg4" />
+                <Forward name="else" path="CreateFileVersionError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="CreateFileVersionError2XML"/>
+
             <XsltPipe name="buildErrorMsg4"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -250,9 +285,16 @@
             <SenderPipe name="SendDisconnectRequest">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Disconnect" soap="false" />
                 <Forward name="success" path="UnwrapDisconnectResponse" />
-                <Forward name="exception" path="buildErrorMsg1" />
+                <Forward name="exception" path="IsDisconnectErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsDisconnectErrorXML">
+                <Forward name="then" path="buildDisconnectErrorMsg" />
+                <Forward name="else" path="DisconnectError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="DisconnectError2XML"/>
+
             <XsltPipe name="buildDisconnectErrorMsg"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -295,9 +337,16 @@
             <SenderPipe name="sendToCorsa1">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Connect" soap="false" />
                 <Forward name="success" path="Unwrapper1" />
-                <Forward name="exception" path="buildErrorMsg1" />
+                <Forward name="exception" path="IsConnectErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsConnectErrorXML">
+                <Forward name="then" path="buildErrorMsg1" />
+                <Forward name="else" path="ConnectError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="ConnectError2XML"/>
+
             <XsltPipe name="buildErrorMsg1"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -327,9 +376,16 @@
             <SenderPipe name="sendToCorsa5">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateMetaDocument" soap="false" />
                 <Forward name="success" path="Wrapper5" />
-                <Forward name="exception" path="buildErrorMsg5" />
+                <Forward name="exception" path="IsCreateMetaDocumentErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsCreateMetaDocumentErrorXML">
+                <Forward name="then" path="buildErrorMsg5" />
+                <Forward name="else" path="CreateMetaDocumentError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="CreateMetaDocumentError2XML"/>
+
             <XsltPipe name="buildErrorMsg5"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />
@@ -362,8 +418,15 @@
                 <Forward name="exception" path="buildErrorMsg6" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsFileVersionErrorXML">
+                <Forward name="then" path="buildErrorMsg6" />
+                <Forward name="else" path="FileVersionError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="FileVersionError2XML"/>
+
             <XsltPipe name="buildErrorMsg6"
-                styleSheetName="xsl/ParseNegativeHttpResult.xsl">
+                styleSheetName="xsl/ParseNegativeHttpResult.xsl" > 
                 <Forward name="success" path="EXCEPTION" />
             </XsltPipe>
 
@@ -385,8 +448,15 @@
             <SenderPipe name="sendToCorsa7">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/ModObjectRelation" soap="false" />
                 <Forward name="success" path="ConvertToBijlageResponse" />
-                <Forward name="exception" path="buildErrorMsg7" />
+                <Forward name="exception" path="IsModObjectRelationErrorXML" />
             </SenderPipe>
+
+            <IsXmlIfPipe name="IsModObjectRelationErrorXML">
+                <Forward name="then" path="buildErrorMsg7" />
+                <Forward name="else" path="ModObjectRelationError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="ModObjectRelationError2XML"/>
             
             <XsltPipe name="buildErrorMsg7"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
@@ -411,9 +481,16 @@
             <SenderPipe name="SendDisconnectRequest">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Disconnect" soap="false" />
                 <Forward name="success" path="UnwrapDisconnectResponse" />
-                <Forward name="exception" path="buildErrorMsg1" />
+                <Forward name="exception" path="IsDisconnectErrorXML" />
             </SenderPipe>
 
+            <IsXmlIfPipe name="IsDisconnectErrorXML">
+                <Forward name="then" path="buildDisconnectErrorMsg" />
+                <Forward name="else" path="DisconnectError2XML" />
+            </IsXmlIfPipe>
+
+            <Text2XmlPipe xmlTag="errorMessage" name="DisconnectError2XML"/>
+
             <XsltPipe name="buildDisconnectErrorMsg"
                 styleSheetName="xsl/ParseNegativeHttpResult.xsl">
                 <Forward name="success" path="EXCEPTION" />

From 2b9c2f6bcad7a189acc2ad22a690eddd05de9986 Mon Sep 17 00:00:00 2001
From: DelanoWAF <Delano@Wearefrank.nl>
Date: Fri, 23 Jun 2023 09:58:42 +0200
Subject: [PATCH 2/2] feat: add additional information to error response

---
 .../WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl b/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
index 8c872eb..397d179 100644
--- a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
+++ b/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
@@ -27,12 +27,15 @@
                 </xsl:when>
                 <xsl:otherwise>
                     <code>ServerError</code>
-                    <reason>Some negative response </reason>
+                    <reason>An unknown error occurred </reason>
                 </xsl:otherwise>
             </xsl:choose>
             <details>
                 <xsl:value-of select="concat(/root/code, ' ', /root/title, ' ', /root/status, ' ', /root/detail)" />
             </details>
+            <response>
+                <xsl:value-of select="/"/>
+            </response>
         </error>
     </xsl:template>
 </xsl:stylesheet>