#352 (#354)

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -56,6 +56,7 @@ namespace WireMock.Net.StandAlone
                 MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
                 RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
                 AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
+                AllowBodyForAllHttpMethods = parser.GetBoolValue("AllowBodyForAllHttpMethods")
             };
 
             if (logger != null)

src/WireMock.Net/Admin/Settings/SettingsModel.cs

@@ -24,5 +24,10 @@
         /// Gets or sets the MaxRequestLog count.
         /// </summary>
         public int? MaxRequestLogCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets wether to allow a body for all HTTP methods.
+        /// </summary>
+        public bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -20,7 +20,7 @@ namespace WireMock.Owin
 
         IStringMatcher AuthorizationMatcher { get; set; }
 
-        bool AllowPartialMapping { get; set; }
+        bool? AllowPartialMapping { get; set; }
 
         ConcurrentDictionary<Guid, IMapping> Mappings { get; }
 
@@ -37,5 +37,7 @@ namespace WireMock.Owin
         Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }
 
         IFileSystemHandler FileSystemHandler { get; set; }
+
+        bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Owin/Mappers/IOwinRequestMapper.cs

@@ -16,7 +16,8 @@ namespace WireMock.Owin.Mappers
         /// MapAsync IRequest to RequestMessage
         /// </summary>
         /// <param name="request">The OwinRequest/HttpRequest</param>
+        /// <param name="options">The WireMockMiddlewareOptions</param>
         /// <returns>RequestMessage</returns>
-        Task<RequestMessage> MapAsync(IRequest request);
+        Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options);
     }
 }

src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs

@@ -20,7 +20,7 @@ namespace WireMock.Owin.Mappers
     internal class OwinRequestMapper : IOwinRequestMapper
     {
         /// <inheritdoc cref="IOwinRequestMapper.MapAsync"/>
-        public async Task<RequestMessage> MapAsync(IRequest request)
+        public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
         {
             (UrlDetails urldetails, string clientIP) = ParseRequest(request);
 
@@ -47,7 +47,7 @@ namespace WireMock.Owin.Mappers
             }
 
             BodyData body = null;
-            if (request.Body != null && BodyParser.ShouldParseBody(method))
+            if (request.Body != null && BodyParser.ShouldParseBody(method, options.AllowBodyForAllHttpMethods == true))
             {
                 body = await BodyParser.Parse(request.Body, request.ContentType);
             }

src/WireMock.Net/Owin/MappingMatcher.cs

@@ -37,7 +37,7 @@ namespace WireMock.Owin
                 }
             }
 
-            if (_options.AllowPartialMapping)
+            if (_options.AllowPartialMapping == true)
             {
                 var partialMappings = mappings
                     .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -69,7 +69,7 @@ namespace WireMock.Owin
 
         private async Task InvokeInternal(IContext ctx)
         {
-            var request = await _requestMapper.MapAsync(ctx.Request);
+            var request = await _requestMapper.MapAsync(ctx.Request, _options);
 
             bool logRequest = false;
             ResponseMessage response = null;

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -21,7 +21,7 @@ namespace WireMock.Owin
 
         public IStringMatcher AuthorizationMatcher { get; set; }
 
-        public bool AllowPartialMapping { get; set; }
+        public bool? AllowPartialMapping { get; set; }
 
         public ConcurrentDictionary<Guid, IMapping> Mappings { get; } = new ConcurrentDictionary<Guid, IMapping>();
 
@@ -39,5 +39,8 @@ namespace WireMock.Owin
 
         /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>
         public IFileSystemHandler FileSystemHandler { get; set; }
+
+        /// <inheritdoc cref="IWireMockMiddlewareOptions.AllowBodyForAllHttpMethods"/>
+        public bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -339,7 +339,8 @@ namespace WireMock.Server
                 AllowPartialMapping = _options.AllowPartialMapping,
                 MaxRequestLogCount = _options.MaxRequestLogCount,
                 RequestLogExpirationDuration = _options.RequestLogExpirationDuration,
-                GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds
+                GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds,
+                AllowBodyForAllHttpMethods = _options.AllowBodyForAllHttpMethods
             };
 
             return ToJson(model);
@@ -361,6 +362,11 @@ namespace WireMock.Server
                 _options.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
             }
 
+            if (settings.AllowBodyForAllHttpMethods != null)
+            {
+                _options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods.Value;
+            }
+
             return ResponseMessageBuilder.Create("Settings updated");
         }
         #endregion Settings

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,11 +1,11 @@
-using JetBrains.Annotations;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
 using WireMock.Exceptions;
 using WireMock.Handlers;
@@ -257,6 +257,12 @@ namespace WireMock.Server
                 }
             }
 
+            if (settings.AllowBodyForAllHttpMethods == true)
+            {
+                _options.AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods;
+                _settings.Logger.Info("AllowBodyForAllHttpMethods is set to {0}", _settings.AllowBodyForAllHttpMethods == true);
+            }
+
             if (settings.AllowPartialMapping == true)
             {
                 AllowPartialMapping();

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -94,5 +94,9 @@ namespace WireMock.Settings
         /// <inheritdoc cref="IFluentMockServerSettings.AllowCSharpCodeMatcher"/>
         [PublicAPI]
         public bool? AllowCSharpCodeMatcher { get; set; }
+
+        /// <inheritdoc cref="IFluentMockServerSettings.AllowBodyForAllHttpMethods"/>
+        [PublicAPI]
+        public bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -124,6 +124,13 @@ namespace WireMock.Settings
         /// <summary>
         /// Allow the usage of CSharpCodeMatcher (default is not allowed).
         /// </summary>
+        [PublicAPI]
         bool? AllowCSharpCodeMatcher { get; set; }
+
+        /// <summary>
+        /// Allow a Body for all HTTP Methods. (default set to false).
+        /// </summary>
+        [PublicAPI]
+        bool? AllowBodyForAllHttpMethods { get; set; }
     }
 }

src/WireMock.Net/Util/BodyParser.cs

@@ -59,14 +59,19 @@ namespace WireMock.Util
 
         private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings { DateParseHandling = DateParseHandling.None };
 
-        public static bool ShouldParseBody([CanBeNull] string method)
+        public static bool ShouldParseBody([CanBeNull] string httpMethod, bool allowBodyForAllHttpMethods)
         {
-            if (string.IsNullOrEmpty(method))
+            if (string.IsNullOrEmpty(httpMethod))
             {
                 return false;
             }
 
-            if (BodyAllowedForMethods.TryGetValue(method.ToUpper(), out bool allowed))
+            if (allowBodyForAllHttpMethods)
+            {
+                return true;
+            }
+
+            if (BodyAllowedForMethods.TryGetValue(httpMethod.ToUpper(), out bool allowed))
             {
                 return allowed;
             }