1.4.34

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.4.34 (27 January 2022)
+- [#716](https://github.com/WireMock-Net/WireMock.Net/pull/716) - MatcherMapper : Always use Pattern [bug] contributed by [StefH](https://github.com/StefH)
+- [#715](https://github.com/WireMock-Net/WireMock.Net/issues/715) - Record request mapping outputs JsonMatcher with Patterns instead of Pattern [bug]
+
+# 1.4.33 (24 January 2022)
+- [#714](https://github.com/WireMock-Net/WireMock.Net/pull/714) - Add support for Cors [feature] contributed by [StefH](https://github.com/StefH)
+
 # 1.4.32 (17 January 2022)
 - [#713](https://github.com/WireMock-Net/WireMock.Net/pull/713) - Added support of custom matchers in static mappings contributed by [levanoz](https://github.com/levanoz)
 
@@ -166,6 +173,7 @@
 - [#549](https://github.com/WireMock-Net/WireMock.Net/issues/549) - WithProxy(...) does not save the mappings to file [bug]
 
 # 1.3.8 (03 December 2020)
+- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
 - [#542](https://github.com/WireMock-Net/WireMock.Net/pull/542) - Create dotnet-wiremock tool [feature] contributed by [StefH](https://github.com/StefH)
 - [#543](https://github.com/WireMock-Net/WireMock.Net/pull/543) - Add support for .NET 5 [feature] contributed by [StefH](https://github.com/StefH)
 - [#544](https://github.com/WireMock-Net/WireMock.Net/pull/544) - Use Java 11 in Azure Pipelines (needed for SonarCloud) [feature] contributed by [StefH](https://github.com/StefH)
@@ -173,9 +181,6 @@
 - [#547](https://github.com/WireMock-Net/WireMock.Net/pull/547) - Fix Proxying with SSL and NetCoreApp3.1 [bug] contributed by [StefH](https://github.com/StefH)
 - [#524](https://github.com/WireMock-Net/WireMock.Net/issues/524) - Proxying with SSL Not Working in .NET Core 3.1 [bug]
 
-# 1.3.7 (17 November 2020)
-- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
-
 # 1.3.6 (10 November 2020)
 - [#529](https://github.com/WireMock-Net/WireMock.Net/pull/529) - Add assertions for ClientIP, Url and ProxyUrl [feature] contributed by [akamud](https://github.com/akamud)
 - [#535](https://github.com/WireMock-Net/WireMock.Net/pull/535) - WithCallback should use also use enum HttpStatusCode [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.32</VersionPrefix>
+        <VersionPrefix>1.4.34</VersionPrefix>
         <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.4.32
+SET version=1.4.34
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,4 +1,5 @@
-# 1.4.32 (17 January 2022)
-- #713 Added support of custom matchers in static mappings
+# 1.4.34 (27 January 2022)
+- #716 MatcherMapper : Always use Pattern [bug]
+- #715 Record request mapping outputs JsonMatcher with Patterns instead of Pattern [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

examples/WireMock.Net.Console.NET5/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json

@@ -1,22 +1,33 @@
-{
+{
     "Request": {
         "Path": {
             "Matchers": [
                 {
                     "Name": "WildcardMatcher",
-                    "Pattern": "/static/mapping"
+                    "Patterns": [ "/static/mapping", "/static/mapping2" ]
                 }
             ]
         },
+        "Body": {
+            "Matcher": {
+                "Name": "JsonMatcher",
+                "Pattern": {
+                    "post1": "value 1",
+                    "post2": "value 2"
+                },
+                "IgnoreCase": true
+            }
+        },
         "Methods": [
-            "get"
+            "get",
+            "post"
         ]
     },
     "Response": {
         "BodyAsJson": { "body": "static mapping" },
-      "Headers": {
-        "Content-Type": "application/json",
-        "Test-X": [ "test 1", "test 2" ]
-      }
+        "Headers": {
+            "Content-Type": "application/json",
+            "Test-X": [ "test 1", "test 2" ]
+        }
     }
 }

examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs

@@ -6,8 +6,6 @@ using System.Threading;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -35,33 +33,6 @@ namespace WireMock.Net.StandAlone.NETCoreApp
 
             settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
 
-            /* https://stackoverflow.com/questions/31942037/how-to-enable-cors-in-asp-net-core */
-            /* Enable Cors */
-            var policyName = "MyPolicy";
-            settings.AdditionalServiceRegistration = services =>
-            {
-                services.AddCors(corsOptions =>
-                    corsOptions.AddPolicy(policyName,
-                        corsPolicyBuilder =>
-                        {
-                            corsPolicyBuilder
-                                .AllowAnyHeader()
-                                .AllowAnyMethod()
-                                .AllowAnyOrigin();
-                        }));
-
-                settings.Logger.Debug("Enable Cors");
-            };
-
-            /* Use Cors */
-            settings.PreWireMockMiddlewareInit = app =>
-            {
-                var appBuilder = (IApplicationBuilder)app;
-                appBuilder.UseCors(policyName);
-
-                settings.Logger.Debug("Use Cors");
-            };
-
             _server = WireMockServer.Start(settings);
 
             _server.Given(Request.Create().WithPath("/api/sap")

examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json

@@ -1,8 +1,8 @@
 {
   "profiles": {
     "WireMock.Net.StandAlone.NETCoreApp": {
-      "commandName": "Project",
-      "commandLineArgs": "--Urls http://localhost:9091 --WireMockLogger WireMockConsoleLogger"
+        "commandName": "Project",
+        "commandLineArgs": "--Urls http://localhost:9091 --CorsPolicyOptions AllowAll --WireMockLogger WireMockConsoleLogger"
     }
   }
 }

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

@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using WireMock.Handlers;
+using WireMock.Types;
 
 namespace WireMock.Admin.Settings
 {
@@ -53,5 +54,10 @@ namespace WireMock.Admin.Settings
         /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
         /// </summary>
         public bool? SaveUnmatchedRequests { get; set; }
+
+        /// <summary>
+        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+        /// </summary>
+        public string CorsPolicyOptions { get; set; }
     }
 }

src/WireMock.Net.Abstractions/Types/CorsPolicyOptions.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace WireMock.Types
+{
+    /// <summary>
+    /// Policies to use when using CORS.
+    /// </summary>
+    [Flags]
+    public enum CorsPolicyOptions
+    {
+        /// <summary>
+        /// Cors is disabled
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Ensures that the policy allows any header.
+        /// </summary>
+        AllowAnyHeader = 0b00000001,
+
+        /// <summary>
+        /// Ensures that the policy allows any method.
+        /// </summary>
+        AllowAnyMethod = 0b00000010,
+
+        /// <summary>
+        /// Ensures that the policy allows any origin.
+        /// </summary>
+        AllowAnyOrigin = 0b00000100,
+
+        /// <summary>
+        /// Ensures that the policy allows any header, method and origin.
+        /// </summary>
+        AllowAll = AllowAnyHeader | AllowAnyMethod | AllowAnyOrigin
+    }
+}

src/WireMock.Net/Owin/AspNetCoreSelfHost.NETCore.cs

@@ -0,0 +1,48 @@
+#if NETCOREAPP3_1_OR_GREATER
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using WireMock.Types;
+
+namespace WireMock.Owin
+{
+    internal partial class AspNetCoreSelfHost
+    {
+        public void AddCors(IServiceCollection services)
+        {
+            if (_wireMockMiddlewareOptions.CorsPolicyOptions > CorsPolicyOptions.None)
+            {
+                /* https://stackoverflow.com/questions/31942037/how-to-enable-cors-in-asp-net-core */
+                /* Enable Cors */
+                services.AddCors(corsOptions => corsOptions
+                    .AddPolicy(CorsPolicyName,
+                        corsPolicyBuilder =>
+                        {
+                            if (_wireMockMiddlewareOptions.CorsPolicyOptions.Value.HasFlag(CorsPolicyOptions.AllowAnyHeader))
+                            {
+                                corsPolicyBuilder.AllowAnyHeader();
+                            }
+
+                            if (_wireMockMiddlewareOptions.CorsPolicyOptions.Value.HasFlag(CorsPolicyOptions.AllowAnyMethod))
+                            {
+                                corsPolicyBuilder.AllowAnyMethod();
+                            }
+
+                            if (_wireMockMiddlewareOptions.CorsPolicyOptions.Value.HasFlag(CorsPolicyOptions.AllowAnyOrigin))
+                            {
+                                corsPolicyBuilder.AllowAnyOrigin();
+                            }
+                        }));
+            }
+        }
+
+        public void UseCors(IApplicationBuilder appBuilder)
+        {
+            if (_wireMockMiddlewareOptions.CorsPolicyOptions > CorsPolicyOptions.None)
+            {
+                /* Use Cors */
+                appBuilder.UseCors(CorsPolicyName);
+            }
+        }
+    }
+}
+#endif

src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs

@@ -1,10 +1,11 @@
-#if USE_ASPNETCORE && !NETSTANDARD1_3
+#if USE_ASPNETCORE && !NETSTANDARD1_3
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.HttpsCertificate;
+using WireMock.Types;
 
 namespace WireMock.Owin
 {

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -18,6 +18,8 @@ namespace WireMock.Owin
 {
     internal partial class AspNetCoreSelfHost : IOwinSelfHost
     {
+        private const string CorsPolicyName = "WireMock.Net - Policy";
+
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly IWireMockMiddlewareOptions _wireMockMiddlewareOptions;
         private readonly IWireMockLogger _logger;
@@ -68,12 +70,18 @@ namespace WireMock.Owin
                     services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                     services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
 
+#if NETCOREAPP3_1_OR_GREATER
+                    AddCors(services);
+#endif
                     _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
                 })
                 .Configure(appBuilder =>
                 {
                     appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
 
+#if NETCOREAPP3_1_OR_GREATER
+                    UseCors(appBuilder);
+#endif
                     _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
 
                     appBuilder.UseMiddleware<WireMockMiddleware>();

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -4,6 +4,8 @@ using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
+using JetBrains.Annotations;
+using WireMock.Types;
 #if !USE_ASPNETCORE
 using Owin;
 #else
@@ -39,6 +41,8 @@ namespace WireMock.Owin
 
 #if USE_ASPNETCORE
         Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         IFileSystemHandler FileSystemHandler { get; set; }

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Types;
 using WireMock.Util;
 #if !USE_ASPNETCORE
 using Owin;
@@ -39,6 +40,8 @@ namespace WireMock.Owin
 
 #if USE_ASPNETCORE
         public Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        public CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,80 +1,80 @@
-using JetBrains.Annotations;
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
+using JetBrains.Annotations;
+using System;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
 using WireMock.Util;
 
-namespace WireMock.RequestBuilders
-{
-    /// <summary>
-    /// The BodyRequestBuilder interface.
-    /// </summary>
-    public interface IBodyRequestBuilder : IRequestMatcher
-    {
-        /// <summary>
-        /// WithBody: IMatcher
-        /// </summary>
-        /// <param name="matcher">The matcher.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher matcher);
-
-        /// <summary>
-        /// WithBody: IMatcher[]
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
-
-        /// <summary>
-        /// WithBody: Body as string
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: Body as byte[]
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: Body as object
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: func (string)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
-
-        /// <summary>
-        /// WithBody: func (byte[])
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
-
-        /// <summary>
-        /// WithBody: func (json object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
-
-        /// <summary>
-        /// WithBody: func (BodyData object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
-    }
+namespace WireMock.RequestBuilders
+{
+    /// <summary>
+    /// The BodyRequestBuilder interface.
+    /// </summary>
+    public interface IBodyRequestBuilder : IRequestMatcher
+    {
+        /// <summary>
+        /// WithBody: IMatcher
+        /// </summary>
+        /// <param name="matcher">The matcher.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] IMatcher matcher);
+
+        /// <summary>
+        /// WithBody: IMatcher[]
+        /// </summary>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
+
+        /// <summary>
+        /// WithBody: Body as string
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: Body as byte[]
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: Body as object
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: func (string)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
+
+        /// <summary>
+        /// WithBody: func (byte[])
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
+
+        /// <summary>
+        /// WithBody: func (json object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
+
+        /// <summary>
+        /// WithBody: func (BodyData object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
+    }
 }

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -161,12 +161,12 @@ namespace WireMock.Serialization
 
                 // If the matcher is a IValueMatcher, get the value (can be string or object).
                 case IValueMatcher valueMatcher:
-                    model.Patterns = new[] { valueMatcher.Value };
+                    model.Pattern = valueMatcher.Value;
                     break;
 
                 // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
                 case ExactObjectMatcher exactObjectMatcher:
-                    model.Patterns = new[] { exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes };
+                    model.Pattern = exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes;
                     break;
             }
 

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

@@ -293,7 +293,11 @@ namespace WireMock.Server
                 HandleRequestsSynchronously = _settings.HandleRequestsSynchronously,
                 ThrowExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails,
                 UseRegexExtended = _settings.UseRegexExtended,
-                SaveUnmatchedRequests = _settings.SaveUnmatchedRequests
+                SaveUnmatchedRequests = _settings.SaveUnmatchedRequests,
+
+#if USE_ASPNETCORE
+                CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString()
+#endif
             };
 
             return ToJson(model);
@@ -315,6 +319,13 @@ namespace WireMock.Server
             _settings.UseRegexExtended = settings.UseRegexExtended;
             _settings.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
 
+#if USE_ASPNETCORE
+            if (Enum.TryParse<CorsPolicyOptions>(settings.CorsPolicyOptions, true, out var corsPolicyOptions))
+            {
+                _settings.CorsPolicyOptions = corsPolicyOptions;
+            }
+#endif
+
             return ResponseMessageBuilder.Create("Settings updated");
         }
         #endregion Settings

src/WireMock.Net/Server/WireMockServer.cs

@@ -243,6 +243,8 @@ namespace WireMock.Server
 
 #if USE_ASPNETCORE
             _options.AdditionalServiceRegistration = _settings.AdditionalServiceRegistration;
+            _options.CorsPolicyOptions = _settings.CorsPolicyOptions;
+
             _httpServer = new AspNetCoreSelfHost(_options, urlOptions);
 #else
             _httpServer = new OwinSelfHost(_options, urlOptions);

src/WireMock.Net/Settings/IWireMockServerSettings.cs

@@ -11,6 +11,7 @@ using WireMock.Matchers;
 using WireMock.RegularExpressions;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
+using WireMock.Types;
 #endif
 
 namespace WireMock.Settings
@@ -135,6 +136,12 @@ namespace WireMock.Settings
         /// </summary>
         [PublicAPI]
         Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        /// <summary>
+        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+        /// </summary>
+        [PublicAPI]
+        CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         /// <summary>

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -7,6 +7,7 @@ using WireMock.Admin.Mappings;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Types;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
 #endif
@@ -97,6 +98,10 @@ namespace WireMock.Settings
         [PublicAPI]
         [JsonIgnore]
         public Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        /// <inheritdoc cref="IWireMockServerSettings.CorsPolicyOptions"/>
+        [PublicAPI]
+        public CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         /// <inheritdoc cref="IWireMockServerSettings.Logger"/>

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -1,6 +1,9 @@
+using System;
+using System.Linq;
 using JetBrains.Annotations;
-using WireMock.Logging;
 using Stef.Validation;
+using WireMock.Logging;
+using WireMock.Types;
 
 namespace WireMock.Settings
 {
@@ -50,9 +53,18 @@ namespace WireMock.Settings
                 HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
                 ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
                 UseRegexExtended = parser.GetBoolValue(nameof(IWireMockServerSettings.UseRegexExtended), true),
-                SaveUnmatchedRequests = parser.GetBoolValue(nameof(IWireMockServerSettings.SaveUnmatchedRequests))
+                SaveUnmatchedRequests = parser.GetBoolValue(nameof(IWireMockServerSettings.SaveUnmatchedRequests)),
             };
 
+#if USE_ASPNETCORE
+            settings.CorsPolicyOptions = parser.GetValue(
+                nameof(IWireMockServerSettings.CorsPolicyOptions), values =>
+                {
+                    var value = string.Join(string.Empty, values);
+                    return Enum.TryParse<CorsPolicyOptions>(value, true, out var corsPolicyOptions) ? corsPolicyOptions : CorsPolicyOptions.None;
+                });
+#endif
+
             if (logger != null)
             {
                 settings.Logger = logger;

test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs

@@ -164,7 +164,7 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void ToMappingModel_WithTimeSetrtings_ReturnsCorrectTimeSettings()
+        public void ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
         {
             // Assign
             var start = DateTime.Now;

test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs

@@ -187,16 +187,36 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_String()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_String()
+        {
+            // Assign
+            var pattern = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_String()
         {
             // Assign
             var pattern1 = "{ \"AccountIds\": [ 1, 2, 3 ] }";
-            var pattern2 = "{ \"X\": \"x\" }";
+            var pattern2 = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {
                 Name = "JsonMatcher",
-                Pattern = patterns
+                Patterns = patterns
             };
 
             // Act
@@ -227,11 +247,31 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_Object()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_Object()
+        {
+            // Assign
+            object pattern = new { post1 = "value1", post2 = "value2" };
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_Object()
         {
             // Assign
             object pattern1 = new { AccountIds = new[] { 1, 2, 3 } };
-            object pattern2 = new { X = "x" };
+            object pattern2 = new { post1 = "value1", post2 = "value2" };
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {

test/WireMock.Net.Tests/WireMockServerTests.cs

@@ -17,6 +17,7 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
@@ -97,6 +98,29 @@ namespace WireMock.Net.Tests
             server.Stop();
         }
 
+#if NETCOREAPP3_1_OR_GREATER
+        [Fact]
+        public async Task WireMockServer_WithCorsPolicyOptions_Should_Work_Correct()
+        {
+            // Arrange
+            var settings = new WireMockServerSettings
+            {
+                CorsPolicyOptions = CorsPolicyOptions.AllowAll
+            };
+            var server = WireMockServer.Start(settings);
+
+            server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
+
+            // Act
+            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
+            // Asser.
+            response.Should().Be("x");
+
+            server.Stop();
+        }
+#endif
+
         [Fact]
         public async Task WireMockServer_Should_delay_responses_for_a_given_route()
         {