Multipart Matcher Fix (#1132)

* Add unit tests for AdminApiMappingBuilder (#1131)

* Multipart Matcher Fix

---------

Co-authored-by: Stef Heyenrath <Stef.Heyenrath@gmail.com>
This commit is contained in:
rmeshksar
2024-07-09 12:42:07 -04:00
committed by GitHub
parent 8788d9ba4a
commit 2179df7b44
2 changed files with 131 additions and 38 deletions

View File

@@ -71,23 +71,21 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
{
var mimePartMatchers = Matchers.OfType<MimePartMatcher>().ToArray();
foreach (var mimePart in message.BodyParts.OfType<MimeKit.MimePart>())
foreach (var mimePartMatcher in Matchers.OfType<MimePartMatcher>().ToArray())
{
var matchesForMimePart = new List<MatchResult> { default };
matchesForMimePart.AddRange(mimePartMatchers.Select(matcher => matcher.IsMatch(mimePart)));
score = matchesForMimePart.Select(m => m.Score).Max();
if (MatchScores.IsPerfect(score))
score = MatchScores.Mismatch;
foreach (var mimeBodyPart in message.BodyParts.OfType<MimeKit.MimePart>())
{
if (MatchOperator == MatchOperator.Or)
var matchResult = mimePartMatcher.IsMatch(mimeBodyPart);
if (matchResult.IsPerfect())
{
score = MatchScores.Perfect;
break;
}
}
else
if ((MatchOperator == MatchOperator.Or && MatchScores.IsPerfect(score))
|| (MatchOperator == MatchOperator.And && !MatchScores.IsPerfect(score)))
{
score = MatchScores.Mismatch;
break;
}
}