Merge pull request #285 from TransactionProcessing/bug/#284_response_logging_in_wcf_broken

Fix to response logging middleware

Author: StuartFerguson

Shared/General/ConfigurationReader.cs

@@ -75,6 +75,25 @@ public static T GetValueFromSection<T>(String sectionName,
             return ConfigurationReader.GetTypedValueFromSection<T>(sectionName, keyName);
         }
 
+        public static T GetValueOrDefault<T>(String sectionName, String keyName, T defaultValue)
+        {
+            try
+            {
+                var value = ConfigurationReader.GetValue(sectionName, keyName);
+
+                if (String.IsNullOrEmpty(value))
+                {
+                    return defaultValue;
+                }
+
+                return (T)Convert.ChangeType(value, typeof(T));
+            }
+            catch (KeyNotFoundException kex)
+            {
+                return defaultValue;
+            }
+        }
+
         /// <summary>
         /// Initialises the specified configuration root.
         /// </summary>

Shared/Middleware/RequestLoggingMiddleware.cs

@@ -22,15 +22,17 @@ public RequestLoggingMiddleware(RequestDelegate next)
         }
         #endregion
 
-        #region Public Methods
-
         #region public async Task Invoke(HttpContext context)
         public async Task Invoke(HttpContext context, RequestResponseMiddlewareLoggingConfig configuration)
         {
-            var originalRequestBody = context.Request.Body;
-            if (configuration.LogRequests)
+            if (configuration.LogRequests == false)
+            {
+                await next(context);
+            }
+            else
             {
                 var requestBodyStream = new MemoryStream();
+                var originalRequestBody = context.Request.Body;
 
                 await context.Request.Body.CopyToAsync(requestBodyStream);
                 requestBodyStream.Seek(0, SeekOrigin.Begin);
@@ -49,13 +51,11 @@ public async Task Invoke(HttpContext context, RequestResponseMiddlewareLoggingCo
 
                 requestBodyStream.Seek(0, SeekOrigin.Begin);
                 context.Request.Body = requestBodyStream;
-            }
 
-            await next(context);
-            context.Request.Body = originalRequestBody;
+                await next(context);
+                context.Request.Body = originalRequestBody;
+            }
         }
         #endregion
-
-        #endregion
     }
 }

Shared/Middleware/ResponseLoggingMiddleware.cs

@@ -29,16 +29,20 @@ public ResponseLoggingMiddleware(RequestDelegate next)
         #region public async Task Invoke(HttpContext context)        
         public async Task Invoke(HttpContext context, RequestResponseMiddlewareLoggingConfig configuration)
         {
-            var url = context.Request.GetDisplayUrl();
-            var bodyStream = context.Response.Body;
+            if (configuration.LogResponses == false)
+            {
+                await next(context);
+            }
+            else
+            {
+                var url = context.Request.GetDisplayUrl();
+                var bodyStream = context.Response.Body;
 
-            var responseBodyStream = new MemoryStream();
-            context.Response.Body = responseBodyStream;
+                var responseBodyStream = new ResponseLoggingMemoryStream();
+                context.Response.Body = responseBodyStream;
 
-            await next(context);
+                await next(context);
 
-            if (configuration.LogResponses)
-            {
                 responseBodyStream.Seek(0, SeekOrigin.Begin);
                 var responseBody = await new StreamReader(responseBodyStream).ReadToEndAsync();
                 StringBuilder logMessage = new StringBuilder();
@@ -52,12 +56,36 @@ public async Task Invoke(HttpContext context, RequestResponseMiddlewareLoggingCo
                 Helpers.LogMessage(url, logMessage, configuration.LoggingLevel);
 
                 responseBodyStream.Seek(0, SeekOrigin.Begin);
-            }
+                await responseBodyStream.CopyToAsync(bodyStream);
 
-            await responseBodyStream.CopyToAsync(bodyStream);
+                if (responseBodyStream.IsDisposed() && context.Request.Headers.ContainsKey("SOAPAction"))
+                {
+                    responseBodyStream.ForceClose();
+                }
+            }
         }
         #endregion
 
         #endregion
     }
+
+    public class ResponseLoggingMemoryStream : MemoryStream
+    {
+        public override void Close()
+        {
+            // Dont close by default
+            // base.Close();
+        }
+
+        public void ForceClose()
+        {
+            base.Close();
+        }
+
+        public bool IsDisposed()
+        {
+            return this.CanRead && this.CanSeek && this.CanWrite;
+        }
+
+    }
 }