Add NUnit test project

* Add client certificate support

* Add missing test certificate file

* Review fixes

* Review fixes

* Review fixes

* Review fixes

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.5.13 (11 December 2022)
+- [#858](https://github.com/WireMock-Net/WireMock.Net/pull/858) - Update Transformer functionality to return value instead of string [feature] contributed by [StefH](https://github.com/StefH)
+- [#859](https://github.com/WireMock-Net/WireMock.Net/pull/859) - Add UpdatedAt property to Mapping [feature] contributed by [StefH](https://github.com/StefH)
+- [#861](https://github.com/WireMock-Net/WireMock.Net/pull/861) - Add extra functionality for issue 55 contributed by [StefH](https://github.com/StefH)
+- [#862](https://github.com/WireMock-Net/WireMock.Net/pull/862) - Add client certificate support [feature] contributed by [billybraga](https://github.com/billybraga)
+- [#863](https://github.com/WireMock-Net/WireMock.Net/pull/863) - Update WireMockServer.CreateClient/CreateClients to include handlers [feature] contributed by [StefH](https://github.com/StefH)
+- [#856](https://github.com/WireMock-Net/WireMock.Net/issues/856) - Inconsistent result with overlapping (duplicate) request [bug]
+
 # 1.5.12 (03 December 2022)
 - [#851](https://github.com/WireMock-Net/WireMock.Net/pull/851) - Fix Linux CI build + Fix opencover [feature] contributed by [StefH](https://github.com/StefH)
 - [#853](https://github.com/WireMock-Net/WireMock.Net/pull/853) - Add .Net 7 [feature] contributed by [StefH](https://github.com/StefH)
@@ -915,6 +923,7 @@
 - [#45](https://github.com/WireMock-Net/WireMock.Net/pull/45) - Add RequestLogExpirationDuration and MaxRequestLogCount (#43) contributed by [StefH](https://github.com/StefH)
 - [#51](https://github.com/WireMock-Net/WireMock.Net/pull/51) - Observable logs contributed by [dmtrrk](https://github.com/dmtrrk)
 - [#15](https://github.com/WireMock-Net/WireMock.Net/issues/15) - New feature: Proxying [feature]
+- [#20](https://github.com/WireMock-Net/WireMock.Net/issues/20) - Add client certificate authentication [feature]
 - [#31](https://github.com/WireMock-Net/WireMock.Net/issues/31) - Feature request: Nuget package for standalone version [feature]
 - [#33](https://github.com/WireMock-Net/WireMock.Net/issues/33) - Issue with launching sample code (StandAlone server) [bug]
 - [#38](https://github.com/WireMock-Net/WireMock.Net/issues/38) - Bug: support also listening on *:{port}

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.12</VersionPrefix>
+        <VersionPrefix>1.5.13</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,7 +1,9 @@
-# 1.5.12 (03 December 2022)
-- #851 Fix Linux CI build + Fix opencover [feature]
-- #853 Add .Net 7 [feature]
-- #854 Fix logic for QueryParameterMultipleValueSupport [bug]
-- #857 Update some dependencies [feature]
+# 1.5.13 (11 December 2022)
+- #858 Update Transformer functionality to return value instead of string [feature]
+- #859 Add UpdatedAt property to Mapping [feature]
+- #861 Add extra functionality for issue 55
+- #862 Add client certificate support [feature]
+- #863 Update WireMockServer.CreateClient/CreateClients to include handlers [feature]
+- #856 Inconsistent result with overlapping (duplicate) request [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

WireMock.Net Solution.sln

@@ -110,6 +110,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.NUnitTests", "test\WireMock.Net.NUnitTests\WireMock.Net.NUnitTests.csproj", "{2F919763-60C0-434B-A263-077AA19B3BE6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -264,6 +266,10 @@ Global
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F919763-60C0-434B-A263-077AA19B3BE6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -308,6 +314,7 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{2F919763-60C0-434B-A263-077AA19B3BE6} = {0BB8B634-407A-4610-A91F-11586990767A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

WireMock.Net Solution.sln.DotSettings

@@ -33,6 +33,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=templated/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Victoor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhooks/@EntryIndexedValue">True</s:Boolean>

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

@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
@@ -10,71 +11,112 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
-using WireMock.Util;
 
-namespace WireMock.Net.StandAlone.NETCoreApp
+namespace WireMock.Net.StandAlone.NETCoreApp;
+
+static class Program
 {
-    static class Program
+    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+    // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+    private static int sleepTime = 30000;
+    private static WireMockServer _server;
+
+    static async Task Main(string[] args)
     {
-        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-        // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        await TestAsync().ConfigureAwait(false);
+        return;
 
-        private static int sleepTime = 30000;
-        private static WireMockServer _server;
+        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
 
-        static void Main(string[] args)
+        if (!WireMockServerSettingsParser.TryParseArguments(args, out var settings, new WireMockLog4NetLogger()))
         {
-            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
-
-            if (!WireMockServerSettingsParser.TryParseArguments(args, out var settings, new WireMockLog4NetLogger()))
-            {
-                return;
-            }
-
-            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
-
-            _server = WireMockServer.Start(settings);
-
-            //_server.Given(Request.Create().WithPath("/api/sap")
-            //    .UsingPost()
-            //    .WithBody((IBodyData xmlData) =>
-            //    {
-            //        //xmlData is always null
-            //        return true;
-            //    }))
-            //    .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
-
-            //_server
-            //    .Given(Request.Create()
-            //        .UsingAnyMethod())
-            //    .RespondWith(Response.Create()
-            //        .WithTransformer()
-            //        .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));
-
-            Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
-
-            Console.CancelKeyPress += (s, e) =>
-            {
-                Stop("CancelKeyPress");
-            };
-
-            System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += ctx =>
-            {
-                Stop("AssemblyLoadContext.Default.Unloading");
-            };
-
-            while (true)
-            {
-                Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
-                Thread.Sleep(sleepTime);
-            }
+            return;
         }
 
-        private static void Stop(string why)
+        settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+        _server = WireMockServer.Start(settings);
+
+        //_server.Given(Request.Create().WithPath("/api/sap")
+        //    .UsingPost()
+        //    .WithBody((IBodyData xmlData) =>
+        //    {
+        //        //xmlData is always null
+        //        return true;
+        //    }))
+        //    .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
+
+        //_server
+        //    .Given(Request.Create()
+        //        .UsingAnyMethod())
+        //    .RespondWith(Response.Create()
+        //        .WithTransformer()
+        //        .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));
+
+        Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
+
+        Console.CancelKeyPress += (s, e) =>
         {
-            Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopping because '{why}'");
-            _server.Stop();
-            Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopped");
+            Stop("CancelKeyPress");
+        };
+
+        System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += ctx =>
+        {
+            Stop("AssemblyLoadContext.Default.Unloading");
+        };
+
+        while (true)
+        {
+            Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
+            Thread.Sleep(sleepTime);
         }
     }
-}
+
+    private static void Stop(string why)
+    {
+        Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopping because '{why}'");
+        _server.Stop();
+        Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopped");
+    }
+
+    private static async Task TestAsync()
+    {
+        for (var i = 0; i < 20; i++)
+        {
+            var server = WireMockServer.Start();
+
+            server
+                .Given(
+                    Request.Create().WithPath("/some/thing").UsingGet()
+                )
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(200)
+                        .WithHeader("Content-Type", "text/plain")
+                        .WithBody("Hello world! : " + i)
+                );
+
+            server
+                .Given(
+                    Request.Create().WithPath("/some/thing").UsingGet()
+                )
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(200)
+                        .WithHeader("Content-Type", "text/plain")
+                        .WithBody("Hello world duplicate! : " + i)
+                );
+
+            var client = server.CreateClient();
+
+            var response = await client.GetAsync($"{server.Url}/some/thing").ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            Console.WriteLine($"counter {i} value:{content}");
+
+            server.Reset();
+            server.Dispose();
+            server.Stop();
+        }
+    }
+}

src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs

@@ -14,6 +14,11 @@ public class MappingModel
     /// </summary>
     public Guid? Guid { get; set; }
 
+    /// <summary>
+    /// The datetime when this mapping was created or updated.
+    /// </summary>
+    public DateTime? UpdatedAt { get; set; }
+
     /// <summary>
     /// Gets or sets the TimeSettings when which this mapping should be used.
     /// </summary>

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

@@ -96,4 +96,16 @@ public class SettingsModel
     /// Default value = "All".
     /// </summary>
     public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
+
+#if NETSTANDARD1_3_OR_GREATER || NET461
+    /// <summary>
+    /// Server client certificate mode
+    /// </summary>
+    public ClientCertificateMode ClientCertificateMode { get; set; }
+
+    /// <summary>
+    /// Whether to accept any client certificate
+    /// </summary>
+    public bool AcceptAnyClientCertificate { get; set; }
+#endif
 }

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if NETSTANDARD1_3_OR_GREATER || NET461
+using System.Security.Cryptography.X509Certificates;
+#endif
 using WireMock.Types;
 using WireMock.Util;
 
@@ -134,4 +137,11 @@ public interface IRequestMessage
     /// Gets the origin
     /// </summary>
     string Origin { get; }
+
+#if NETSTANDARD1_3_OR_GREATER || NET461
+    /// <summary>
+    /// Gets the connection's client certificate
+    /// </summary>
+    X509Certificate2? ClientCertificate { get; }
+#endif
 }

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

@@ -0,0 +1,31 @@
+namespace WireMock.Types;
+
+#if NETSTANDARD1_3_OR_GREATER || NET461
+/// <summary>
+/// Describes the client certificate requirements for a HTTPS connection.
+/// This enum is the same as https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.https.clientcertificatemode
+/// </summary>
+public enum ClientCertificateMode
+{
+    /// <summary>
+    /// A client certificate is not required and will not be requested from clients.
+    /// </summary>
+    NoCertificate,
+
+    /// <summary>
+    /// A client certificate will be requested; however, authentication will not fail if a certificate is not provided by the client.
+    /// </summary>
+    AllowCertificate,
+
+    /// <summary>
+    /// A client certificate will be requested, and the client must provide a valid certificate for authentication to succeed.
+    /// </summary>
+    RequireCertificate,
+
+    /// <summary>
+    /// A client certificate is not required and will not be requested from clients at the start of the connection.
+    /// It may be requested by the application later.
+    /// </summary>
+    DelayCertificate,
+}
+#endif

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

@@ -1,36 +1,25 @@
-using System;
+namespace WireMock.Types;
 
-namespace WireMock.Types
+/// <summary>
+/// Logic to use when replace a JSON node using the Transformer.
+/// </summary>
+public enum ReplaceNodeOptions
 {
     /// <summary>
-    /// Flags to use when replace a JSON node using the Transformer.
+    /// Try to evaluate a templated value.
+    /// In case this is valid, return the value and if the value can be converted to a primitive type, use that value.
     /// </summary>
-    [Flags]
-    public enum ReplaceNodeOptions
-    {
-        /// <summary>
-        /// Default
-        /// </summary>
-        None = 0
+    EvaluateAndTryToConvert = 0,
 
-        ///// <summary>
-        ///// Replace boolean string value to a real boolean value. (This is used by default to maintain backward compatibility.)
-        ///// </summary>
-        //Bool = 0b00000001,
+    /// <summary>
+    /// Try to evaluate a templated value.
+    /// In case this is valid, return the value, else fallback to the parse behavior.
+    /// </summary>
+    Evaluate = 1,
 
-        ///// <summary>
-        ///// Replace integer string value to a real integer value.
-        ///// </summary>
-        //Integer = 0b00000010,
-
-        ///// <summary>
-        ///// Replace long string value to a real long value.
-        ///// </summary>
-        //Long = 0b00000100,
-
-        ///// <summary>
-        ///// Replace all string values to a real values.
-        ///// </summary>
-        //All = Bool | Integer | Long
-    }
+    /// <summary>
+    /// Parse templated string to a templated string.
+    /// (keep a templated string value as string value).
+    /// </summary>
+    Parse = 2
 }

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

@@ -1,23 +1,22 @@
-namespace WireMock.Types
+namespace WireMock.Types;
+
+/// <summary>
+/// The ResponseMessage Transformers
+/// </summary>
+public enum TransformerType
 {
     /// <summary>
-    /// The ResponseMessage Transformers
+    /// https://github.com/Handlebars-Net/Handlebars.Net
     /// </summary>
-    public enum TransformerType
-    {
-        /// <summary>
-        /// https://github.com/Handlebars-Net/Handlebars.Net
-        /// </summary>
-        Handlebars,
+    Handlebars,
 
-        /// <summary>
-        /// https://github.com/scriban/scriban : default
-        /// </summary>
-        Scriban,
+    /// <summary>
+    /// https://github.com/scriban/scriban : default
+    /// </summary>
+    Scriban,
 
-        /// <summary>
-        /// https://github.com/scriban/scriban : DotLiquid
-        /// </summary>
-        ScribanDotLiquid
-    }
+    /// <summary>
+    /// https://github.com/scriban/scriban : DotLiquid
+    /// </summary>
+    ScribanDotLiquid
 }

src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj

@@ -4,7 +4,7 @@
         <Description>Commonly used models, enumerations and types.</Description>
         <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;net451;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net45;net451;net461;netstandard1.0;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591;8603</NoWarn>
         <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
@@ -41,11 +41,15 @@
         </PackageReference>
     </ItemGroup>
 
-    <!--<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-        <PackageReference Include="Nullable" Version="1.2.1">
+    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetFramework)' != 'netstandard1.0'">
+      <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net46" Version="1.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-    </ItemGroup>-->
+    </ItemGroup>
 
 </Project>

src/WireMock.Net/Http/WebhookSender.cs

@@ -51,14 +51,14 @@ internal class WebhookSender
             switch (webhookRequest.TransformerType)
             {
                 case TransformerType.Handlebars:
-                    var factoryHandlebars = new HandlebarsContextFactory(_settings.FileSystemHandler, _settings.HandlebarsRegistrationCallback);
-                    transformer = new Transformer(factoryHandlebars);
+                    var factoryHandlebars = new HandlebarsContextFactory(_settings);
+                    transformer = new Transformer(_settings, factoryHandlebars);
                     break;
 
                 case TransformerType.Scriban:
                 case TransformerType.ScribanDotLiquid:
                     var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType);
-                    transformer = new Transformer(factoryDotLiquid);
+                    transformer = new Transformer(_settings, factoryDotLiquid);
                     break;
 
                 default:

src/WireMock.Net/IMapping.cs

@@ -17,6 +17,11 @@ public interface IMapping
     /// </summary>
     Guid Guid { get; }
 
+    /// <summary>
+    /// The datetime when this mapping was created or updated.
+    /// </summary>
+    public DateTime? UpdatedAt { get; set; }
+
     /// <summary>
     /// Gets the TimeSettings (Start, End and TTL).
     /// </summary>

src/WireMock.Net/Mapping.cs

@@ -15,6 +15,9 @@ public class Mapping : IMapping
     /// <inheritdoc />
     public Guid Guid { get; }
 
+    /// <inheritdoc />
+    public DateTime? UpdatedAt { get; set; }
+
     /// <inheritdoc />
     public string? Title { get; }
 
@@ -73,6 +76,7 @@ public class Mapping : IMapping
     /// Initializes a new instance of the <see cref="Mapping"/> class.
     /// </summary>
     /// <param name="guid">The unique identifier.</param>
+    /// <param name="updatedAt">The datetime when this mapping was created.</param>
     /// <param name="title">The unique title (can be null).</param>
     /// <param name="description">The description (can be null).</param>
     /// <param name="path">The full file path from this mapping title (can be null).</param>
@@ -89,6 +93,7 @@ public class Mapping : IMapping
     /// <param name="timeSettings">The TimeSettings. [Optional]</param>
     public Mapping(
         Guid guid,
+        DateTime updatedAt,
         string? title,
         string? description,
         string? path,
@@ -105,6 +110,7 @@ public class Mapping : IMapping
         ITimeSettings? timeSettings)
     {
         Guid = guid;
+        UpdatedAt = updatedAt;
         Title = title;
         Description = description;
         Path = path;

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

@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using WireMock.HttpsCertificate;
+using CertificateLoader = WireMock.HttpsCertificate.CertificateLoader;
 
 namespace WireMock.Owin
 {
@@ -26,21 +27,25 @@ namespace WireMock.Owin
                 {
                     kestrelOptions.ListenAnyIP(urlDetail.Port, listenOptions =>
                     {
-                        if (wireMockMiddlewareOptions.CustomCertificateDefined)
+                        listenOptions.UseHttps(options =>
                         {
-                            listenOptions.UseHttps(CertificateLoader.LoadCertificate(
-                                wireMockMiddlewareOptions.X509StoreName,
-                                wireMockMiddlewareOptions.X509StoreLocation,
-                                wireMockMiddlewareOptions.X509ThumbprintOrSubjectName,
-                                wireMockMiddlewareOptions.X509CertificateFilePath,
-                                wireMockMiddlewareOptions.X509CertificatePassword,
-                                urlDetail.Host)
-                            );
-                        }
-                        else
-                        {
-                            listenOptions.UseHttps();
-                        }
+                            if (wireMockMiddlewareOptions.CustomCertificateDefined)
+                            {
+                                options.ServerCertificate = CertificateLoader.LoadCertificate(
+                                    wireMockMiddlewareOptions.X509StoreName,
+                                    wireMockMiddlewareOptions.X509StoreLocation,
+                                    wireMockMiddlewareOptions.X509ThumbprintOrSubjectName,
+                                    wireMockMiddlewareOptions.X509CertificateFilePath,
+                                    wireMockMiddlewareOptions.X509CertificatePassword,
+                                    urlDetail.Host);
+                            }
+
+                            options.ClientCertificateMode = (ClientCertificateMode) wireMockMiddlewareOptions.ClientCertificateMode;
+                            if (wireMockMiddlewareOptions.AcceptAnyClientCertificate)
+                            {
+                                options.ClientCertificateValidation = (_, _, _) => true;
+                            }
+                        });
                     });
                 }
                 else

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.HttpsCertificate;
@@ -23,21 +24,22 @@ internal partial class AspNetCoreSelfHost
         {
             if (urlDetail.IsHttps)
             {
-                if (wireMockMiddlewareOptions.CustomCertificateDefined)
+                options.UseHttps(new HttpsConnectionFilterOptions
                 {
-                    options.UseHttps(CertificateLoader.LoadCertificate(
-                        wireMockMiddlewareOptions.X509StoreName,
-                        wireMockMiddlewareOptions.X509StoreLocation,
-                        wireMockMiddlewareOptions.X509ThumbprintOrSubjectName,
-                        wireMockMiddlewareOptions.X509CertificateFilePath,
-                        wireMockMiddlewareOptions.X509CertificatePassword,
-                        urlDetail.Host)
-                    );
-                }
-                else
-                {
-                    options.UseHttps(PublicCertificateHelper.GetX509Certificate2());
-                }
+                    ServerCertificate = wireMockMiddlewareOptions.CustomCertificateDefined
+                        ? CertificateLoader.LoadCertificate(
+                            wireMockMiddlewareOptions.X509StoreName,
+                            wireMockMiddlewareOptions.X509StoreLocation,
+                            wireMockMiddlewareOptions.X509ThumbprintOrSubjectName,
+                            wireMockMiddlewareOptions.X509CertificateFilePath,
+                            wireMockMiddlewareOptions.X509CertificatePassword,
+                            urlDetail.Host)
+                        : PublicCertificateHelper.GetX509Certificate2(),
+                    ClientCertificateMode = (ClientCertificateMode) wireMockMiddlewareOptions.ClientCertificateMode,
+                    ClientCertificateValidation = wireMockMiddlewareOptions.AcceptAnyClientCertificate
+                        ? (_, _, _) => true
+                        : null,
+                });
             }
         }
     }

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -42,6 +42,10 @@ internal interface IWireMockMiddlewareOptions
     Action<IServiceCollection>? AdditionalServiceRegistration { get; set; }
 
     CorsPolicyOptions? CorsPolicyOptions { get; set; }
+
+    ClientCertificateMode ClientCertificateMode { get; set; }
+
+    bool AcceptAnyClientCertificate { get; set; }
 #endif
 
     IFileSystemHandler? FileSystemHandler { get; set; }

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

@@ -68,7 +68,21 @@ namespace WireMock.Owin.Mappers
                 body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }
 
-            return new RequestMessage(options, urlDetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.UtcNow };
+            return new RequestMessage(
+                options,
+                urlDetails,
+                method,
+                clientIP,
+                body,
+                headers,
+                cookies
+#if USE_ASPNETCORE
+                , await request.HttpContext.Connection.GetClientCertificateAsync()
+#endif
+                )
+            {
+                DateTime = DateTime.UtcNow
+            };
         }
 
         private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)

src/WireMock.Net/Owin/MappingMatcher.cs

@@ -12,13 +12,13 @@ internal class MappingMatcher : IMappingMatcher
 
     public MappingMatcher(IWireMockMiddlewareOptions options)
     {
-        Guard.NotNull(options, nameof(options));
-
-        _options = options;
+        _options = Guard.NotNull(options);
     }
 
     public (MappingMatcherResult? Match, MappingMatcherResult? Partial) FindBestMatch(RequestMessage request)
     {
+        Guard.NotNull(request);
+
         var possibleMappings = new List<MappingMatcherResult>();
 
         foreach (var mapping in _options.Mappings.Values.Where(m => m.TimeSettings.IsValid()))
@@ -41,8 +41,7 @@ internal class MappingMatcher : IMappingMatcher
 
         var partialMappings = possibleMappings
             .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)
-            .OrderBy(m => m.RequestMatchResult)
-            .ThenBy(m => m.Mapping.Priority)
+            .OrderBy(m => m.RequestMatchResult).ThenBy(m => m.Mapping.Priority).ThenByDescending(m => m.Mapping.UpdatedAt)
             .ToList();
         var partialMatch = partialMappings.FirstOrDefault(pm => pm.RequestMatchResult.AverageTotalScore > 0.0);
 
@@ -53,7 +52,7 @@ internal class MappingMatcher : IMappingMatcher
 
         var match = possibleMappings
             .Where(m => m.RequestMatchResult.IsPerfectMatch)
-            .OrderBy(m => m.Mapping.Priority).ThenBy(m => m.RequestMatchResult)
+            .OrderBy(m => m.Mapping.Priority).ThenBy(m => m.RequestMatchResult).ThenByDescending(m => m.Mapping.UpdatedAt)
             .FirstOrDefault();
 
         return (match, partialMatch);

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -42,6 +42,11 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions
     public Action<IServiceCollection>? AdditionalServiceRegistration { get; set; }
 
     public CorsPolicyOptions? CorsPolicyOptions { get; set; }
+
+    public ClientCertificateMode ClientCertificateMode { get; set; }
+
+    /// <inheritdoc />
+    public bool AcceptAnyClientCertificate { get; set; }
 #endif
 
     /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -17,7 +17,7 @@ internal class ProxyHelper
     public ProxyHelper(WireMockServerSettings settings)
     {
         _settings = Guard.NotNull(settings);
-        _proxyMappingConverter = new ProxyMappingConverter(settings, new GuidUtils());
+        _proxyMappingConverter = new ProxyMappingConverter(settings, new GuidUtils(), new DateTimeUtils());
     }
 
     public async Task<(IResponseMessage Message, IMapping? Mapping)> SendAsync(

src/WireMock.Net/RequestMessage.cs

@@ -4,6 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+#if USE_ASPNETCORE
+using System.Security.Cryptography.X509Certificates;
+#endif
 using Stef.Validation;
 using WireMock.Models;
 using WireMock.Owin;
@@ -92,6 +95,11 @@ public class RequestMessage : IRequestMessage
     /// <inheritdoc cref="IRequestMessage.Origin" />
     public string Origin { get; }
 
+#if USE_ASPNETCORE
+    /// <inheritdoc cref="IRequestMessage.ClientCertificate" />
+    public X509Certificate2? ClientCertificate { get; }
+#endif
+
     /// <summary>
     /// Used for Unit Testing
     /// </summary>
@@ -115,13 +123,20 @@ public class RequestMessage : IRequestMessage
     /// <param name="bodyData">The BodyData.</param>
     /// <param name="headers">The headers.</param>
     /// <param name="cookies">The cookies.</param>
+#if USE_ASPNETCORE
+    /// <param name="clientCertificate">The client certificate</param>
+#endif
     internal RequestMessage(
         IWireMockMiddlewareOptions? options,
         UrlDetails urlDetails, string method,
         string clientIP,
         IBodyData? bodyData = null,
         IDictionary<string, string[]>? headers = null,
-        IDictionary<string, string>? cookies = null)
+        IDictionary<string, string>? cookies = null
+#if USE_ASPNETCORE
+        , X509Certificate2? clientCertificate = null
+#endif
+        )
     {
         Guard.NotNull(urlDetails, nameof(urlDetails));
         Guard.NotNull(method, nameof(method));
@@ -156,6 +171,9 @@ public class RequestMessage : IRequestMessage
         Cookies = cookies;
         RawQuery = urlDetails.Url.Query;
         Query = QueryStringParser.Parse(RawQuery, options?.QueryParameterMultipleValueSupport);
+#if USE_ASPNETCORE
+        ClientCertificate = clientCertificate;
+#endif
     }
 
     /// <summary>

src/WireMock.Net/ResponseBuilders/ITransformResponseBuilder.cs

@@ -29,5 +29,5 @@ public interface ITransformResponseBuilder : IDelayResponseBuilder
     /// <returns>
     /// The <see cref="IResponseBuilder"/>.
     /// </returns>
-    IResponseBuilder WithTransformer(TransformerType transformerType = TransformerType.Handlebars, bool transformContentFromBodyAsFile = false, ReplaceNodeOptions options = ReplaceNodeOptions.None);
+    IResponseBuilder WithTransformer(TransformerType transformerType = TransformerType.Handlebars, bool transformContentFromBodyAsFile = false, ReplaceNodeOptions options = ReplaceNodeOptions.Evaluate);
 }

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -207,7 +207,7 @@ public partial class Response : IResponseBuilder
     }
 
     /// <inheritdoc />
-    public IResponseBuilder WithTransformer(TransformerType transformerType, bool transformContentFromBodyAsFile = false, ReplaceNodeOptions options = ReplaceNodeOptions.None)
+    public IResponseBuilder WithTransformer(TransformerType transformerType, bool transformContentFromBodyAsFile = false, ReplaceNodeOptions options = ReplaceNodeOptions.Evaluate)
     {
         UseTransformer = true;
         TransformerType = transformerType;
@@ -314,14 +314,14 @@ public partial class Response : IResponseBuilder
             switch (TransformerType)
             {
                 case TransformerType.Handlebars:
-                    var factoryHandlebars = new HandlebarsContextFactory(settings.FileSystemHandler, settings.HandlebarsRegistrationCallback);
-                    responseMessageTransformer = new Transformer(factoryHandlebars);
+                    var factoryHandlebars = new HandlebarsContextFactory(settings);
+                    responseMessageTransformer = new Transformer(settings, factoryHandlebars);
                     break;
 
                 case TransformerType.Scriban:
                 case TransformerType.ScribanDotLiquid:
                     var factoryDotLiquid = new ScribanContextFactory(settings.FileSystemHandler, TransformerType);
-                    responseMessageTransformer = new Transformer(factoryDotLiquid);
+                    responseMessageTransformer = new Transformer(settings, factoryDotLiquid);
                     break;
 
                 default:

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -40,6 +40,7 @@ internal class MappingConverter
         var mappingModel = new MappingModel
         {
             Guid = mapping.Guid,
+            UpdatedAt = mapping.UpdatedAt,
             TimeSettings = TimeSettingsMapper.Map(mapping.TimeSettings),
             Title = mapping.Title,
             Description = mapping.Description,

src/WireMock.Net/Serialization/ProxyMappingConverter.cs

@@ -1,7 +1,7 @@
-using Stef.Validation;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Stef.Validation;
 using WireMock.Constants;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
@@ -17,11 +17,13 @@ internal class ProxyMappingConverter
 {
     private readonly WireMockServerSettings _settings;
     private readonly IGuidUtils _guidUtils;
+    private readonly IDateTimeUtils _dateTimeUtils;
 
-    public ProxyMappingConverter(WireMockServerSettings settings, IGuidUtils guidUtils)
+    public ProxyMappingConverter(WireMockServerSettings settings, IGuidUtils guidUtils, IDateTimeUtils dateTimeUtils)
     {
         _settings = Guard.NotNull(settings);
         _guidUtils = Guard.NotNull(guidUtils);
+        _dateTimeUtils = Guard.NotNull(dateTimeUtils);
     }
 
     public IMapping ToMapping(IMapping? mapping, ProxyAndRecordSettings proxyAndRecordSettings, IRequestMessage requestMessage, ResponseMessage responseMessage)
@@ -162,6 +164,7 @@ internal class ProxyMappingConverter
         return new Mapping
         (
             guid: _guidUtils.NewGuid(),
+            updatedAt: _dateTimeUtils.UtcNow,
             title: title,
             description: description,
             path: null,

src/WireMock.Net/Serialization/WebhookMapper.cs

@@ -39,7 +39,7 @@ internal static class WebhookMapper
 
             if (!Enum.TryParse<ReplaceNodeOptions>(model.Request.TransformerReplaceNodeOptions, out var option))
             {
-                option = ReplaceNodeOptions.None;
+                option = ReplaceNodeOptions.Evaluate;
             }
             webhook.Request.TransformerReplaceNodeOptions = option;
         }

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -29,10 +29,12 @@ internal class RespondWithAProvider : IRespondWithAProvider
     private readonly IRequestMatcher _requestMatcher;
     private readonly WireMockServerSettings _settings;
     private readonly bool _saveToFile;
+    private readonly IGuidUtils _guidUtils = new GuidUtils();
+    private readonly IDateTimeUtils _dateTimeUtils = new DateTimeUtils();
 
     private bool _useWebhookFireAndForget;
 
-    public Guid Guid { get; private set; } = Guid.NewGuid();
+    public Guid Guid { get; private set; }
 
     public IWebhook[]? Webhooks { get; private set; }
 
@@ -45,12 +47,19 @@ internal class RespondWithAProvider : IRespondWithAProvider
     /// <param name="requestMatcher">The request matcher.</param>
     /// <param name="settings">The WireMockServerSettings.</param>
     /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-    public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, WireMockServerSettings settings, bool saveToFile = false)
+    public RespondWithAProvider(
+        RegistrationCallback registrationCallback,
+        IRequestMatcher requestMatcher,
+        WireMockServerSettings settings,
+        bool saveToFile = false
+    )
     {
-        _registrationCallback = registrationCallback;
-        _requestMatcher = requestMatcher;
-        _settings = settings;
-        _saveToFile = saveToFile;
+        _registrationCallback = Guard.NotNull(registrationCallback);
+        _requestMatcher = Guard.NotNull(requestMatcher);
+        _settings = Guard.NotNull(settings);
+        _saveToFile = Guard.NotNull(saveToFile);
+
+        Guid = _guidUtils.NewGuid();
     }
 
     /// <summary>
@@ -59,7 +68,24 @@ internal class RespondWithAProvider : IRespondWithAProvider
     /// <param name="provider">The provider.</param>
     public void RespondWith(IResponseProvider provider)
     {
-        _registrationCallback(new Mapping(Guid, _title, _description, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState, Webhooks, _useWebhookFireAndForget, TimeSettings), _saveToFile);
+        var mapping = new Mapping(
+            Guid,
+            _dateTimeUtils.UtcNow,
+            _title,
+            _description,
+            _path,
+            _settings,
+            _requestMatcher,
+            provider,
+            _priority,
+            _scenario,
+            _executionConditionState,
+            _nextState,
+            _timesInSameState,
+            Webhooks,
+            _useWebhookFireAndForget,
+            TimeSettings);
+        _registrationCallback(mapping, _saveToFile);
     }
 
     /// <inheritdoc />

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

@@ -226,7 +226,9 @@ public partial class WireMockServer
             QueryParameterMultipleValueSupport = _settings.QueryParameterMultipleValueSupport,
 
 #if USE_ASPNETCORE
-            CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString()
+            CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString(),
+            ClientCertificateMode = _settings.ClientCertificateMode,
+            AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate
 #endif
         };
 
@@ -275,6 +277,9 @@ public partial class WireMockServer
             _settings.CorsPolicyOptions = corsPolicyOptions;
             _options.CorsPolicyOptions = corsPolicyOptions;
         }
+
+        _options.ClientCertificateMode = _settings.ClientCertificateMode;
+        _options.AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate;
 #endif
 
         return ResponseMessageBuilder.Create("Settings updated");

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

@@ -250,7 +250,7 @@ public partial class WireMockServer
 
             if (!Enum.TryParse<ReplaceNodeOptions>(responseModel.TransformerReplaceNodeOptions, out var option))
             {
-                option = ReplaceNodeOptions.None;
+                option = ReplaceNodeOptions.Evaluate;
             }
             responseBuilder = responseBuilder.WithTransformer(
                 transformerType,

src/WireMock.Net/Server/WireMockServer.cs

@@ -107,25 +107,42 @@ public partial class WireMockServer : IWireMockServer
     #region HttpClient
     /// <summary>
     /// Create a <see cref="HttpClient"/> which can be used to call this instance.
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
     /// </summary>
     [PublicAPI]
-    public HttpClient CreateClient()
+    public HttpClient CreateClient(params DelegatingHandler[] handlers)
     {
         if (!IsStarted)
         {
             throw new InvalidOperationException("Unable to create HttpClient because the service is not started.");
         }
 
-        var client = HttpClientFactory2.Create();
+        var client = HttpClientFactory2.Create(handlers);
         client.BaseAddress = new Uri(Url!);
         return client;
     }
 
     /// <summary>
     /// Create <see cref="HttpClient"/>s (one for each URL) which can be used to call this instance.
+    /// <param name="innerHandler">The inner handler represents the destination of the HTTP message channel.</param>
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
     /// </summary>
     [PublicAPI]
-    public HttpClient[] CreateClients()
+    public HttpClient[] CreateClients(HttpMessageHandler innerHandler, params DelegatingHandler[] handlers)
     {
         if (!IsStarted)
         {
@@ -134,7 +151,7 @@ public partial class WireMockServer : IWireMockServer
 
         return Urls.Select(url =>
         {
-            var client = HttpClientFactory2.Create();
+            var client = HttpClientFactory2.Create(innerHandler, handlers);
             client.BaseAddress = new Uri(url);
             return client;
         }).ToArray();
@@ -314,6 +331,8 @@ public partial class WireMockServer : IWireMockServer
 #if USE_ASPNETCORE
         _options.AdditionalServiceRegistration = _settings.AdditionalServiceRegistration;
         _options.CorsPolicyOptions = _settings.CorsPolicyOptions;
+        _options.ClientCertificateMode = _settings.ClientCertificateMode;
+        _options.AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate;
 
         _httpServer = new AspNetCoreSelfHost(_options, urlOptions);
 #else
@@ -524,9 +543,10 @@ public partial class WireMockServer : IWireMockServer
 
     private void RegisterMapping(IMapping mapping, bool saveToFile)
     {
-        // Check a mapping exists with the same Guid, if so, replace it.
+        // Check a mapping exists with the same Guid. If so, update the datetime and replace it.
         if (_options.Mappings.ContainsKey(mapping.Guid))
         {
+            mapping.UpdatedAt = DateTime.UtcNow;
             _options.Mappings[mapping.Guid] = mapping;
         }
         else

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -10,272 +10,292 @@ using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.RegularExpressions;
 using WireMock.Types;
+using System.Globalization;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
 #endif
 
-namespace WireMock.Settings
+namespace WireMock.Settings;
+
+/// <summary>
+/// WireMockServerSettings
+/// </summary>
+public class WireMockServerSettings
 {
     /// <summary>
-    /// WireMockServerSettings
+    /// Gets or sets the http port.
     /// </summary>
-    public class WireMockServerSettings
-    {
-        /// <summary>
-        /// Gets or sets the http port.
-        /// </summary>
-        [PublicAPI]
-        public int? Port { get; set; }
+    [PublicAPI]
+    public int? Port { get; set; }
 
-        /// <summary>
-        /// Gets or sets the use SSL.
-        /// </summary>
-        // ReSharper disable once InconsistentNaming
-        [PublicAPI]
-        public bool? UseSSL { get; set; }
+    /// <summary>
+    /// Gets or sets the use SSL.
+    /// </summary>
+    // ReSharper disable once InconsistentNaming
+    [PublicAPI]
+    public bool? UseSSL { get; set; }
 
-        /// <summary>
-        /// Defines on which scheme (http/https) to host. (This overrides the <c>UseSSL</c> value).
-        /// </summary>
-        [PublicAPI]
-        public HostingScheme? HostingScheme { get; set; }
+    /// <summary>
+    /// Defines on which scheme (http/https) to host. (This overrides the <c>UseSSL</c> value).
+    /// </summary>
+    [PublicAPI]
+    public HostingScheme? HostingScheme { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether to start admin interface.
-        /// </summary>
-        [PublicAPI]
-        public bool? StartAdminInterface { get; set; }
+    /// <summary>
+    /// Gets or sets whether to start admin interface.
+    /// </summary>
+    [PublicAPI]
+    public bool? StartAdminInterface { get; set; }
 
-        /// <summary>
-        /// Gets or sets if the static mappings should be read at startup.
-        /// </summary>
-        [PublicAPI]
-        public bool? ReadStaticMappings { get; set; }
+    /// <summary>
+    /// Gets or sets if the static mappings should be read at startup.
+    /// </summary>
+    [PublicAPI]
+    public bool? ReadStaticMappings { get; set; }
 
-        /// <summary>
-        /// Watch the static mapping files + folder for changes when running.
-        /// </summary>
-        [PublicAPI]
-        public bool? WatchStaticMappings { get; set; }
+    /// <summary>
+    /// Watch the static mapping files + folder for changes when running.
+    /// </summary>
+    [PublicAPI]
+    public bool? WatchStaticMappings { get; set; }
 
-        /// <summary>
-        /// A value indicating whether subdirectories within the static mappings path should be monitored.
-        /// </summary>
-        [PublicAPI]
-        public bool? WatchStaticMappingsInSubdirectories { get; set; }
+    /// <summary>
+    /// A value indicating whether subdirectories within the static mappings path should be monitored.
+    /// </summary>
+    [PublicAPI]
+    public bool? WatchStaticMappingsInSubdirectories { get; set; }
 
-        /// <summary>
-        /// Gets or sets if the proxy and record settings.
-        /// </summary>
-        [PublicAPI]
-        public ProxyAndRecordSettings? ProxyAndRecordSettings { get; set; }
+    /// <summary>
+    /// Gets or sets if the proxy and record settings.
+    /// </summary>
+    [PublicAPI]
+    public ProxyAndRecordSettings? ProxyAndRecordSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets the urls.
-        /// </summary>
-        [PublicAPI]
-        public string[]? Urls { get; set; }
+    /// <summary>
+    /// Gets or sets the urls.
+    /// </summary>
+    [PublicAPI]
+    public string[]? Urls { get; set; }
 
-        /// <summary>
-        /// StartTimeout
-        /// </summary>
-        [PublicAPI]
-        public int StartTimeout { get; set; } = 10000;
+    /// <summary>
+    /// StartTimeout
+    /// </summary>
+    [PublicAPI]
+    public int StartTimeout { get; set; } = 10000;
 
-        /// <summary>
-        /// Allow Partial Mapping (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? AllowPartialMapping { get; set; }
+    /// <summary>
+    /// Allow Partial Mapping (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? AllowPartialMapping { get; set; }
 
-        /// <summary>
-        /// The username needed for __admin access.
-        /// </summary>
-        [PublicAPI]
-        public string? AdminUsername { get; set; }
+    /// <summary>
+    /// The username needed for __admin access.
+    /// </summary>
+    [PublicAPI]
+    public string? AdminUsername { get; set; }
 
-        /// <summary>
-        /// The password needed for __admin access.
-        /// </summary>
-        [PublicAPI]
-        public string? AdminPassword { get; set; }
+    /// <summary>
+    /// The password needed for __admin access.
+    /// </summary>
+    [PublicAPI]
+    public string? AdminPassword { get; set; }
 
-        /// <summary>
-        /// The AzureAD Tenant needed for __admin access.
-        /// </summary>
-        [PublicAPI]
-        public string? AdminAzureADTenant { get; set; }
+    /// <summary>
+    /// The AzureAD Tenant needed for __admin access.
+    /// </summary>
+    [PublicAPI]
+    public string? AdminAzureADTenant { get; set; }
 
-        /// <summary>
-        /// The AzureAD Audience / Resource for __admin access.
-        /// </summary>
-        [PublicAPI]
-        public string? AdminAzureADAudience { get; set; }
+    /// <summary>
+    /// The AzureAD Audience / Resource for __admin access.
+    /// </summary>
+    [PublicAPI]
+    public string? AdminAzureADAudience { get; set; }
 
-        /// <summary>
-        /// The RequestLog expiration in hours (optional).
-        /// </summary>
-        [PublicAPI]
-        public int? RequestLogExpirationDuration { get; set; }
+    /// <summary>
+    /// The RequestLog expiration in hours (optional).
+    /// </summary>
+    [PublicAPI]
+    public int? RequestLogExpirationDuration { get; set; }
 
-        /// <summary>
-        /// The MaxRequestLog count (optional).
-        /// </summary>
-        [PublicAPI]
-        public int? MaxRequestLogCount { get; set; }
+    /// <summary>
+    /// The MaxRequestLog count (optional).
+    /// </summary>
+    [PublicAPI]
+    public int? MaxRequestLogCount { get; set; }
 
-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<object>? PreWireMockMiddlewareInit { get; set; }
+    /// <summary>
+    /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
+    /// </summary>
+    [PublicAPI]
+    [JsonIgnore]
+    public Action<object>? PreWireMockMiddlewareInit { get; set; }
 
-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<object>? PostWireMockMiddlewareInit { get; set; }
+    /// <summary>
+    /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
+    /// </summary>
+    [PublicAPI]
+    [JsonIgnore]
+    public Action<object>? PostWireMockMiddlewareInit { get; set; }
+
+#if USE_ASPNETCORE
+    /// <summary>
+    /// Action which is called with IServiceCollection when ASP.NET Core DI is being configured. [Optional]
+    /// </summary>
+    [PublicAPI]
+    [JsonIgnore]
+    public Action<IServiceCollection>? AdditionalServiceRegistration { get; set; }
+
+    /// <summary>
+    /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+    /// </summary>
+    [PublicAPI]
+    public CorsPolicyOptions? CorsPolicyOptions { get; set; }
+#endif
+
+    /// <summary>
+    /// The IWireMockLogger which logs Debug, Info, Warning or Error
+    /// </summary>
+    [PublicAPI]
+    [JsonIgnore]
+    public IWireMockLogger Logger { get; set; } = null!;
+
+    /// <summary>
+    /// Handler to interact with the file system to read and write static mapping files.
+    /// </summary>
+    [PublicAPI]
+    [JsonIgnore]
+    public IFileSystemHandler FileSystemHandler { get; set; } = null!;
+
+    /// <summary>
+    /// Action which can be used to add additional Handlebars registrations. [Optional]
+    /// </summary>
+    [PublicAPI]
+    [JsonIgnore]
+    public Action<IHandlebars, IFileSystemHandler>? HandlebarsRegistrationCallback { get; set; }
+
+    /// <summary>
+    /// Allow the usage of CSharpCodeMatcher (default is not allowed).
+    /// </summary>
+    [PublicAPI]
+    public bool? AllowCSharpCodeMatcher { get; set; }
+
+    /// <summary>
+    /// Allow a Body for all HTTP Methods. (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? AllowBodyForAllHttpMethods { get; set; }
+
+    /// <summary>
+    /// Allow only a HttpStatus Code in the response which is defined. (default set to false).
+    /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
+    /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
+    /// </summary>
+    [PublicAPI]
+    public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
+
+    /// <summary>
+    /// Set to true to disable Json deserialization when processing requests. (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? DisableJsonBodyParsing { get; set; }
+
+    /// <summary>
+    /// Disable support for GZip and Deflate request body decompression. (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? DisableRequestBodyDecompressing { get; set; }
+
+    /// <summary>
+    /// Handle all requests synchronously. (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? HandleRequestsSynchronously { get; set; }
+
+    /// <summary>
+    /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? ThrowExceptionWhenMatcherFails { get; set; }
+
+    /// <summary>
+    /// If https is used, these settings can be used to configure the CertificateSettings in case a custom certificate instead the default .NET certificate should be used.
+    ///
+    /// X509StoreName and X509StoreLocation should be defined
+    /// OR
+    /// X509CertificateFilePath and X509CertificatePassword should be defined
+    /// </summary>
+    [PublicAPI]
+    public WireMockCertificateSettings? CertificateSettings { get; set; }
+
+    /// <summary>
+    /// Defines if custom CertificateSettings are defined
+    /// </summary>
+    [PublicAPI]
+    public bool CustomCertificateDefined => CertificateSettings?.IsDefined == true;
 
 #if USE_ASPNETCORE
         /// <summary>
-        /// Action which is called with IServiceCollection when ASP.NET Core DI is being configured. [Optional]
+        /// Client certificate mode for the server
         /// </summary>
         [PublicAPI]
-        [JsonIgnore]
-        public Action<IServiceCollection>? AdditionalServiceRegistration { get; set; }
+        public ClientCertificateMode ClientCertificateMode { get; set; }
 
         /// <summary>
-        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+        /// Whether to accept any client certificate
         /// </summary>
-        [PublicAPI]
-        public CorsPolicyOptions? CorsPolicyOptions { get; set; }
+        public bool AcceptAnyClientCertificate { get; set; }
 #endif
 
-        /// <summary>
-        /// The IWireMockLogger which logs Debug, Info, Warning or Error
-        /// </summary>
-        [PublicAPI]
-        [JsonIgnore]
-        public IWireMockLogger Logger { get; set; } = null!;
+    /// <summary>
+    /// Defines the global IWebhookSettings to use.
+    /// </summary>
+    [PublicAPI]
+    public WebhookSettings? WebhookSettings { get; set; }
 
-        /// <summary>
-        /// Handler to interact with the file system to read and write static mapping files.
-        /// </summary>
-        [PublicAPI]
-        [JsonIgnore]
-        public IFileSystemHandler FileSystemHandler { get; set; } = null!;
+    /// <summary>
+    /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to true).
+    /// </summary>
+    [PublicAPI]
+    public bool? UseRegexExtended { get; set; } = true;
 
-        /// <summary>
-        /// Action which can be used to add additional Handlebars registrations. [Optional]
-        /// </summary>
-        [PublicAPI]
-        [JsonIgnore]
-        public Action<IHandlebars, IFileSystemHandler>? HandlebarsRegistrationCallback { get; set; }
+    /// <summary>
+    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/> (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? SaveUnmatchedRequests { get; set; }
 
-        /// <summary>
-        /// Allow the usage of CSharpCodeMatcher (default is not allowed).
-        /// </summary>
-        [PublicAPI]
-        public bool? AllowCSharpCodeMatcher { get; set; }
+    /// <summary>
+    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to false).
+    /// </summary>
+    [PublicAPI]
+    public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
 
-        /// <summary>
-        /// Allow a Body for all HTTP Methods. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? AllowBodyForAllHttpMethods { get; set; }
+    /// <summary>
+    /// See <seealso cref="QueryParameterMultipleValueSupport"/>.
+    ///
+    /// Default value = "All".
+    /// </summary>
+    [PublicAPI]
+    public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 
-        /// <summary>
-        /// Allow only a HttpStatus Code in the response which is defined. (default set to false).
-        /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
-        /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
-        /// </summary>
-        [PublicAPI]
-        public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
+    /// <summary>
+    /// Custom matcher mappings for static mappings
+    /// </summary>
+    [PublicAPI, JsonIgnore]
+    public IDictionary<string, Func<MatcherModel, IMatcher>>? CustomMatcherMappings { get; set; }
 
-        /// <summary>
-        /// Set to true to disable Json deserialization when processing requests. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? DisableJsonBodyParsing { get; set; }
+    /// <summary>
+    /// The <see cref="JsonSerializerSettings"/> used when the a JSON response is generated.
+    /// </summary>
+    [PublicAPI, JsonIgnore]
+    public JsonSerializerSettings? JsonSerializerSettings { get; set; }
 
-        /// <summary>
-        /// Disable support for GZip and Deflate request body decompression. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? DisableRequestBodyDecompressing { get; set; }
-
-        /// <summary>
-        /// Handle all requests synchronously. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? HandleRequestsSynchronously { get; set; }
-
-        /// <summary>
-        /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? ThrowExceptionWhenMatcherFails { get; set; }
-
-        /// <summary>
-        /// If https is used, these settings can be used to configure the CertificateSettings in case a custom certificate instead the default .NET certificate should be used.
-        ///
-        /// X509StoreName and X509StoreLocation should be defined
-        /// OR
-        /// X509CertificateFilePath and X509CertificatePassword should be defined
-        /// </summary>
-        [PublicAPI]
-        public WireMockCertificateSettings? CertificateSettings { get; set; }
-
-        /// <summary>
-        /// Defines if custom CertificateSettings are defined
-        /// </summary>
-        [PublicAPI]
-        public bool CustomCertificateDefined => CertificateSettings?.IsDefined == true;
-
-        /// <summary>
-        /// Defines the global IWebhookSettings to use.
-        /// </summary>
-        [PublicAPI]
-        public WebhookSettings? WebhookSettings { get; set; }
-
-        /// <summary>
-        /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to true).
-        /// </summary>
-        [PublicAPI]
-        public bool? UseRegexExtended { get; set; } = true;
-
-        /// <summary>
-        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/> (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? SaveUnmatchedRequests { get; set; }
-
-        /// <summary>
-        /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
-
-        /// <summary>
-        /// See <seealso cref="QueryParameterMultipleValueSupport"/>.
-        ///
-        /// Default value = "All".
-        /// </summary>
-        [PublicAPI]
-        public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
-
-        /// <summary>
-        /// Custom matcher mappings for static mappings
-        /// </summary>
-        [PublicAPI, JsonIgnore]
-        public IDictionary<string, Func<MatcherModel, IMatcher>>? CustomMatcherMappings { get; set; }
-
-        /// <summary>
-        /// The <see cref="JsonSerializerSettings"/> used when the a JSON response is generated.
-        /// </summary>
-        [PublicAPI, JsonIgnore]
-        public JsonSerializerSettings? JsonSerializerSettings { get; set; }
-    }
+    /// <summary>
+    /// The Culture to use.
+    /// Currently used for:
+    /// - Handlebars Transformer
+    /// </summary>
+    public CultureInfo Culture { get; set; } = CultureInfo.CurrentCulture;
 }

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -1,8 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Linq;
 using JetBrains.Annotations;
 using Stef.Validation;
 using WireMock.Logging;
 using WireMock.Types;
+using WireMock.Util;
 
 namespace WireMock.Settings;
 
@@ -55,11 +58,14 @@ public static class WireMockServerSettingsParser
             WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
             HostingScheme = parser.GetEnumValue<HostingScheme>(nameof(WireMockServerSettings.HostingScheme)),
             DoNotSaveDynamicResponseInLogEntry = parser.GetBoolValue(nameof(WireMockServerSettings.DoNotSaveDynamicResponseInLogEntry)),
-            QueryParameterMultipleValueSupport = parser.GetEnumValue<QueryParameterMultipleValueSupport>(nameof(WireMockServerSettings.QueryParameterMultipleValueSupport))
+            QueryParameterMultipleValueSupport = parser.GetEnumValue<QueryParameterMultipleValueSupport>(nameof(WireMockServerSettings.QueryParameterMultipleValueSupport)),
+            Culture = parser.GetValue(nameof(WireMockServerSettings.Culture), strings => CultureInfoUtils.Parse(strings.FirstOrDefault()), CultureInfo.CurrentCulture)
         };
 
 #if USE_ASPNETCORE
         settings.CorsPolicyOptions = parser.GetEnumValue(nameof(WireMockServerSettings.CorsPolicyOptions), CorsPolicyOptions.None);
+        settings.ClientCertificateMode = parser.GetEnumValue(nameof(WireMockServerSettings.ClientCertificateMode), ClientCertificateMode.NoCertificate);
+        settings.AcceptAnyClientCertificate = parser.GetBoolValue(nameof(WireMockServerSettings.AcceptAnyClientCertificate));
 #endif
 
         var loggerType = parser.GetStringValue("WireMockLogger");

src/WireMock.Net/Transformers/Handlebars/FileHelpers.cs

@@ -1,27 +1,26 @@
-using System;
 using HandlebarsDotNet;
 using HandlebarsDotNet.Helpers.Attributes;
 using HandlebarsDotNet.Helpers.Enums;
 using HandlebarsDotNet.Helpers.Helpers;
+using Stef.Validation;
 using WireMock.Handlers;
 
-namespace WireMock.Transformers.Handlebars
+namespace WireMock.Transformers.Handlebars;
+
+internal class FileHelpers : BaseHelpers, IHelpers
 {
-    internal class FileHelpers : BaseHelpers, IHelpers
+    private readonly IFileSystemHandler _fileSystemHandler;
+
+    public FileHelpers(IHandlebars context, IFileSystemHandler fileSystemHandler) : base(context)
     {
-        private readonly IFileSystemHandler _fileSystemHandler;
+        _fileSystemHandler = Guard.NotNull(fileSystemHandler);
+    }
 
-        public FileHelpers(IHandlebars context, IFileSystemHandler fileSystemHandler) : base(context)
-        {
-            _fileSystemHandler = fileSystemHandler ?? throw new ArgumentNullException(nameof(fileSystemHandler));
-        }
-
-        [HandlebarsWriter(WriterType.String, usage: HelperUsage.Both, passContext: true, name: "File")]
-        public string Read(Context context, string path)
-        {
-            var templateFunc = Context.Compile(path);
-            string transformed = templateFunc(context.Value);
-            return _fileSystemHandler.ReadResponseBodyAsString(transformed);
-        }
+    [HandlebarsWriter(WriterType.String, usage: HelperUsage.Both, passContext: true, name: "File")]
+    public string Read(Context context, string path)
+    {
+        var templateFunc = Context.Compile(path);
+        string transformed = templateFunc(context.Value);
+        return _fileSystemHandler.ReadResponseBodyAsString(transformed);
     }
 }

src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs

@@ -1,18 +1,35 @@
 using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers.Extensions;
+using Stef.Validation;
 using WireMock.Handlers;
 
-namespace WireMock.Transformers.Handlebars
+namespace WireMock.Transformers.Handlebars;
+
+internal class HandlebarsContext : IHandlebarsContext
 {
-    internal class HandlebarsContext : IHandlebarsContext
+    public IHandlebars Handlebars { get; }
+
+    public IFileSystemHandler FileSystemHandler { get; }
+
+    public HandlebarsContext(IHandlebars handlebars, IFileSystemHandler fileSystemHandler)
     {
-        public IHandlebars Handlebars { get; set; }
+        Handlebars = Guard.NotNull(handlebars);
+        FileSystemHandler = Guard.NotNull(fileSystemHandler);
+    }
 
-        public IFileSystemHandler FileSystemHandler { get; set; }
+    public string ParseAndRender(string text, object model)
+    {
+        var template = Handlebars.Compile(text);
+        return template(model);
+    }
 
-        public string ParseAndRender(string text, object model)
+    public object? ParseAndEvaluate(string text, object model)
+    {
+        if (Handlebars.TryEvaluate(text, model, out var result) && result is not UndefinedBindingResult)
         {
-            var template = Handlebars.Compile(text);
-            return template(model);
+            return result;
         }
+
+        return ParseAndRender(text, model);
     }
 }

src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs

@@ -1,33 +1,30 @@
-using System;
 using HandlebarsDotNet;
 using Stef.Validation;
-using WireMock.Handlers;
+using WireMock.Settings;
 
 namespace WireMock.Transformers.Handlebars;
 
 internal class HandlebarsContextFactory : ITransformerContextFactory
 {
-    private readonly IFileSystemHandler _fileSystemHandler;
-    private readonly Action<IHandlebars, IFileSystemHandler>? _action;
+    private readonly WireMockServerSettings _settings;
 
-    public HandlebarsContextFactory(IFileSystemHandler fileSystemHandler, Action<IHandlebars, IFileSystemHandler>? action)
+    public HandlebarsContextFactory(WireMockServerSettings settings)
     {
-        _fileSystemHandler = Guard.NotNull(fileSystemHandler);
-        _action = action;
+        _settings = Guard.NotNull(settings);
     }
 
     public ITransformerContext Create()
     {
-        var handlebars = HandlebarsDotNet.Handlebars.Create();
-
-        WireMockHandlebarsHelpers.Register(handlebars, _fileSystemHandler);
-
-        _action?.Invoke(handlebars, _fileSystemHandler);
-
-        return new HandlebarsContext
+        var config = new HandlebarsConfiguration
         {
-            Handlebars = handlebars,
-            FileSystemHandler = _fileSystemHandler
+            FormatProvider = _settings.Culture
         };
+        var handlebars = HandlebarsDotNet.Handlebars.Create(config);
+
+        WireMockHandlebarsHelpers.Register(handlebars, _settings.FileSystemHandler);
+
+        _settings.HandlebarsRegistrationCallback?.Invoke(handlebars, _settings.FileSystemHandler);
+
+        return new HandlebarsContext(handlebars, _settings.FileSystemHandler);
     }
 }

src/WireMock.Net/Transformers/Handlebars/IHandlebarsContext.cs

@@ -1,9 +1,8 @@
-using HandlebarsDotNet;
+using HandlebarsDotNet;
 
-namespace WireMock.Transformers.Handlebars
+namespace WireMock.Transformers.Handlebars;
+
+interface IHandlebarsContext : ITransformerContext
 {
-    interface IHandlebarsContext : ITransformerContext
-    {
-        IHandlebars Handlebars { get; set; }
-    }
+    IHandlebars Handlebars { get; }
 }

src/WireMock.Net/Transformers/ITransformerContext.cs

@@ -1,11 +1,12 @@
-using WireMock.Handlers;
+using WireMock.Handlers;
 
-namespace WireMock.Transformers
+namespace WireMock.Transformers;
+
+internal interface ITransformerContext
 {
-    interface ITransformerContext
-    {
-        IFileSystemHandler FileSystemHandler { get; set; }
+    IFileSystemHandler FileSystemHandler { get; }
 
-        string ParseAndRender(string text, object model);
-    }
+    string ParseAndRender(string text, object model);
+
+    object? ParseAndEvaluate(string text, object model);
 }

src/WireMock.Net/Transformers/Scriban/ScribanContext.cs

@@ -3,25 +3,30 @@ using Stef.Validation;
 using WireMock.Handlers;
 using WireMock.Types;
 
-namespace WireMock.Transformers.Scriban
+namespace WireMock.Transformers.Scriban;
+
+internal class ScribanContext : ITransformerContext
 {
-    internal class ScribanContext : ITransformerContext
+    private readonly TransformerType _transformerType;
+
+    public IFileSystemHandler FileSystemHandler { get; }
+
+    public ScribanContext(IFileSystemHandler fileSystemHandler, TransformerType transformerType)
     {
-        private readonly TransformerType _transformerType;
+        FileSystemHandler = Guard.NotNull(fileSystemHandler);
+        _transformerType = transformerType;
+    }
 
-        public IFileSystemHandler FileSystemHandler { get; set; }
+    public string ParseAndRender(string text, object model)
+    {
+        var template = _transformerType == TransformerType.ScribanDotLiquid ? Template.ParseLiquid(text) : Template.Parse(text);
 
-        public ScribanContext(IFileSystemHandler fileSystemHandler, TransformerType transformerType)
-        {
-            FileSystemHandler = Guard.NotNull(fileSystemHandler);
-            _transformerType = transformerType;
-        }
+        return template.Render(model, member => member.Name);
+    }
 
-        public string ParseAndRender(string text, object model)
-        {
-            var template = _transformerType == TransformerType.ScribanDotLiquid ? Template.ParseLiquid(text) : Template.Parse(text);
-
-            return template.Render(model, member => member.Name);
-        }
+    public object? ParseAndEvaluate(string text, object model)
+    {
+        // In case of Scriban, call ParseAndRender.
+        return ParseAndRender(text, model);
     }
 }

src/WireMock.Net/Transformers/Scriban/ScribanContextFactory.cs

@@ -2,22 +2,21 @@ using WireMock.Handlers;
 using WireMock.Types;
 using Stef.Validation;
 
-namespace WireMock.Transformers.Scriban
+namespace WireMock.Transformers.Scriban;
+
+internal class ScribanContextFactory : ITransformerContextFactory
 {
-    internal class ScribanContextFactory : ITransformerContextFactory
+    private readonly IFileSystemHandler _fileSystemHandler;
+    private readonly TransformerType _transformerType;
+
+    public ScribanContextFactory(IFileSystemHandler fileSystemHandler, TransformerType transformerType)
     {
-        private readonly IFileSystemHandler _fileSystemHandler;
-        private readonly TransformerType _transformerType;
+        _fileSystemHandler = Guard.NotNull(fileSystemHandler);
+        _transformerType = Guard.Condition(transformerType, t => t is TransformerType.Scriban or TransformerType.ScribanDotLiquid);
+    }
 
-        public ScribanContextFactory(IFileSystemHandler fileSystemHandler, TransformerType transformerType)
-        {
-            _fileSystemHandler = Guard.NotNull(fileSystemHandler);
-            _transformerType = Guard.Condition(transformerType, t => t == TransformerType.Scriban || t == TransformerType.ScribanDotLiquid);
-        }
-
-        public ITransformerContext Create()
-        {
-            return new ScribanContext(_fileSystemHandler, _transformerType);
-        }
+    public ITransformerContext Create()
+    {
+        return new ScribanContext(_fileSystemHandler, _transformerType);
     }
 }

src/WireMock.Net/Transformers/Transformer.cs

@@ -1,9 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using WireMock.Settings;
 using WireMock.Types;
 using WireMock.Util;
 
@@ -11,11 +13,19 @@ namespace WireMock.Transformers;
 
 internal class Transformer : ITransformer
 {
+    private static readonly Type[] SupportedTypes = { typeof(bool), typeof(long), typeof(int), typeof(double), typeof(Guid), typeof(DateTime), typeof(TimeSpan), typeof(Uri) };
+
+    private readonly JsonSerializer _jsonSerializer;
     private readonly ITransformerContextFactory _factory;
 
-    public Transformer(ITransformerContextFactory factory)
+    public Transformer(WireMockServerSettings settings, ITransformerContextFactory factory)
     {
         _factory = Guard.NotNull(factory);
+
+        _jsonSerializer = new JsonSerializer
+        {
+            Culture = Guard.NotNull(settings).Culture
+        };
     }
 
     public IBodyData? TransformBody(
@@ -109,7 +119,7 @@ internal class Transformer : ITransformer
         });
     }
 
-    private static IBodyData? TransformBodyData(ITransformerContext transformerContext, ReplaceNodeOptions options, TransformModel model, IBodyData original, bool useTransformerForBodyAsFile)
+    private IBodyData? TransformBodyData(ITransformerContext transformerContext, ReplaceNodeOptions options, TransformModel model, IBodyData original, bool useTransformerForBodyAsFile)
     {
         return original.DetectedBodyType switch
         {
@@ -139,33 +149,33 @@ internal class Transformer : ITransformer
         return newHeaders;
     }
 
-    private static IBodyData TransformBodyAsJson(ITransformerContext handlebarsContext, ReplaceNodeOptions options, object model, IBodyData original)
+    private IBodyData TransformBodyAsJson(ITransformerContext transformerContext, ReplaceNodeOptions options, object model, IBodyData original)
     {
         JToken? jToken = null;
         switch (original.BodyAsJson)
         {
             case JObject bodyAsJObject:
                 jToken = bodyAsJObject.DeepClone();
-                WalkNode(handlebarsContext, options, jToken, model);
+                WalkNode(transformerContext, options, jToken, model);
                 break;
 
             case JArray bodyAsJArray:
                 jToken = bodyAsJArray.DeepClone();
-                WalkNode(handlebarsContext, options, jToken, model);
+                WalkNode(transformerContext, options, jToken, model);
                 break;
 
             case Array bodyAsArray:
-                jToken = JArray.FromObject(bodyAsArray);
-                WalkNode(handlebarsContext, options, jToken, model);
+                jToken = JArray.FromObject(bodyAsArray, _jsonSerializer);
+                WalkNode(transformerContext, options, jToken, model);
                 break;
 
             case string bodyAsString:
-                jToken = ReplaceSingleNode(handlebarsContext, options, bodyAsString, model);
+                jToken = ReplaceSingleNode(transformerContext, options, bodyAsString, model);
                 break;
 
             case not null:
-                jToken = JObject.FromObject(original.BodyAsJson);
-                WalkNode(handlebarsContext, options, jToken, model);
+                jToken = JObject.FromObject(original.BodyAsJson, _jsonSerializer);
+                WalkNode(transformerContext, options, jToken, model);
                 break;
         }
 
@@ -178,9 +188,9 @@ internal class Transformer : ITransformer
         };
     }
 
-    private static JToken ReplaceSingleNode(ITransformerContext handlebarsContext, ReplaceNodeOptions options, string stringValue, object model)
+    private JToken ReplaceSingleNode(ITransformerContext transformerContext, ReplaceNodeOptions options, string stringValue, object model)
     {
-        string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
+        string transformedString = transformerContext.ParseAndRender(stringValue, model);
 
         if (!string.Equals(stringValue, transformedString))
         {
@@ -202,7 +212,7 @@ internal class Transformer : ITransformer
         return stringValue;
     }
 
-    private static void WalkNode(ITransformerContext handlebarsContext, ReplaceNodeOptions options, JToken node, object model)
+    private void WalkNode(ITransformerContext transformerContext, ReplaceNodeOptions options, JToken node, object model)
     {
         switch (node.Type)
         {
@@ -210,7 +220,7 @@ internal class Transformer : ITransformer
                 // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
                 foreach (var child in node.Children<JProperty>().ToArray())
                 {
-                    WalkNode(handlebarsContext, options, child.Value, model);
+                    WalkNode(transformerContext, options, child.Value, model);
                 }
                 break;
 
@@ -218,7 +228,7 @@ internal class Transformer : ITransformer
                 // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
                 foreach (var child in node.Children().ToArray())
                 {
-                    WalkNode(handlebarsContext, options, child, model);
+                    WalkNode(transformerContext, options, child, model);
                 }
                 break;
 
@@ -230,8 +240,8 @@ internal class Transformer : ITransformer
                     return;
                 }
 
-                string transformed = handlebarsContext.ParseAndRender(stringValue!, model);
-                if (!string.Equals(stringValue, transformed))
+                var transformed = transformerContext.ParseAndEvaluate(stringValue, model);
+                if (!Equals(stringValue, transformed))
                 {
                     ReplaceNodeValue(options, node, transformed);
                 }
@@ -240,44 +250,88 @@ internal class Transformer : ITransformer
     }
 
     // ReSharper disable once UnusedParameter.Local
-    private static void ReplaceNodeValue(ReplaceNodeOptions options, JToken node, string transformedString)
+    private void ReplaceNodeValue(ReplaceNodeOptions options, JToken node, object? transformedValue)
     {
-        StringUtils.TryParseQuotedString(transformedString, out var result, out _);
-        if (bool.TryParse(result, out var valueAsBoolean) || bool.TryParse(transformedString, out valueAsBoolean))
+        switch (transformedValue)
         {
-            node.Replace(valueAsBoolean);
-            return;
-        }
+            case JValue jValue:
+                node.Replace(jValue);
+                return;
 
-        JToken value;
-        try
-        {
-            // Try to convert this string into a JsonObject
-            value = JToken.Parse(transformedString);
-        }
-        catch (JsonException)
-        {
-            // Ignore JsonException and just keep string value and convert to JToken
-            value = transformedString;
-        }
+            case string transformedString:
+                if (TryConvert(transformedString, out var convertedFromStringValue))
+                {
+                    node.Replace(JToken.FromObject(convertedFromStringValue, _jsonSerializer));
+                }
+                else
+                {
+                    node.Replace(ParseAsJObject(transformedString));
+                }
+                break;
 
-        node.Replace(value);
+            case WireMockList<string> strings:
+                switch (strings.Count)
+                {
+                    case 1:
+                        node.Replace(ParseAsJObject(strings[0]));
+                        return;
+
+                    case > 1:
+                        node.Replace(JToken.FromObject(strings.ToArray(), _jsonSerializer));
+                        return;
+                }
+                break;
+
+            case { }:
+                if (TryConvert(transformedValue, out var convertedValue))
+                {
+                    node.Replace(JToken.FromObject(convertedValue, _jsonSerializer));
+                }
+                return;
+
+            default: // It's null, skip it. Maybe remove it ?
+                return;
+        }
     }
 
-    private static IBodyData TransformBodyAsString(ITransformerContext handlebarsContext, object model, IBodyData original)
+    private static JToken ParseAsJObject(string stringValue)
+    {
+        return JsonUtils.TryParseAsJObject(stringValue, out var parsedAsjObject) ? parsedAsjObject : stringValue;
+    }
+
+    private static bool TryConvert(object? transformedValue, [NotNullWhen(true)] out object? convertedValue)
+    {
+        foreach (var supportedType in SupportedTypes)
+        {
+            try
+            {
+                convertedValue = Convert.ChangeType(transformedValue, supportedType);
+                return convertedValue is not null;
+            }
+            catch
+            {
+                // Ignore
+            }
+        }
+
+        convertedValue = null;
+        return false;
+    }
+
+    private static IBodyData TransformBodyAsString(ITransformerContext transformerContext, object model, IBodyData original)
     {
         return new BodyData
         {
             Encoding = original.Encoding,
             DetectedBodyType = original.DetectedBodyType,
             DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
-            BodyAsString = handlebarsContext.ParseAndRender(original.BodyAsString!, model)
+            BodyAsString = transformerContext.ParseAndRender(original.BodyAsString!, model)
         };
     }
 
-    private static IBodyData TransformBodyAsFile(ITransformerContext handlebarsContext, object model, IBodyData original, bool useTransformerForBodyAsFile)
+    private static IBodyData TransformBodyAsFile(ITransformerContext transformerContext, object model, IBodyData original, bool useTransformerForBodyAsFile)
     {
-        string transformedBodyAsFilename = handlebarsContext.ParseAndRender(original.BodyAsFile!, model);
+        string transformedBodyAsFilename = transformerContext.ParseAndRender(original.BodyAsFile!, model);
 
         if (!useTransformerForBodyAsFile)
         {
@@ -289,12 +343,12 @@ internal class Transformer : ITransformer
             };
         }
 
-        string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
+        string text = transformerContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
         return new BodyData
         {
             DetectedBodyType = BodyType.String,
             DetectedBodyTypeFromContentType = original.DetectedBodyTypeFromContentType,
-            BodyAsString = handlebarsContext.ParseAndRender(text, model),
+            BodyAsString = transformerContext.ParseAndRender(text, model),
             BodyAsFile = transformedBodyAsFilename
         };
     }

src/WireMock.Net/Util/CultureInfoExtensions.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Globalization;
+
+namespace WireMock.Util;
+
+internal static class CultureInfoUtils
+{
+    public static CultureInfo Parse(string? value)
+    {
+        if (value is null)
+        {
+            return CultureInfo.CurrentCulture;
+        }
+
+        try
+        {
+#if !NETSTANDARD1_3
+            if (int.TryParse(value, out var culture))
+            {
+                return new CultureInfo(culture);
+            }
+#endif
+            if (string.Equals(value, nameof(CultureInfo.CurrentCulture), StringComparison.OrdinalIgnoreCase))
+            {
+                return CultureInfo.CurrentCulture;
+            }
+
+            if (string.Equals(value, nameof(CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase))
+            {
+                return CultureInfo.InvariantCulture;
+            }
+
+            return new CultureInfo(value);
+        }
+        catch
+        {
+            return CultureInfo.CurrentCulture;
+        }
+    }
+}

src/WireMock.Net/Util/DateTimeUtils.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace WireMock.Util;
+
+internal interface IDateTimeUtils
+{
+    DateTime UtcNow { get; }
+}
+
+internal class DateTimeUtils : IDateTimeUtils
+{
+    public DateTime UtcNow => DateTime.UtcNow;
+}

src/WireMock.Net/WireMock.Net.csproj

@@ -59,7 +59,6 @@
         <PackageReference Include="NJsonSchema.Extensions" Version="0.1.0" />
         <PackageReference Include="NSwag.Core" Version="13.16.1" />
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-        <!--<PackageReference Include="Stef.Validation" Version="0.1.1" />-->
         <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.23" />
         <PackageReference Include="JmesPath.Net" Version="1.0.125" />
         <PackageReference Include="AnyOf" Version="0.3.0" />
@@ -87,8 +86,8 @@
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
         <PackageReference Include="Scriban.Signed" Version="2.1.4" />
         <PackageReference Include="Nullable" Version="1.3.1">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
@@ -100,13 +99,19 @@
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
         <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-        <PackageReference Include="Nullable" Version="1.3.0" />
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
         <PackageReference Include="Scriban.Signed" Version="2.1.4" />
         <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-        <PackageReference Include="Nullable" Version="1.3.0" />
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
 
         <!-- https://github.com/WireMock-Net/WireMock.Net/issues/697 -->
         <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
@@ -123,13 +128,19 @@
         <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
         <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-        <PackageReference Include="Nullable" Version="1.3.0" />
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
         <PackageReference Include="Scriban.Signed" Version="5.5.0" />
         <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-        <PackageReference Include="Nullable" Version="1.3.0" />
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
 
         <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
         <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
@@ -141,7 +152,10 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <PackageReference Include="Nullable" Version="1.3.0" />
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
@@ -163,13 +177,13 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.3.10" />
-        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.3.10" />
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.3.10" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.3.10" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+        <PackageReference Include="Handlebars.Net.Helpers" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.3.11" />
+        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.11" />
     </ItemGroup>
 
     <ItemGroup>

test/WireMock.Net.NUnitTests/UnitTest1.cs

@@ -0,0 +1,27 @@
+using WireMock.Server;
+
+namespace WireMock.Net.NUnitTests;
+
+[TestFixture]
+public class Test
+{
+    private WireMockServer server;
+
+    [SetUp]
+    public void Setup()
+    {
+        server = WireMockServer.Start();
+    }
+
+    [Test]
+    public void SomeTest()
+    {
+        Assert.Pass();
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        server.Stop();
+    }
+}

test/WireMock.Net.NUnitTests/Usings.cs

@@ -0,0 +1 @@
+global using NUnit.Framework;

test/WireMock.Net.NUnitTests/WireMock.Net.NUnitTests.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="WireMock.Net" Version="1.5.13" />
+  </ItemGroup>
+
+</Project>

test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs

@@ -30,222 +30,222 @@ using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
 using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
 #endif
 
-namespace WireMock.Net.Tests.Owin
+namespace WireMock.Net.Tests.Owin;
+
+public class WireMockMiddlewareTests
 {
-    public class WireMockMiddlewareTests
+    private readonly DateTime _updatedAt = new(2022, 12, 4);
+    private readonly ConcurrentDictionary<Guid, IMapping> _mappings = new();
+
+    private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
+    private readonly Mock<IOwinRequestMapper> _requestMapperMock;
+    private readonly Mock<IOwinResponseMapper> _responseMapperMock;
+    private readonly Mock<IMappingMatcher> _matcherMock;
+    private readonly Mock<IMapping> _mappingMock;
+    private readonly Mock<IContext> _contextMock;
+
+    private readonly WireMockMiddleware _sut;
+
+    public WireMockMiddlewareTests()
     {
-        private readonly WireMockMiddleware _sut;
+        _optionsMock = new Mock<IWireMockMiddlewareOptions>();
+        _optionsMock.SetupAllProperties();
+        _optionsMock.Setup(o => o.Mappings).Returns(_mappings);
+        _optionsMock.Setup(o => o.LogEntries).Returns(new ConcurrentObservableCollection<LogEntry>());
+        _optionsMock.Setup(o => o.Scenarios).Returns(new ConcurrentDictionary<string, ScenarioState>());
+        _optionsMock.Setup(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()));
+        _optionsMock.Setup(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()));
+        _optionsMock.Setup(o => o.Logger.DebugRequestResponse(It.IsAny<LogEntryModel>(), It.IsAny<bool>()));
 
-        private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
-        private readonly Mock<IOwinRequestMapper> _requestMapperMock;
-        private readonly Mock<IOwinResponseMapper> _responseMapperMock;
-        private readonly Mock<IMappingMatcher> _matcherMock;
-        private readonly Mock<IMapping> _mappingMock;
-        private readonly Mock<IContext> _contextMock;
+        _requestMapperMock = new Mock<IOwinRequestMapper>();
+        _requestMapperMock.SetupAllProperties();
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
 
-        private readonly ConcurrentDictionary<Guid, IMapping> _mappings = new ConcurrentDictionary<Guid, IMapping>();
+        _responseMapperMock = new Mock<IOwinResponseMapper>();
+        _responseMapperMock.SetupAllProperties();
+        _responseMapperMock.Setup(m => m.MapAsync(It.IsAny<ResponseMessage>(), It.IsAny<IResponse>())).Returns(Task.FromResult(true));
 
-        public WireMockMiddlewareTests()
+        _matcherMock = new Mock<IMappingMatcher>();
+        _matcherMock.SetupAllProperties();
+        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((new MappingMatcherResult(), new MappingMatcherResult()));
+
+        _contextMock = new Mock<IContext>();
+
+        _mappingMock = new Mock<IMapping>();
+
+        _sut = new WireMockMiddleware(null, _optionsMock.Object, _requestMapperMock.Object, _responseMapperMock.Object, _matcherMock.Object);
+    }
+
+    [Fact]
+    public async Task WireMockMiddleware_Invoke_NoMatch()
+    {
+        // Act
+        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+
+        // Assert and Verify
+        _optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
+
+        Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode == 404 && ((StatusModel)r.BodyData.BodyAsJson).Status == "No matching mapping found";
+        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task WireMockMiddleware_Invoke_IsAdminInterface_EmptyHeaders_401()
+    {
+        // Assign
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+
+        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
+        _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
+
+        var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
+        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
+
+        // Act
+        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+
+        // Assert and Verify
+        _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
+
+        Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode == 401;
+        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task WireMockMiddleware_Invoke_IsAdminInterface_MissingHeader_401()
+    {
+        // Assign
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]> { { "h", new[] { "x" } } });
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+
+        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
+        _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
+
+        var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
+        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
+
+        // Act
+        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+
+        // Assert and Verify
+        _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
+
+        Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode == 401;
+        _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task WireMockMiddleware_Invoke_RequestLogExpirationDurationIsDefined()
+    {
+        // Assign
+        _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1);
+
+        // Act
+        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+    }
+
+    [Fact]
+    public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_True()
+    {
+        // Assign
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+
+        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
+
+        var fileSystemHandlerMock = new Mock<IFileSystemHandler>();
+        fileSystemHandlerMock.Setup(f => f.GetMappingFolder()).Returns("m");
+
+        var logger = new Mock<IWireMockLogger>();
+
+        var proxyAndRecordSettings = new ProxyAndRecordSettings
         {
-            _optionsMock = new Mock<IWireMockMiddlewareOptions>();
-            _optionsMock.SetupAllProperties();
-            _optionsMock.Setup(o => o.Mappings).Returns(_mappings);
-            _optionsMock.Setup(o => o.LogEntries).Returns(new ConcurrentObservableCollection<LogEntry>());
-            _optionsMock.Setup(o => o.Scenarios).Returns(new ConcurrentDictionary<string, ScenarioState>());
-            _optionsMock.Setup(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()));
-            _optionsMock.Setup(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()));
-            _optionsMock.Setup(o => o.Logger.DebugRequestResponse(It.IsAny<LogEntryModel>(), It.IsAny<bool>()));
+            SaveMapping = true,
+            SaveMappingToFile = true
+        };
 
-            _requestMapperMock = new Mock<IOwinRequestMapper>();
-            _requestMapperMock.SetupAllProperties();
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
-
-            _responseMapperMock = new Mock<IOwinResponseMapper>();
-            _responseMapperMock.SetupAllProperties();
-            _responseMapperMock.Setup(m => m.MapAsync(It.IsAny<ResponseMessage>(), It.IsAny<IResponse>())).Returns(Task.FromResult(true));
-
-            _matcherMock = new Mock<IMappingMatcher>();
-            _matcherMock.SetupAllProperties();
-            _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((new MappingMatcherResult(), new MappingMatcherResult()));
-
-            _contextMock = new Mock<IContext>();
-
-            _mappingMock = new Mock<IMapping>();
-
-            _sut = new WireMockMiddleware(null, _optionsMock.Object, _requestMapperMock.Object, _responseMapperMock.Object, _matcherMock.Object);
-        }
-
-        [Fact]
-        public async Task WireMockMiddleware_Invoke_NoMatch()
+        var settings = new WireMockServerSettings
         {
-            // Act
-            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+            FileSystemHandler = fileSystemHandlerMock.Object,
+            Logger = logger.Object
+        };
 
-            // Assert and Verify
-            _optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
+        var responseBuilder = Response.Create().WithProxy(proxyAndRecordSettings);
 
-            Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode == 404 && ((StatusModel)r.BodyData.BodyAsJson).Status == "No matching mapping found";
-            _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
-        }
+        _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
+        _mappingMock.SetupGet(m => m.Settings).Returns(settings);
 
-        [Fact]
-        public async Task WireMockMiddleware_Invoke_IsAdminInterface_EmptyHeaders_401()
+        var newMappingFromProxy = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null);
+        _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
+
+        var requestBuilder = Request.Create().UsingAnyMethod();
+        _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
+
+        var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
+        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
+
+        // Act
+        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+
+        // Assert and Verify
+        fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+
+        _mappings.Count.Should().Be(1);
+    }
+
+    [Fact]
+    public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_False_But_WireMockServerSettings_SaveMapping_Is_True()
+    {
+        // Assign
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
+        _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+
+        _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
+
+        var fileSystemHandlerMock = new Mock<IFileSystemHandler>();
+        fileSystemHandlerMock.Setup(f => f.GetMappingFolder()).Returns("m");
+
+        var logger = new Mock<IWireMockLogger>();
+
+        var proxyAndRecordSettings = new ProxyAndRecordSettings
         {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
+            SaveMapping = false,
+            SaveMappingToFile = false
+        };
 
-            _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
-            _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
-
-            var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
-            _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
-
-            // Act
-            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
-
-            // Assert and Verify
-            _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
-
-            Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode == 401;
-            _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
-        }
-
-        [Fact]
-        public async Task WireMockMiddleware_Invoke_IsAdminInterface_MissingHeader_401()
+        var settings = new WireMockServerSettings
         {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]> { { "h", new[] { "x" } } });
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
-
-            _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
-            _mappingMock.SetupGet(m => m.IsAdminInterface).Returns(true);
-
-            var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
-            _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
-
-            // Act
-            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
-
-            // Assert and Verify
-            _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
-
-            Expression<Func<ResponseMessage, bool>> match = r => (int)r.StatusCode == 401;
-            _responseMapperMock.Verify(m => m.MapAsync(It.Is(match), It.IsAny<IResponse>()), Times.Once);
-        }
-
-        [Fact]
-        public async Task WireMockMiddleware_Invoke_RequestLogExpirationDurationIsDefined()
-        {
-            // Assign
-            _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1);
-
-            // Act
-            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
-        }
-
-        [Fact]
-        public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_True()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
-
-            _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
-
-            var fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-            fileSystemHandlerMock.Setup(f => f.GetMappingFolder()).Returns("m");
-
-            var logger = new Mock<IWireMockLogger>();
-
-            var proxyAndRecordSettings = new ProxyAndRecordSettings
+            FileSystemHandler = fileSystemHandlerMock.Object,
+            Logger = logger.Object,
+            ProxyAndRecordSettings = new ProxyAndRecordSettings
             {
                 SaveMapping = true,
                 SaveMappingToFile = true
-            };
+            }
+        };
 
