Version 2.x (#1359)

* Version 2.x * Setup .NET 9 * 12 * cleanup some #if for NETSTANDARD1_3 * cleanup + fix tests for net8 * openapi * NO ConfigureAwait(false) + cleanup * . * #endif * HashSet * WireMock.Net.NUnit * HttpContext * Add WebSockets (#1423) * Add WebSockets * Add tests * fix * more tests * Add tests * ... * remove IOwin * - * tests * fluent * ok * match * . * byte[] * x * func * func * byte * trans * ... * frameworks......... * jmes * xxx * sc * using var httpClient = new HttpClient(); * usings * maxRetries * up * xunit v3 * ct * --- * ct * ct2 * T Unit * WireMock.Net.TUnitTests / 10 * t unit first * --project * no tunit * t2 * --project * --project * ci - --project * publish ./test/wiremock-coverage.xml * windows * . * log * ... * log * goed * BodyType * . * . * --scenario * ... * pact * ct * . * WireMock.Net.RestClient.AwesomeAssertions (#1427) * WireMock.Net.RestClient.AwesomeAssertions * ok * atpath * fix test * sonar fixes * ports * proxy test * FIX? * --- * await Task.Delay(100, _ct); * ? * --project * Aspire: use IDistributedApplicationEventingSubscriber (#1428) * broadcast * ok * more tsts * . * Collection * up * . * 2 * remove nfluent * <VersionPrefix>2.0.0-preview-02</VersionPrefix> * ... * . * nuget icon * . * <PackageReference Include="JmesPath.Net" Version="1.1.0" /> * x * 500 * . * fix some warnings * ws
2026-05-31 11:00:41 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
@@ -1,11 +1,8 @@
 // Copyright © WireMock.Net

-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading.Tasks;
 using Stef.Validation;
 using WireMock.Constants;
 using WireMock.Matchers;
@@ -16,7 +13,7 @@ namespace WireMock.Util;
 internal static class BodyParser
 {
    private static readonly Encoding DefaultEncoding = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true);
-    private static readonly Encoding[] SupportedBodyAsStringEncodingForMultipart = [ DefaultEncoding, Encoding.ASCII ];
+    private static readonly Encoding[] SupportedBodyAsStringEncodingForMultipart = [DefaultEncoding, Encoding.ASCII];

    /*
        HEAD - No defined body semantics.
@@ -156,7 +153,7 @@ internal static class BodyParser
        }

        // Try to get the body as String, FormUrlEncoded or Json
-        try
+        if (IsProbablyText(data.BodyAsBytes))
        {
            data.BodyAsString = DefaultEncoding.GetString(data.BodyAsBytes);
            data.Encoding = DefaultEncoding;
@@ -168,15 +165,8 @@ internal static class BodyParser
                QueryStringParser.TryParse(data.BodyAsString, false, out var nameValueCollection)
            )
            {
-                try
-                {
-                    data.BodyAsFormUrlEncoded = nameValueCollection;
-                    data.DetectedBodyType = BodyType.FormUrlEncoded;
-                }
-                catch
-                {
-                    // Deserialize FormUrlEncoded failed, just ignore.
-                }
+                data.BodyAsFormUrlEncoded = nameValueCollection;
+                data.DetectedBodyType = BodyType.FormUrlEncoded;
            }

            // If string is not null or empty, try to deserialize the string to a JObject
@@ -193,14 +183,10 @@ internal static class BodyParser
                }
            }
        }
-        catch
-        {
-            // Reading as string failed, just ignore
-        }

        return data;
    }
-    
+
    private static async Task<(string? ContentType, byte[] Bytes)> ReadBytesAsync(Stream stream, string? contentEncoding = null, bool decompressGZipAndDeflate = true)
    {
        using var memoryStream = new MemoryStream();
@@ -215,4 +201,39 @@ internal static class BodyParser

        return (null, data);
    }
+
+    public static bool IsProbablyText(byte[] data)
+    {
+        if (data.Length == 0)
+        {
+            return true;
+        }
+
+        // 1) Quick binary detection
+        for (int i = 0; i < data.Length; i++)
+        {
+            if (data[i] == 0)
+            {
+                return false;
+            }
+        }
+
+        // 2) Validate UTF-8
+        string text;
+        try
+        {
+            text = DefaultEncoding.GetString(data);
+        }
+        catch
+        {
+            return false;
+        }
+
+        // 3) Count printable characters
+        var printable = text.Count(c => !char.IsControl(c) || char.IsWhiteSpace(c));
+        var ratio = (double)printable / text.Length;
+
+        // Threshold commonly used by tools like git
+        return ratio > 0.85;
+    }
 }