merge from master + fix conflicts

WireMock-Net · Dec 14, 2024 · d107558 · d107558
2 parents b53bcd9 + c548600
commit d107558
Show file tree

Hide file tree

Showing 30 changed files with 155 additions and 73 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 1.6.9 (06 December 2024)
+- [#1216](https://github.com/WireMock-Net/WireMock.Net/pull/1216) - Fix JsonPartialMatcher when using property names with dot [bug] contributed by [StefH](https://github.com/StefH)
+- [#1210](https://github.com/WireMock-Net/WireMock.Net/issues/1210) - JsonPartialMatcher fails to match on property name that JsonMatcher matches [bug]
+
+# 1.6.8 (24 November 2024)
+- [#1202](https://github.com/WireMock-Net/WireMock.Net/pull/1202) - Log exception when (static) mapping file cannot be read [feature] contributed by [StefH](https://github.com/StefH)
+- [#1206](https://github.com/WireMock-Net/WireMock.Net/pull/1206) - Fix security issues [bug] contributed by [StefH](https://github.com/StefH)
+- [#1211](https://github.com/WireMock-Net/WireMock.Net/pull/1211) - Use GraphQL 8.2.1 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1213](https://github.com/WireMock-Net/WireMock.Net/pull/1213) - Fix HandlebarsContext ParseAndEvaluate method [bug] contributed by [StefH](https://github.com/StefH)
+- [#1201](https://github.com/WireMock-Net/WireMock.Net/issues/1201) - Mapping file parse errors are not logged to the console [feature]
+- [#1209](https://github.com/WireMock-Net/WireMock.Net/issues/1209) - Upgrade of GraphQL libs to the latest [feature]
+- [#1212](https://github.com/WireMock-Net/WireMock.Net/issues/1212) - Response Body Does Not Include Text After Path Segment [bug]
+
 # 1.6.7 (17 October 2024)
 - [#1161](https://github.com/WireMock-Net/WireMock.Net/pull/1161) -  Use latest ProtoBufJsonConverter to support WellKnownTypes  [bug] contributed by [StefH](https://github.com/StefH)
 - [#1190](https://github.com/WireMock-Net/WireMock.Net/pull/1190) - Bump System.Text.Json from 8.0.4 to 8.0.5 in /examples/WireMock.Net.Console.Net472.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.6.7-preview-03</VersionPrefix>
+        <VersionPrefix>1.6.9</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -43,8 +43,17 @@
         </When>
     </Choose>
 
+    <PropertyGroup>
+        <NuGetAudit>true</NuGetAudit>
+        <!--<NuGetAuditLevel>low</NuGetAuditLevel>-->
+        <NuGetAuditMode>all</NuGetAuditMode>
+    </PropertyGroup>
+
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
+        <!-- CVE-2019-0820 -->
+        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 

diff --git a/Generate-ReleaseNotes.cmd b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.6.7
+SET version=1.6.9
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 

diff --git a/PackageReleaseNotes.txt b/PackageReleaseNotes.txt
@@ -1,11 +1,5 @@
-# 1.6.7 (17 October 2024)
-- #1161  Use latest ProtoBufJsonConverter to support WellKnownTypes  [bug]
-- #1190 Bump System.Text.Json from 8.0.4 to 8.0.5 in /examples/WireMock.Net.Console.Net472.Classic [dependencies]
-- #1194 Upgrade System.Text.RegularExpressions to 4.3.1 to solve CVE-2019-0820 [bug]
-- #1197 Bump System.Text.Json from 8.0.4 to 8.0.5 in /src/dotnet-WireMock.Net [dependencies]
-- #1198 Fix Google.Protobuf.WellKnownTypes.Value [bug]
-- #1144 Using google.protobuf.Empty as response results in a bad gRPC response [bug]
-- #1153 Grpc support for multiple proto files [feature]
-- #1193 Snyk issue : Regular Expression Denial of Service  [bug]
+# 1.6.9 (06 December 2024)
+- #1216 Fix JsonPartialMatcher when using property names with dot [bug]
+- #1210 JsonPartialMatcher fails to match on property name that JsonMatcher matches [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
diff --git a/WireMock.Net Solution.sln b/WireMock.Net Solution.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F890C6F-9ACC-438D-928A-AD61CDA862F2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0BB8B634-407A-4610-A91F-11586990767A}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net", "src\WireMock.Net\WireMock.Net.csproj", "{D3804228-91F4-4502-9595-39584E5A01AD}"
 EndProject

diff --git a/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs b/src/WireMock.Net.Abstractions/Logging/IWireMockLogger.cs
@@ -51,10 +51,10 @@ public interface IWireMockLogger
     /// <summary>
     /// Writes the message at the Error level using the specified exception. 
     /// </summary>
-    /// <param name="formatString">The format string.</param>
+    /// <param name="message">The message.</param>
     /// <param name="exception">The exception.</param>
     [PublicAPI]
-    void Error(string formatString, Exception exception);
+    void Error(string message, Exception exception);
 
     /// <summary>
     /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).

diff --git a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj b/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;net461;netstandard1.0;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net45;net451;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591;8603</NoWarn>
         <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
@@ -36,15 +36,18 @@
 
     <ItemGroup>
         <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.9.0">
+        <PackageReference Include="FluentBuilder" Version="0.10.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
 
-        <PackageReference Include="PolySharp" Version="1.14.0">
+        <PackageReference Include="PolySharp" Version="1.14.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
+
+        <!-- CVE-2018-8292 -->
+        <PackageReference Include="System.Net.Http " Version="4.3.4" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetFramework)' != 'netstandard1.0'">

diff --git a/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj b/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
@@ -39,7 +39,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting" Version="8.2.0" />
+        <PackageReference Include="Aspire.Hosting" Version="8.2.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -26,7 +26,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="RamlToOpenApiConverter" Version="0.6.1" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.17" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.18" />
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
     </ItemGroup>
 

diff --git a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
@@ -4,7 +4,7 @@
     <Description>A RestClient using RestEase to access the admin interface.</Description>
     <AssemblyTitle>WireMock.Net.RestClient</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net45;netstandard1.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.RestClient</AssemblyName>
     <PackageId>WireMock.Net.RestClient</PackageId>
@@ -30,8 +30,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.3.0" />
-    <PackageReference Include="RestEase" Version="1.5.7" />
+    <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
+    <PackageReference Include="RestEase" Version="1.6.4" />
     <PackageReference Include="Stef.Validation" Version="0.1.1" />
   </ItemGroup>
 

diff --git a/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj b/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj
@@ -28,7 +28,7 @@
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="TUnit.Core" Version="0.1.817" />
+        <PackageReference Include="TUnit.Core" Version="0.2.195" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -29,7 +29,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="3.10.0" />
+        <PackageReference Include="Testcontainers" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj b/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
@@ -3,7 +3,7 @@
         <Description>Some extensions for xUnit (ITestOutputHelper)</Description>
         <AssemblyTitle>WireMock.Net.xUnit</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;net451;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>net45;net451;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <AssemblyName>WireMock.Net.xUnit</AssemblyName>
         <RootNamespace>WireMock.Net.Xunit</RootNamespace>

diff --git a/src/WireMock.Net/Logging/WireMockConsoleLogger.cs b/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
@@ -52,15 +52,15 @@ public void Error(string formatString, params object[] args)
     }
 
     /// <see cref="IWireMockLogger.Error(string, Exception)"/>
-    public void Error(string formatString, Exception exception)
+    public void Error(string message, Exception exception)
     {
-        Console.WriteLine(Format("Error", formatString, exception.Message));
+        Console.WriteLine(Format("Error", $"{message} {{0}}", exception));
 
         if (exception is AggregateException ae)
         {
             ae.Handle(ex =>
             {
-                Console.WriteLine(Format("Error", "Exception {0}", ex.Message));
+                Console.WriteLine(Format("Error", "Exception {0}", ex));
                 return true;
             });
         }

diff --git a/src/WireMock.Net/Logging/WireMockNullLogger.cs b/src/WireMock.Net/Logging/WireMockNullLogger.cs
@@ -36,7 +36,7 @@ public void Error(string formatString, params object[] args)
     }
 
     /// <see cref="IWireMockLogger.Error(string, Exception)"/>
-    public void Error(string formatString, Exception exception)
+    public void Error(string message, Exception exception)
     {
         // Log nothing
     }

diff --git a/src/WireMock.Net/Matchers/AbstractJsonPartialMatcher.cs b/src/WireMock.Net/Matchers/AbstractJsonPartialMatcher.cs
@@ -82,7 +82,7 @@ protected override bool IsMatch(JToken value, JToken? input)
             case JTokenType.Object:
                 var nestedValues = value.ToObject<Dictionary<string, JToken>>();
                 return nestedValues?.Any() != true ||
-                       nestedValues.All(pair => IsMatch(pair.Value, input.SelectToken(pair.Key)));
+                       nestedValues.All(pair => IsMatch(pair.Value, input.SelectToken(pair.Key) ?? input[pair.Key])); // First try to select based on JPath expression, else just get the value.
 
             case JTokenType.Array:
                 var valuesArray = value.ToObject<JToken[]>();

diff --git a/src/WireMock.Net/Matchers/GraphQLMatcher.cs b/src/WireMock.Net/Matchers/GraphQLMatcher.cs
@@ -113,16 +113,16 @@ public MatchResult IsMatch(string? input)
         {
             try
             {
-                var executionResult = new DocumentExecuter().ExecuteAsync(_ =>
+                var executionResult = new DocumentExecuter().ExecuteAsync(eo =>
                 {
-                    _.ThrowOnUnhandledException = true;
+                    eo.ThrowOnUnhandledException = true;
 
-                    _.Schema = _schema;
-                    _.Query = graphQLRequest.Query;
+                    eo.Schema = _schema;
+                    eo.Query = graphQLRequest.Query;
 
                     if (graphQLRequest.Variables != null)
                     {
-                        _.Variables = new Inputs(graphQLRequest.Variables);
+                        eo.Variables = new Inputs(graphQLRequest.Variables);
                     }
                 }).GetAwaiter().GetResult();
 

diff --git a/src/WireMock.Net/Server/WireMockServer.Admin.cs b/src/WireMock.Net/Server/WireMockServer.Admin.cs
@@ -181,9 +181,9 @@ public void ReadStaticMappings(string? folder = null)
             {
                 ReadStaticMappingAndAddOrUpdate(filename);
             }
-            catch
+            catch (Exception exception)
             {
-                _settings.Logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename);
+                _settings.Logger.Error($"Static MappingFile : '{filename}' could not be read. This file will be skipped.", exception);
             }
         }
     }

diff --git a/src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs b/src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs
@@ -27,7 +27,9 @@ 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)
+        if (text.StartsWith("{{") && text.EndsWith("}}") &&
+            Handlebars.TryEvaluate(text, model, out var result) &&
+            result is not UndefinedBindingResult)
         {
             return result;
         }

diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj
@@ -59,13 +59,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JsonConverter.Abstractions" Version="0.5.0" />
+        <PackageReference Include="JsonConverter.Abstractions" Version="0.7.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <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="JmesPath.Net" Version="1.0.125" />
-        <PackageReference Include="AnyOf" Version="0.3.0" />
+        <PackageReference Include="JmesPath.Net" Version="1.0.330" />
+        <PackageReference Include="AnyOf" Version="0.4.0" />
         <PackageReference Include="TinyMapper" Version="3.0.3" />
     </ItemGroup>
 
@@ -108,9 +108,6 @@
             <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" />
-
         <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
         <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
     </ItemGroup>
@@ -147,8 +144,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' and '$(TargetFramework)' != 'net461'">
-        <PackageReference Include="GraphQL" Version="7.5.0" />
-        <PackageReference Include="GraphQL.NewtonsoftJson" Version="7.5.0" />
+        <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.2.1" />
         <PackageReference Include="MimeKitLite" Version="4.1.0.1" />
         <PackageReference Include="ProtoBufJsonConverter" Version="0.5.0" />
     </ItemGroup>
@@ -192,6 +188,11 @@
         <PackageReference Include="Handlebars.Net.Helpers.Xslt" Version="2.4.6" />
     </ItemGroup>
 
+    <ItemGroup>
+        <!-- CVE-2021-26701 and https://github.com/WireMock-Net/WireMock.Net/issues/697 -->
+        <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj" />

diff --git a/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj b/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj
@@ -30,8 +30,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AnyOf" Version="0.3.0" />
-        <PackageReference Include="RestEase" Version="1.5.7" />
+        <PackageReference Include="AnyOf" Version="0.4.0" />
+        <PackageReference Include="RestEase" Version="1.6.4" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/dotnet-WireMock.Net/WireMockLogger.cs b/src/dotnet-WireMock.Net/WireMockLogger.cs
@@ -47,9 +47,9 @@ public void Error(string formatString, params object[] args)
     }
 
     /// <see cref="IWireMockLogger.Error(string, Exception)"/>
-    public void Error(string formatString, Exception exception)
+    public void Error(string message, Exception exception)
     {
-        _logger.LogError(exception, formatString);
+        _logger.LogError(exception, message);
     }
 
     /// <see cref="IWireMockLogger.DebugRequestResponse"/>

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+    <ItemGroup Condition=" '$(TargetFramework)' != 'net45' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net461' ">
+        <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
+    </ItemGroup>
+
+</Project>
diff --git a/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj b/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj b/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.Testing" Version="8.2.0" />
+        <PackageReference Include="Aspire.Hosting.Testing" Version="8.2.2" />
         <PackageReference Include="Codecov" Version="1.13.0" />
         <PackageReference Include="coverlet.msbuild" Version="6.0.2">
             <PrivateAssets>all</PrivateAssets>

diff --git a/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj b/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="TUnit" Version="0.1.817" />
+        <PackageReference Include="TUnit" Version="0.2.195" />
     </ItemGroup>
 
     <ItemGroup>