-            var settings = new WireMockServerSettings
-            {
-                FileSystemHandler = fileSystemHandlerMock.Object,
-                Logger = logger.Object
-            };
+        var responseBuilder = Response.Create().WithProxy(proxyAndRecordSettings);
 
-            var responseBuilder = Response.Create().WithProxy(proxyAndRecordSettings);
+        _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
+        _mappingMock.SetupGet(m => m.Settings).Returns(settings);
 
-            _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
-            _mappingMock.SetupGet(m => m.Settings).Returns(settings);
+        var newMappingFromProxy = new Mapping(Guid.NewGuid(), _updatedAt, "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null);
+        _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
 
-            var newMappingFromProxy = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null);
-            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
+        var requestBuilder = Request.Create().UsingAnyMethod();
+        _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
 
-            var requestBuilder = Request.Create().UsingAnyMethod();
-            _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
+        var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
+        _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
 
-            var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
-            _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
+        // Act
+        await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
 
-            // Act
-            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
+        // Assert and Verify
+        fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
 
-            // Assert and Verify
-            fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-
-            _mappings.Count.Should().Be(1);
-        }
-
-        [Fact]
-        public async Task WireMockMiddleware_Invoke_Mapping_Has_ProxyAndRecordSettings_And_SaveMapping_Is_False_But_WireMockServerSettings_SaveMapping_Is_True()
-        {
-            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1", null, new Dictionary<string, string[]>());
-            _requestMapperMock.Setup(m => m.MapAsync(It.IsAny<IRequest>(), It.IsAny<IWireMockMiddlewareOptions>())).ReturnsAsync(request);
-
-            _optionsMock.SetupGet(o => o.AuthenticationMatcher).Returns(new ExactMatcher());
-
-            var fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-            fileSystemHandlerMock.Setup(f => f.GetMappingFolder()).Returns("m");
-
-            var logger = new Mock<IWireMockLogger>();
-
-            var proxyAndRecordSettings = new ProxyAndRecordSettings
-            {
-                SaveMapping = false,
-                SaveMappingToFile = false
-            };
-
-            var settings = new WireMockServerSettings
-            {
-                FileSystemHandler = fileSystemHandlerMock.Object,
-                Logger = logger.Object,
-                ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    SaveMapping = true,
-                    SaveMappingToFile = true
-                }
-            };
-
-            var responseBuilder = Response.Create().WithProxy(proxyAndRecordSettings);
-
-            _mappingMock.SetupGet(m => m.Provider).Returns(responseBuilder);
-            _mappingMock.SetupGet(m => m.Settings).Returns(settings);
-
-            var newMappingFromProxy = new Mapping(Guid.NewGuid(), "my-title", "my-description", null, settings, Request.Create(), Response.Create(), 0, null, null, null, null, null, false, null);
-            _mappingMock.Setup(m => m.ProvideResponseAsync(It.IsAny<RequestMessage>())).ReturnsAsync((new ResponseMessage(), newMappingFromProxy));
-
-            var requestBuilder = Request.Create().UsingAnyMethod();
-            _mappingMock.SetupGet(m => m.RequestMatcher).Returns(requestBuilder);
-
-            var result = new MappingMatcherResult { Mapping = _mappingMock.Object };
-            _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
-
-            // Act
-            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
-
-            // Assert and Verify
-            fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
-
-            _mappings.Count.Should().Be(1);
-        }
+        _mappings.Count.Should().Be(1);
     }
