Fixed "Content-Type multipart/form-data" (#249)

src/WireMock.Net/Util/BodyParser.cs

@@ -1,11 +1,11 @@
-using System;
+using JetBrains.Annotations;
+using MimeKit;
+using Newtonsoft.Json;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
-using MimeKit;
-using Newtonsoft.Json;
 using WireMock.Matchers;
 using WireMock.Validation;
 
@@ -28,6 +28,10 @@ namespace WireMock.Util
         */
         private static readonly string[] AllowedBodyParseMethods = { "PUT", "POST", "OPTIONS", "PATCH" };
 
+        private static readonly IStringMatcher[] MultipartContentTypesMatchers = {
+            new WildcardMatcher("multipart/*", true)
+        };
+
         private static readonly IStringMatcher[] JsonContentTypesMatchers = {
             new WildcardMatcher("application/json", true),
             new WildcardMatcher("application/vnd.*+json", true)
@@ -68,6 +72,11 @@ namespace WireMock.Util
                 return BodyType.Json;
             }
 
+            if (MultipartContentTypesMatchers.Any(matcher => MatchScores.IsPerfect(matcher.IsMatch(contentType.MimeType))))
+            {
+                return BodyType.MultiPart;
+            }
+
             return BodyType.Bytes;
         }
 
@@ -82,6 +91,12 @@ namespace WireMock.Util
                 DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(contentType)
             };
 
+            // In case of MultiPart: never try to read as String but keep as-is
+            if (data.DetectedBodyTypeFromContentType == BodyType.MultiPart)
+            {
+                return data;
+            }
+
             // Try to get the body as String
             try
             {

src/WireMock.Net/Util/BodyType.cs

@@ -28,6 +28,11 @@
         /// <summary>
         /// Body is a File
         /// </summary>
-        File
+        File,
+
+        /// <summary>
+        /// Body is a MultiPart
+        /// </summary>
+        MultiPart
     }
 }