Skip to content

Fix BodyParser #1476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefH merged 1 commit into from
Jun 12, 2026
Merged

Fix BodyParser #1476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/WireMock.Net.Shared/Settings/WireMockServerSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,6 @@ public class WireMockServerSettings
[PublicAPI, JsonIgnore]
public IDictionary<string, Func<MatcherModel, IMatcher>>? CustomMatcherMappings { get; set; }

/// <summary>
/// The <see cref="JsonSerializerSettings"/> used when the JSON response is generated.
/// </summary>
[PublicAPI, JsonIgnore]
public JsonSerializerSettings? JsonSerializerSettings { get; set; }

/// <summary>
/// The Culture to use.
/// Currently used for:
Expand Down
5 changes: 3 additions & 2 deletions src/WireMock.Net.Shared/Util/BodyParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Stef.Validation;
using WireMock.Constants;
using WireMock.Matchers;
using WireMock.Serialization;
using WireMock.Types;

namespace WireMock.Util;
Expand All @@ -25,7 +26,7 @@ internal static class BodyParser
CONNECT - No defined body semantics
PATCH - Body supported.
*/
private static readonly IDictionary<string, bool> BodyAllowedForMethods = new Dictionary<string, bool>
private static readonly Dictionary<string, bool> BodyAllowedForMethods = new()
{
{ HttpRequestMethod.HEAD, false },
{ HttpRequestMethod.GET, false },
Expand Down Expand Up @@ -173,7 +174,7 @@ public static async Task<BodyData> ParseAsync(BodyParserSettings settings)
{
try
{
data.BodyAsJson = settings.DefaultJsonConverter.Deserialize<object>(data.BodyAsString);
data.BodyAsJson = settings.DefaultJsonConverter.Deserialize<object>(data.BodyAsString, JsonSerializationConstants.JsonConverterOptionsWithDateParsingNone);
data.DetectedBodyType = BodyType.Json;
}
catch
Expand Down
18 changes: 17 additions & 1 deletion test/WireMock.Net.Tests/Matchers/JsonPartialWildcardMatcherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,4 +416,20 @@ public void JsonPartialWildcardMatcher_IsMatch_WithIgnoreCaseTrueAndRegexTrue_JO
// Assert
Assert.Equal(1.0, match);
}
}

[Fact]
public void JsonPartialWildcardMatcher_IsMatch_WithRegexTrue_DateFormat_ShouldMatch()
{
// Assign
var matcher = new JsonPartialWildcardMatcher(
new { date = "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?(?:Z|[+-]\\d{2}:\\d{2})$", id = 1 },
ignoreCase: false,
regex: true);

// Act
var match = matcher.IsMatch("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}").Score;

// Assert
Assert.Equal(1.0, match);
}
}
42 changes: 29 additions & 13 deletions test/WireMock.Net.Tests/Matchers/SystemTextJsonPartialWildcardMatcherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,17 +366,33 @@ public void SystemTextJsonPartialWildcardMatcher_IsMatch_WithIgnoreCaseTrueAndRe
Assert.Equal(1.0, match);
}

[Fact]
public void SystemTextJsonPartialWildcardMatcher_IsMatch_JsonElement_ShouldMatch()
{
// Assign
var matcher = new SystemTextJsonPartialWildcardMatcher(new { Id = 1, Name = "Test" });

// Act
var jsonElement = JsonDocument.Parse("{ \"Id\" : 1, \"Name\" : \"Test\", \"Extra\" : \"value\" }").RootElement;
var match = matcher.IsMatch(jsonElement).Score;

// Assert
Assert.Equal(1.0, match);
[Fact]
public void SystemTextJsonPartialWildcardMatcher_IsMatch_JsonElement_ShouldMatch()
{
// Assign
var matcher = new SystemTextJsonPartialWildcardMatcher(new { Id = 1, Name = "Test" });

// Act
var jsonElement = JsonDocument.Parse("{ \"Id\" : 1, \"Name\" : \"Test\", \"Extra\" : \"value\" }").RootElement;
var match = matcher.IsMatch(jsonElement).Score;

// Assert
Assert.Equal(1.0, match);
}

[Fact]
public void SystemTextJsonPartialWildcardMatcher_IsMatch_WithRegexTrue_DateFormat_ShouldMatch()
{
// Assign
var matcher = new SystemTextJsonPartialWildcardMatcher(
new { date = "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?(?:Z|[+-]\\d{2}:\\d{2})$", id = 1 },
ignoreCase: false,
regex: true);

// Act
var match = matcher.IsMatch("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}").Score;

// Assert
Assert.Equal(1.0, match);
}
}
}
75 changes: 75 additions & 0 deletions test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,81 @@ public async Task WireMockServer_WithBodyAsJson_UsingWireMockServerSettings_Syst
response.Should().BeEquivalentTo("{\"first_name\":\"John\",\"last_name\":\"Smith\"}");
}

[Fact]
public async Task WireMockServer_WithBodyAsJson_WithJsonPartialWildcardMatcher()
{
// Arrange
using var server = WireMockServer.Start(new WireMockServerSettings
{
Logger = new TestOutputHelperWireMockLogger(testOutputHelper)
});
server
.Given(
Request.Create()
.WithPath("/test")
.UsingPost()
.WithBody(new JsonPartialWildcardMatcher(
new
{
date = @"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$",
id = 1
},
ignoreCase: true,
regex: true
)
)
)
.RespondWith(Response.Create().WithStatusCode(200).WithBody("matched"));

// Act
var requestUri = new Uri($"http://localhost:{server.Port}/test");

var response = await server.CreateClient().PostAsync(requestUri, new StringContent("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}"), _ct);
Comment thread
StefH marked this conversation as resolved.
Dismissed

// Assert
response.StatusCode.Should().Be(HttpStatusCode.OK);

server.Stop();
}

[Fact]
public async Task WireMockServer_WithBodyAsJson_WithSystemTextJsonPartialWildcardMatcher()
{
// Arrange
using var server = WireMockServer.Start(new WireMockServerSettings
{
Logger = new TestOutputHelperWireMockLogger(testOutputHelper),
DefaultJsonSerializer = new SystemTextJsonConverter()
});
server
.Given(
Request.Create()
.WithPath("/test")
.UsingPost()
.WithBody(new SystemTextJsonPartialWildcardMatcher(
new
{
date = @"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$",
id = 1
},
ignoreCase: true,
regex: true
)
)
)
.RespondWith(Response.Create().WithStatusCode(200).WithBody("matched"));

// Act
var requestUri = new Uri($"http://localhost:{server.Port}/test");

var response = await server.CreateClient().PostAsync(requestUri, new StringContent("{\"date\":\"2026-06-09T22:23:18.53421+00:00\",\"id\":1}"), _ct);
Comment thread
StefH marked this conversation as resolved.
Dismissed

// Assert
response.StatusCode.Should().Be(HttpStatusCode.OK);

server.Stop();
}

[Fact]
public async Task WireMockServer_WithBodyAsJson_Using_PostAsJsonAsync_And_MultipleJmesPathMatchers_ShouldMatch()
{
Expand Down
Loading