-}
+}

test/WireMock.Net.Tests/README.md

@@ -0,0 +1,7 @@
+## Creating a client certificate like client_cert.pfx
+
+Follow the instructions to [create a root certificate](https://learn.microsoft.com/en-us/aspnet/core/security/authentication/certauth?view=aspnetcore-7.0#create-root-ca),
+then [trust it](https://learn.microsoft.com/en-us/aspnet/core/security/authentication/certauth?view=aspnetcore-7.0#install-in-the-trusted-root)
+and [create a child certificate from it](https://learn.microsoft.com/en-us/aspnet/core/security/authentication/certauth?view=aspnetcore-7.0#create-child-certificate-from-root-certificate).
+
+Since the root certificate of `client_cert.pfx` is obviously not trusted automatically by cloning this repo, the tests in `WireMockServerTests.ClientCertificate.cs` set `WireMockServerSettings.AcceptAnyClientCertificate` to `true` so that tests pass even if the device hasn't trusted the root of `client_cert.pfx`.

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsJsonPathTests.cs

@@ -108,7 +108,7 @@ public class ResponseWithHandlebarsJsonPathTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
+        JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson!);
         Check.That(j["x"].Value<long>()).Equals(99);
     }
 

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithHandlebarsRandomTests.cs

@@ -77,7 +77,7 @@ public class ResponseWithHandlebarsRandomTests
     }
 
     [Theory]
