starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-03-31 22:53:27 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

mp

Browse Source
This commit is contained in:
Stef Heyenrath
2025-12-08 20:00:32 +01:00
parent f8e2c7ee90
commit 846da9d4f6
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
View File

@@ -52,7 +52,7 @@ internal class MimeKitUtils : IMimeKitUtils
return false; return false;
} }
var fixedBytes = FixBytes(bytes, contentTypeHeader[0]); var fixedBytes = PrependContentTypeHeader(bytes, contentTypeHeader[0]);
mimeMessageData = LoadFromStream(new MemoryStream(fixedBytes)); mimeMessageData = LoadFromStream(new MemoryStream(fixedBytes));
return true; return true;
@@ -68,7 +68,10 @@ internal class MimeKitUtils : IMimeKitUtils
return contentTypeHeader.Any(ct => ct.TrimStart().StartsWith("multipart/", StringComparison.OrdinalIgnoreCase)); return contentTypeHeader.Any(ct => ct.TrimStart().StartsWith("multipart/", StringComparison.OrdinalIgnoreCase));
} }
private static byte[] FixBytes(byte[] bytes, WireMockList<string> contentType) /// <summary>
/// Prepends the Content-Type header to the byte array to make it a valid MIME message for MimeKit.
/// </summary>
private static byte[] PrependContentTypeHeader(byte[] bytes, WireMockList<string> contentType)
{ {
var contentTypeBytes = Encoding.UTF8.GetBytes($"{HttpKnownHeaderNames.ContentType}: {contentType}\r\n\r\n"); var contentTypeBytes = Encoding.UTF8.GetBytes($"{HttpKnownHeaderNames.ContentType}: {contentType}\r\n\r\n");

45
test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs
View File

@@ -15,32 +15,31 @@ public class MimePartMatcherTests
private const string TestMultiPart = private const string TestMultiPart =
""" """
From: Content-Type: multipart/mixed; boundary=----MyBoundary123
Date: Sun, 23 Jul 2023 16:13:13 +0200
Subject:
Message-Id: <HZ3K1HEAJKU4.IO57XCVO4BWV@desktop-6dd5qi2>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-5XgmpXt0XOfzdtcgNJc2ZQ=="
--=-5XgmpXt0XOfzdtcgNJc2ZQ== ------MyBoundary123
Content-Type: text/plain; charset=utf-8 Content-Type: text/plain
Content-Disposition: form-data; name="textPart"
This is some plain text This is some plain text.
--=-5XgmpXt0XOfzdtcgNJc2ZQ== ------MyBoundary123
Content-Type: text/json; charset=utf-8 Content-Type: application/json
Content-Disposition: form-data; name="jsonPart"
{ {
"Key": "Value" "id": 42,
"message": "Hello from JSON"
} }
--=-5XgmpXt0XOfzdtcgNJc2ZQ==
Content-Type: image/png; name=image.png ------MyBoundary123
Content-Disposition: attachment; filename=image.png Content-Type: image/png
Content-Disposition: form-data; name="imagePart"; filename="example.png"
Content-Transfer-Encoding: base64 Content-Transfer-Encoding: base64
iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjl iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4
AAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC //8wEzIABCMDgAEMwEAAAwAA//8DAKkCBf4AAAAASUVORK5CYII=
--=-5XgmpXt0XOfzdtcgNJc2ZQ==-- ------MyBoundary123--
"""; """;
[Fact] [Fact]
@@ -52,7 +51,7 @@ public class MimePartMatcherTests
// Act // Act
var contentTypeMatcher = new ContentTypeMatcher("text/plain"); var contentTypeMatcher = new ContentTypeMatcher("text/plain");
var contentMatcher = new ExactMatcher("This is some plain text"); var contentMatcher = new ExactMatcher("This is some plain text.");
var matcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, contentTypeMatcher, null, null, contentMatcher); var matcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, contentTypeMatcher, null, null, contentMatcher);
var result = matcher.IsMatch(part); var result = matcher.IsMatch(part);
@@ -70,8 +69,8 @@ public class MimePartMatcherTests
var part = message.BodyParts[1]; var part = message.BodyParts[1];
// Act // Act
var contentTypeMatcher = new ContentTypeMatcher("text/json"); var contentTypeMatcher = new ContentTypeMatcher("application/json");
var contentMatcher = new JsonMatcher(new { Key = "Value" }, true); var contentMatcher = new JsonPartialMatcher(new { id = 42 }, true);
var matcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, contentTypeMatcher, null, null, contentMatcher); var matcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, contentTypeMatcher, null, null, contentMatcher);
var result = matcher.IsMatch(part); var result = matcher.IsMatch(part);
@@ -89,9 +88,9 @@ public class MimePartMatcherTests
// Act // Act
var contentTypeMatcher = new ContentTypeMatcher("image/png"); var contentTypeMatcher = new ContentTypeMatcher("image/png");
var contentDispositionMatcher = new ExactMatcher("attachment; filename=\"image.png\""); var contentDispositionMatcher = new WildcardMatcher("*filename=\"example.png\"");
var contentTransferEncodingMatcher = new ExactMatcher("base64"); var contentTransferEncodingMatcher = new ExactMatcher("base64");
var contentMatcher = new ExactObjectMatcher(Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC")); var contentMatcher = new ExactObjectMatcher(Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4\r\n//8wEzIABCMDgAEMwEAAAwAA//8DAKkCBf4AAAAASUVORK5CYII="));
var matcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, contentTypeMatcher, contentDispositionMatcher, contentTransferEncodingMatcher, contentMatcher); var matcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, contentTypeMatcher, contentDispositionMatcher, contentTransferEncodingMatcher, contentMatcher);
var result = matcher.IsMatch(part); var result = matcher.IsMatch(part);