From 1d2ea59e4ac79ef964b41b499911255f9e4b024d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20S=C3=B8rensen-Boll?=
 <kristian.sorensen-boll@cgi.com>
Date: Wed, 26 Jan 2022 22:57:50 +0100
Subject: [PATCH] 3.0.1 Hotfix: - Improved exception handling on WCF
 interceptor reply channel

---
 README.adoc                                   |  3 +-
 build.xml                                     |  2 +-
 doc/OIORASP_Library_DotNet-ReleaseNotes.adoc  |  2 +
 doc/release-notes-3.0.1.adoc                  | 39 +++++++++++++++++++
 .../Channels/InterceptorReplyChannel.cs       | 33 ++++++++++------
 5 files changed, 66 insertions(+), 13 deletions(-)
 create mode 100644 doc/release-notes-3.0.1.adoc

diff --git a/README.adoc b/README.adoc
index 7d8e6387..f438566a 100644
--- a/README.adoc
+++ b/README.adoc
@@ -9,7 +9,8 @@ This issue requires a HotFix presented in *2.1.1 (Log4net Hotfix)*. The next sta
 [options="header"]
 |===
 | Version | Branch | Release status | Description
-| *3.0.0 (Current)* | *master* | *released* | RASP version 3.0.0
+| *3.0.1 (Current)* | *master* | *released* | Hotfix: Improved exception handling in wcf-interceptor
+| 3.0.0 | master | released | RASP version 3.0.0
 4+|  xref:doc/OIORASP_Library_DotNet-ReleaseNotes.adoc#what_is_changed[View section "What is changed" for earlier releases]
 |===
 
diff --git a/build.xml b/build.xml
index cdbf0bc1..9c8980e3 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
   <!-- ${build.number} is the value coming from TeamCity, or the bat script that start the build -->
   <property name="Number_Major" value="3"/>
   <property name="Number_Minor" value="0"/>
-  <property name="Number_Patch" value="0"/>
+  <property name="Number_Patch" value="1"/>
   <property name="Version_Tag" value="0"></property>
   <!-- When updating the version number, remember to update theses files.
       They have a reference to the actual version, almost at the end of the file.
diff --git a/doc/OIORASP_Library_DotNet-ReleaseNotes.adoc b/doc/OIORASP_Library_DotNet-ReleaseNotes.adoc
index 034bd2a2..7321be8d 100644
--- a/doc/OIORASP_Library_DotNet-ReleaseNotes.adoc
+++ b/doc/OIORASP_Library_DotNet-ReleaseNotes.adoc
@@ -48,6 +48,8 @@ In the following part of the document, some issue numbers are mentioned these nu
 internal numbers used by the Erhvervsstyrelsen (Danish Business Authority), so please ignore these as external
 developer.
 
+include::release-notes-3.0.1.adoc[leveloffset=+1]
+
 include::release-notes-3.0.0.adoc[leveloffset=+1]
 
 include::release-notes-2.1.x.adoc[leveloffset=+1]
diff --git a/doc/release-notes-3.0.1.adoc b/doc/release-notes-3.0.1.adoc
new file mode 100644
index 00000000..01f64506
--- /dev/null
+++ b/doc/release-notes-3.0.1.adoc
@@ -0,0 +1,39 @@
+include::_common-settings.adoc[]
+
+[#rasp_3_0_1]
+== OIORASP version 3.0.1
+
+=== New features
+* Configure the timeout for NHR UDDI requests.
+
+=== Fixes
+.Related to WCF Interceptor exeption handling (NH-1433)
+* ReplyChannel interceptor now catches CommunicationObjectFaultedException when trying to close a faulted channel
+* ReplyChannel interceptor now catches TimeoutException when timing out during channel close
+** Catching these now aborts the channel, as the channel could not be closed gracefully
+
+=== Changes
+_none_
+
+.Other
+_none_
+
+
+=== Removals
+_none-
+
+=== How to upgrade
+How to upgrade project from OIORASP .NET 2.1.X to version 3.0.0.
+
+NOTE: The guide might not be 100% accurate, depending on your use of the library! Some steps might be unnecessary in your setup, and others might be as detailed as need in your setup!
+
+Steps:
+
+. Download new release from https://www.digitaliser.dk/group/405467/resources or https://nemhandel.dk/opdateringer-releases
+. File changes:
+* Replace your old .dll files with the new .dll and .config files (From the zip-folder: dk.gov.oiosi-bin-{versionNumberTagged}.zip).
+
+That should be it...!
+
+It you meet problems, that should be included in this guide, please post your comments to the following email address:
+support@nemhandel.dk
diff --git a/src/dk.gov.oiosi/extension/wcf/Interceptor/Channels/InterceptorReplyChannel.cs b/src/dk.gov.oiosi/extension/wcf/Interceptor/Channels/InterceptorReplyChannel.cs
index 468da966..82d65e2b 100644
--- a/src/dk.gov.oiosi/extension/wcf/Interceptor/Channels/InterceptorReplyChannel.cs
+++ b/src/dk.gov.oiosi/extension/wcf/Interceptor/Channels/InterceptorReplyChannel.cs
@@ -33,6 +33,7 @@
 
 using System;
 using System.Diagnostics;
+using System.ServiceModel;
 using System.ServiceModel.Channels;
 using dk.gov.oiosi.logging;
 
@@ -187,26 +188,36 @@ namespace dk.gov.oiosi.extension.wcf.Interceptor.Channels {
                 if (context != null)
                 {
                     context = this.EndReceiveRequest(context);
-                    if (context != null)
-                    {
-                        success = true;
-                    }
-                    else
-                    {
-                        success = false;
-                    }
+                    success = context != null;
+                 
                 }
+            
             }
             catch (Exception ex)
             {
-                this.logger.Error("E-RSP21141: " + ex.ToString());
+            
+                this.logger.Error("E-RSP21141: EndReceiveRequest failed with an exeception: " + ex.Message);
+                //https://docs.microsoft.com/en-us/dotnet/framework/wcf/samples/expected-exceptions
                 try
                 {
                     channel.Close();
                 }
-                catch (Exception exception)
+                catch (CommunicationObjectFaultedException e)
+                {
+                    // Quote MS documentation: "...If Close is called on an object in the Faulted state, a CommunicationObjectFaultedException is thrown because the object cannot be gracefully closed."
+                    channel.Abort();
+                    this.logger.Error("E-RSP21142: IReplyChannel was in a FAULTED state, when trying to close the channel: " + e.Message);
+                }
+                catch (TimeoutException e)
+                {
+                    channel.Abort();
+                    this.logger.Error("E-RSP21143: IReplyChannel timed out during channel.close() with the message: " + e.Message);
+
+                }
+                catch (Exception e)
                 {
-                    this.logger.Fatal("F-RSP21142: " + exception.ToString());
+                    channel.Abort();
+                    this.logger.Error("E-RSP21144: IReplyChannel failed with an uexpected exception: " + e.ToString());
                 }
 
                 context = null;
-- 
GitLab