-    [InlineData(ReplaceNodeOptions.None, JTokenType.Integer)]
+    [InlineData(ReplaceNodeOptions.Evaluate, JTokenType.Integer)]
     //[InlineData(ReplaceNodeOptions.Bool, JTokenType.String)]
     //[InlineData(ReplaceNodeOptions.Integer, JTokenType.Integer)]
     //[InlineData(ReplaceNodeOptions.Bool | ReplaceNodeOptions.Integer, JTokenType.Integer)]

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithTransformerTests.cs

@@ -14,6 +14,8 @@ using WireMock.Settings;
 using WireMock.Types;
 using WireMock.Util;
 using Xunit;
+using System.Globalization;
+using CultureAwareTesting.xUnit;
 #if NET452
 using Microsoft.Owin;
 #else
@@ -24,6 +26,7 @@ namespace WireMock.Net.Tests.ResponseBuilders;
 
 public class ResponseWithTransformerTests
 {
+    private readonly Mock<IFileSystemHandler> _filesystemHandlerMock;
     private readonly WireMockServerSettings _settings = new();
     private const string ClientIp = "::1";
 
@@ -33,10 +36,10 @@ public class ResponseWithTransformerTests
     {
         _mappingMock = new Mock<IMapping>();
 
-        var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-        filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
+        _filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+        _filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("abc");
 
-        _settings.FileSystemHandler = filesystemHandlerMock.Object;
+        _settings.FileSystemHandler = _filesystemHandlerMock.Object;
     }
 
     [Theory]
@@ -333,7 +336,7 @@ public class ResponseWithTransformerTests
         // Assert
         Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.Headers).ContainsKey("x");
