Reflect the following changes.

---- commit ac26fa6 Author: Jeffrey Stedfast <[email protected]> Date: Thu Jan 16 16:44:53 2020 -0500 Fixed mailbox address parser to be more lenient about []'s in the display-name Fixes issue jstedfast#532
access-company · Mar 5, 2021 · 3c3cfb0 · 3c3cfb0
1 parent e6f8c07
commit 3c3cfb0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/MimeKit/InternetAddress.cs b/MimeKit/InternetAddress.cs
@@ -633,7 +633,7 @@ internal static bool TryParse (ParserOptions options, byte[] text, ref int index
 							trimLeadingQuote = true;
 					}
 				} else {
-					if (!ParseUtils.SkipWordAndPeriod (text, ref index, endIndex, throwOnError))
+					if (!ParseUtils.SkipPhraseWordAndPeriod (text, ref index, endIndex, throwOnError))
 						break;
 				}
 

diff --git a/MimeKit/Utils/ParseUtils.cs b/MimeKit/Utils/ParseUtils.cs
@@ -274,6 +274,20 @@ public static bool SkipWordAndPeriod (byte[] text, ref int index, int endIndex,
 			return false;
 		}
 
+		public static bool SkipPhraseWordAndPeriod (byte[] text, ref int index, int endIndex, bool throwOnError)
+		{
+			if (text[index] == (byte) '"')
+				return SkipQuoted (text, ref index, endIndex, throwOnError);
+
+			if (text[index].IsPhraseAtom ())
+				return SkipPhraseAtom (text, ref index, endIndex);
+
+			if (text[index] == (byte) '.')
+				return SkipPeriod (text, ref index, endIndex);
+
+			return false;
+		}
+
 		public static bool IsSentinel (byte c, byte[] sentinels)
 		{
 			for (int i = 0; i < sentinels.Length; i++) {

diff --git a/UnitTests/InternetAddressTests.cs b/UnitTests/InternetAddressTests.cs
@@ -643,6 +643,11 @@ static TestCaseData[] LegacyAddressNotCompliantWithRFC()
 				new TestCaseData ("[email protected]"),
 				new TestCaseData ("[email protected]"),
 
+				// Not compliant with RFC (Square brackets in display name)
+				new TestCaseData ("[Invalid Sender] <[email protected]>"),
+				new TestCaseData ("[Invalid Sender] <[email protected]>"),
+				new TestCaseData ("[Invalid Sender] <[email protected]>"),
+
 				// More not compliant with RFC
 				// Does not correspond now.
 				//new TestCaseData ("アドレス <aa\"[email protected]>"),

diff --git a/UnitTests/MailboxAddressTests.cs b/UnitTests/MailboxAddressTests.cs
@@ -954,6 +954,11 @@ static TestCaseData[] LegacyAddressNotCompliantWithRFC ()
 				new TestCaseData ("[email protected]"),
 				new TestCaseData ("[email protected]"),
 
+				// Not compliant with RFC (Square brackets in display name)
+				new TestCaseData ("[Invalid Sender] <[email protected]>"),
+				new TestCaseData ("[Invalid Sender] <[email protected]>"),
+				new TestCaseData ("[Invalid Sender] <[email protected]>"),
+
 				// More not compliant with RFC
 				// Does not correspond now.
 				//new TestCaseData ("アドレス <aa\"[email protected]>"),