-        Check.That(response.Message.Headers["x"]).Contains("text/plain");
+        Check.That(response.Message.Headers!["x"]).Contains("text/plain");
         Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo");
     }
 
@@ -358,7 +361,7 @@ public class ResponseWithTransformerTests
         // Assert
         Check.That(response.Message.BodyData!.BodyAsString).Equals("test");
         Check.That(response.Message.Headers).ContainsKey("x");
-        Check.That(response.Message.Headers["x"]).Contains("text/plain");
+        Check.That(response.Message.Headers!["x"]).Contains("text/plain");
         Check.That(response.Message.Headers["x"]).Contains("http://localhost/foo");
     }
 
@@ -394,7 +397,7 @@ public class ResponseWithTransformerTests
     public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_ResultAsObject(TransformerType transformerType)
     {
         // Assign
-        string jsonString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"WireMock\" } ] }";
+        string jsonString = "{ \"id\": 42, \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"WireMock\" } ] }";
         var bodyData = new BodyData
         {
             BodyAsJson = JsonConvert.DeserializeObject(jsonString),
@@ -411,7 +414,49 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
+        Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
+    }
+
+    [CulturedTheory("en-US")]
+    [InlineData(TransformerType.Handlebars, "{ \"id\": 42 }", "{\"x\":\"test 42\",\"y\":42}")]
+    [InlineData(TransformerType.Scriban, "{ \"id\": 42 }", "{\"x\":\"test 42\",\"y\":42}")]
+    [InlineData(TransformerType.ScribanDotLiquid, "{ \"id\": 42 }", "{\"x\":\"test 42\",\"y\":42}")]
+    [InlineData(TransformerType.Handlebars, "{ \"id\": true }", "{\"x\":\"test True\",\"y\":true}")]
+    [InlineData(TransformerType.Scriban, "{ \"id\": true }", "{\"x\":\"test True\",\"y\":true}")]
+    [InlineData(TransformerType.ScribanDotLiquid, "{ \"id\": true }", "{\"x\":\"test True\",\"y\":true}")]
+    [InlineData(TransformerType.Handlebars, "{ \"id\": 0.005 }", "{\"x\":\"test 0.005\",\"y\":0.005}")]
+    [InlineData(TransformerType.Scriban, "{ \"id\": 0.005 }", "{\"x\":\"test 0.005\",\"y\":0.005}")]
+    [InlineData(TransformerType.ScribanDotLiquid, "{ \"id\": 0.005 }", "{\"x\":\"test 0.005\",\"y\":0.005}")]
+    public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_KeepType(TransformerType transformerType, string jsonString, string expected)
+    {
+        // Assign
+        var culture = CultureInfo.CreateSpecificCulture("en-US");
+        var settings = new WireMockServerSettings
+        {
+            FileSystemHandler = _filesystemHandlerMock.Object,
+            Culture = culture
+        };
+        var jsonSettings = new JsonSerializerSettings
+        {
+            Culture = culture
+        };
+        var bodyData = new BodyData
+        {
+            BodyAsJson = JsonConvert.DeserializeObject(jsonString, jsonSettings),
+            DetectedBodyType = BodyType.Json,
+            Encoding = Encoding.UTF8
+        };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
+
+        var responseBuilder = Response.Create()
+            .WithBodyAsJson(new { x = "test {{request.BodyAsJson.id}}", y = "{{request.BodyAsJson.id}}" })
+            .WithTransformer(transformerType);
+
+        // Act
+        var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, settings).ConfigureAwait(false);
+
+        // Assert
+        JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be(expected);
     }
 
     [Theory]
@@ -431,7 +476,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
+        JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
     }
 
     [Theory]
@@ -452,7 +497,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
+        JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
     }
 
     //[Theory]
@@ -488,15 +533,15 @@ public class ResponseWithTransformerTests
     [InlineData(TransformerType.Handlebars, "\"a\"", "\"a\"")]
     [InlineData(TransformerType.Handlebars, "\" \"", "\" \"")]
     [InlineData(TransformerType.Handlebars, "\"'\"", "\"'\"")]
-    [InlineData(TransformerType.Handlebars, "\"false\"", "false")] // bool is special
+    [InlineData(TransformerType.Handlebars, "\"false\"", "\"false\"")]
     [InlineData(TransformerType.Handlebars, "false", "false")]
-    [InlineData(TransformerType.Handlebars, "\"true\"", "true")] // bool is special
+    [InlineData(TransformerType.Handlebars, "\"true\"", "\"true\"")]
     [InlineData(TransformerType.Handlebars, "true", "true")]
-    [InlineData(TransformerType.Handlebars, "\"-42\"", "-42")] // todo
+    [InlineData(TransformerType.Handlebars, "\"-42\"", "\"-42\"")]
     [InlineData(TransformerType.Handlebars, "-42", "-42")]
-    [InlineData(TransformerType.Handlebars, "\"2147483647\"", "2147483647")] // todo
+    [InlineData(TransformerType.Handlebars, "\"2147483647\"", "\"2147483647\"")]
     [InlineData(TransformerType.Handlebars, "2147483647", "2147483647")]
-    [InlineData(TransformerType.Handlebars, "\"9223372036854775807\"", "9223372036854775807")] // todo
+    [InlineData(TransformerType.Handlebars, "\"9223372036854775807\"", "\"9223372036854775807\"")]
     [InlineData(TransformerType.Handlebars, "9223372036854775807", "9223372036854775807")]
     public async Task Response_ProvideResponse_Transformer_WithBodyAsJson_And_ReplaceNodeOptionsKeep(TransformerType transformerType, string value, string expected)
     {
@@ -511,50 +556,13 @@ public class ResponseWithTransformerTests
 
         var responseBuilder = Response.Create()
             .WithBodyAsJson(new { text = "{{request.bodyAsJson.x}}" })
-            .WithTransformer(transformerType, false, ReplaceNodeOptions.None);
+            .WithTransformer(transformerType, false, ReplaceNodeOptions.Evaluate);
 
         // Act
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be($"{{\"text\":{expected}}}");
-    }
-
-    [Theory]
-    [InlineData(TransformerType.Handlebars, "\"\"", "\"\"")]
-    [InlineData(TransformerType.Handlebars, "\"a\"", "\"a\"")]
-    [InlineData(TransformerType.Handlebars, "\" \"", "\" \"")]
-    [InlineData(TransformerType.Handlebars, "\"'\"", "\"'\"")]
-    [InlineData(TransformerType.Handlebars, "\"false\"", "false")] // bool is special
-    [InlineData(TransformerType.Handlebars, "false", "false")]
-    [InlineData(TransformerType.Handlebars, "\"true\"", "true")] // bool is special
-    [InlineData(TransformerType.Handlebars, "true", "true")]
-    [InlineData(TransformerType.Handlebars, "\"-42\"", "\"-42\"")]
-    [InlineData(TransformerType.Handlebars, "-42", "\"-42\"")]
-    [InlineData(TransformerType.Handlebars, "\"2147483647\"", "\"2147483647\"")]
-    [InlineData(TransformerType.Handlebars, "2147483647", "\"2147483647\"")]
-    [InlineData(TransformerType.Handlebars, "\"9223372036854775807\"", "\"9223372036854775807\"")]
-    [InlineData(TransformerType.Handlebars, "9223372036854775807", "\"9223372036854775807\"")]
-    public async Task Response_ProvideResponse_Transformer_WithBodyAsJsonWithExtraQuotes_AlwaysMakesString(TransformerType transformerType, string value, string expected)
-    {
-        string jsonString = $"{{ \"x\": {value} }}";
-        var bodyData = new BodyData
-        {
-            BodyAsJson = JsonConvert.DeserializeObject(jsonString),
-            DetectedBodyType = BodyType.Json,
-            Encoding = Encoding.UTF8
-        };
-        var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
-
-        var responseBuilder = Response.Create()
-            .WithBodyAsJson(new { text = "\"{{request.bodyAsJson.x}}\"" })
-            .WithTransformer(transformerType);
-
-        // Act
-        var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
-
-        // Assert
-        JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be($"{{\"text\":{expected}}}");
+        JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson).Should().Be($"{{\"text\":{expected}}}");
     }
 
     [Theory]
@@ -581,7 +589,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
+        Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
     }
 
     [Fact]
@@ -598,7 +606,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+        Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml");
     }
 
     [Theory(Skip = @"Does not work in Scriban --> c:\\[""1""]\\test.xml")]
@@ -617,7 +625,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+        Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml");
     }
 
     [Theory]
@@ -642,7 +650,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+        Check.That(response.Message.BodyData!.BodyAsFile).Equals(@"c:\1\test.xml");
         Check.That(response.Message.BodyData.DetectedBodyType).Equals(BodyType.String);
         Check.That(response.Message.BodyData!.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
     }
@@ -671,14 +679,15 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("\"test\"");
+        Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("\"test\"");
     }
 
     [Fact(Skip = "todo...")]
+    //[Fact]
     public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsTemplatedString()
     {
         // Assign
-        string jsonString = "{ \"name\": \"WireMock\" }";
+        string jsonString = "{ \"name\": \"WireMock\", \"id\": 12345 }";
         var bodyData = new BodyData
         {
             BodyAsJson = JsonConvert.DeserializeObject(jsonString),
@@ -688,14 +697,14 @@ public class ResponseWithTransformerTests
         var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
 
         var responseBuilder = Response.Create()
-            .WithBodyAsJson("{{{request.BodyAsJson}}}")
+            .WithBodyAsJson("{{{request.BodyAsJson.name}}}")
             .WithTransformer();
 
         // Act
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
+        Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
     }
 
     [Theory(Skip = "{{{ }}} Does not work in Scriban")]
@@ -721,7 +730,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
+        Check.That(JsonConvert.SerializeObject(response.Message.BodyData!.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
     }
 
     [Theory]
@@ -749,7 +758,7 @@ public class ResponseWithTransformerTests
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        response.Message.BodyData.BodyAsString.Should().Be(text);
+        response.Message.BodyData!.BodyAsString.Should().Be(text);
         response.Message.BodyData.Encoding.Should().Be(enc);
     }
 }

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

@@ -15,6 +15,7 @@ namespace WireMock.Net.Tests.Serialization;
 
 public class MappingConverterTests
 {
+    private readonly DateTime _updatedAt = new(2022, 12, 4);
     private readonly WireMockServerSettings _settings = new();
 
     private readonly MappingConverter _sut;
@@ -52,7 +53,7 @@ public class MappingConverterTests
                 }
             }
         };
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -122,7 +123,7 @@ public class MappingConverterTests
                 }
             }
         };
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, true, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 0, null, null, null, null, webhooks, true, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -157,7 +158,7 @@ public class MappingConverterTests
         var description = "my-description";
         var request = Request.Create();
         var response = Response.Create();
-        var mapping = new Mapping(Guid.NewGuid(), title, description, null, _settings, request, response, 0, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, title, description, null, _settings, request, response, 0, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -174,7 +175,7 @@ public class MappingConverterTests
         // Assign
         var request = Request.Create();
         var response = Response.Create().WithBodyAsJson(new { x = "x" }).WithTransformer();
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -200,7 +201,7 @@ public class MappingConverterTests
             End = end,
             TTL = ttl
         };
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, timeSettings);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, timeSettings);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -228,7 +229,7 @@ public class MappingConverterTests
         {
             var request = Request.Create();
             var response = Response.Create().WithDelay(test.Delay);
-            var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, string.Empty, _settings, request, response, 42, null, null, null, null, null, false, null);
+            var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, string.Empty, _settings, request, response, 42, null, null, null, null, null, false, null);
 
             // Act
             var model = _sut.ToMappingModel(mapping);
@@ -246,7 +247,7 @@ public class MappingConverterTests
         var delay = 1000;
         var request = Request.Create();
         var response = Response.Create().WithDelay(delay);
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -263,7 +264,7 @@ public class MappingConverterTests
         int minimumDelay = 1000;
         var request = Request.Create();
         var response = Response.Create().WithRandomDelay(minimumDelay);
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);
@@ -283,7 +284,7 @@ public class MappingConverterTests
         int maximumDelay = 2000;
         var request = Request.Create();
         var response = Response.Create().WithRandomDelay(minimumDelay, maximumDelay);
-        var mapping = new Mapping(Guid.NewGuid(), string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
+        var mapping = new Mapping(Guid.NewGuid(), _updatedAt, string.Empty, string.Empty, null, _settings, request, response, 42, null, null, null, null, null, false, null);
 
         // Act
         var model = _sut.ToMappingModel(mapping);

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

@@ -25,9 +25,12 @@ public class ProxyMappingConverterTests
         var guidUtilsMock = new Mock<IGuidUtils>();
         guidUtilsMock.Setup(g => g.NewGuid()).Returns(Guid.Parse("ff55ac0a-fea9-4d7b-be74-5e483a2c1305"));
 
+        var dateTimeUtilsMock = new Mock<IDateTimeUtils>();
+        dateTimeUtilsMock.SetupGet(d => d.UtcNow).Returns(new DateTime(2022, 12, 4));
+
         _mappingConverter = new MappingConverter(new MatcherMapper(_settings));
 
-        _sut = new ProxyMappingConverter(_settings, guidUtilsMock.Object);
+        _sut = new ProxyMappingConverter(_settings, guidUtilsMock.Object, dateTimeUtilsMock.Object);
     }
 
     [Fact]

test/WireMock.Net.Tests/Serialization/files/proxy.json

@@ -1,5 +1,6 @@
 {
   "Guid": "ff55ac0a-fea9-4d7b-be74-5e483a2c1305",
+  "UpdatedAt": "2022-12-04T00:00:00",
   "Title": "my title",
   "Description": "my description",
   "Priority": -2000000,

test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs

@@ -1,52 +1,59 @@
-using System;
 using FluentAssertions;
-using HandlebarsDotNet;
 using Moq;
 using WireMock.Handlers;
+using WireMock.Settings;
 using WireMock.Transformers.Handlebars;
 using Xunit;
 
-namespace WireMock.Net.Tests.Transformers.Handlebars
+namespace WireMock.Net.Tests.Transformers.Handlebars;
+
+public class HandlebarsContextFactoryTests
 {
-    public class HandlebarsContextFactoryTests
+    private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock = new();
+
+    [Fact]
+    public void Create_WithNullAction_DoesNotInvokeAction()
     {
-        private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-
-        [Fact]
-        public void Create_WithNullAction_DoesNotInvokeAction()
+        // Arrange
+        var settings = new WireMockServerSettings
         {
-            // Arrange
-            var sut = new HandlebarsContextFactory(_fileSystemHandlerMock.Object, null);
+            FileSystemHandler = _fileSystemHandlerMock.Object
+        };
+        var sut = new HandlebarsContextFactory(settings);
 
-            // Act
-            var result = sut.Create();
+        // Act
+        var result = sut.Create();
 
-            // Assert
-            result.Should().NotBeNull();
-        }
+        // Assert
+        result.Should().NotBeNull();
+    }
 
-        [Fact]
-        public void Create_WithAction_InvokesAction()
+    [Fact]
+    public void Create_WithAction_InvokesAction()
+    {
+        // Arrange
+        int num = 0;
+        var settings = new WireMockServerSettings
         {
-            // Arrange
-            int num = 0;
-            Action<IHandlebars, IFileSystemHandler> action = (ctx, fs) =>
+            FileSystemHandler = _fileSystemHandlerMock.Object,
+            HandlebarsRegistrationCallback = (ctx, fs) =>
             {
                 ctx.Should().NotBeNull();
                 fs.Should().NotBeNull();
 
                 num++;
-            };
-            var sut = new HandlebarsContextFactory(_fileSystemHandlerMock.Object, action);
+            }
+        };
 
-            // Act
-            var result = sut.Create();
+        var sut = new HandlebarsContextFactory(settings);
 
-            // Assert
-            result.Should().NotBeNull();
+        // Act
+        var result = sut.Create();
 
-            // Verify
-            num.Should().Be(1);
-        }
+        // Assert
+        result.Should().NotBeNull();
+
+        // Verify
+        num.Should().Be(1);
     }
-}
+}

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -20,6 +20,10 @@
         <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net461'">
+        <DefineConstants>NETFRAMEWORK</DefineConstants>
+    </PropertyGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj" />
@@ -35,8 +39,10 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="CultureAwareTesting.xUnit" Version="0.0.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.core" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -90,6 +96,10 @@
         <None Update="__admin\mappings\subdirectory\*.xml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
+        <None Update="client_cert.pfx">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <DependentUpon>WireMockServerTests.ClientCertificate.cs</DependentUpon>
+        </None>
     </ItemGroup>
 
     <ItemGroup>

test/WireMock.Net.Tests/WireMockServerTests.ClientCertificate.cs

@@ -0,0 +1,59 @@
+#if !NET451 && !NET452
+
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using FluentAssertions;
+using System.Security.Cryptography.X509Certificates;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+using WireMock.Types;
+using Xunit;
+
+namespace WireMock.Net.Tests;
+
+public partial class WireMockServerTests
+{
+    [Fact]
+    public async Task WireMockServer_WithRequiredClientCertificates_Should_Work_Correct()
+    {
+        // Arrange
+        var settings = new WireMockServerSettings
+        {
+            ClientCertificateMode = ClientCertificateMode.RequireCertificate,
+            AcceptAnyClientCertificate = true,
+            UseSSL = true,
+        };
+
+        using var server = WireMockServer.Start(settings);
+
+        server.Given(Request.Create().WithPath("/*"))
+            .RespondWith(Response.Create().WithCallback(message => new ResponseMessage
+            {
+                StatusCode = message.ClientCertificate?.Thumbprint == "2E32E3528C87046A95B8B0BA172A1597C3AF3A9D"
+                    ? 200
+                    : 403
+            }));
+
+        var certificates = new X509Certificate2Collection();
+        certificates.Import("client_cert.pfx", "1234", X509KeyStorageFlags.Exportable);
+
+        var httpMessageHandler = new HttpClientHandler
+        {
+            ServerCertificateCustomValidationCallback = (_, _, _, _) => true,
+        };
+        httpMessageHandler.ClientCertificates.AddRange(certificates);
+
+        // Act
+        var response = await new HttpClient(httpMessageHandler)
+            .GetAsync("https://localhost:" + server.Ports[0] + "/foo")
+            .ConfigureAwait(false);
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+    }
+}
+
+#endif