Fixed tokenization of atom tokens that start with +

jstedfast · jstedfast · commit 9b94b1c5b74a · 2025-05-23T14:58:32.000-04:00
Don't assume that if the first char of a token is a + that it's the only character in the atom string. Fixes issue #1914
diff --git a/MailKit/Net/Imap/ImapStream.cs b/MailKit/Net/Imap/ImapStream.cs
@@ -836,12 +836,6 @@ public ImapToken ReadToken (string specials, CancellationToken cancellationToken
 			if (c == '\\')
 				return ReadFlagToken (specials, cancellationToken);
 
-			if (c == '+') {
-				inputIndex++;
-
-				return ImapToken.Plus;
-			}
-
 			if (IsAtom (input[inputIndex], specials))
 				return ReadAtomToken (specials, cancellationToken);
 
@@ -888,12 +882,6 @@ public async ValueTask<ImapToken> ReadTokenAsync (string specials, CancellationT
 			if (c == '\\')
 				return await ReadFlagTokenAsync (specials, cancellationToken).ConfigureAwait (false);
 
-			if (c == '+') {
-				inputIndex++;
-
-				return ImapToken.Plus;
-			}
-
 			if (IsAtom (input[inputIndex], specials))
 				return await ReadAtomTokenAsync (specials, cancellationToken).ConfigureAwait (false);
 
diff --git a/MailKit/Net/Imap/ImapToken.cs b/MailKit/Net/Imap/ImapToken.cs
@@ -155,6 +155,8 @@ public static ImapToken Create (ImapTokenType type, ByteArrayBuilder builder)
 					}
 				}
 
+				if (builder.Equals ("+", false))
+					return Plus;
 				if (builder.Equals ("OK", false))
 					return Ok;
 				if (builder.Equals ("FETCH", false))
diff --git a/UnitTests/Net/Imap/ImapClientTests.cs b/UnitTests/Net/Imap/ImapClientTests.cs
diff --git a/UnitTests/Net/Imap/Resources/gmail/list-all-no-status.txt b/UnitTests/Net/Imap/Resources/gmail/list-all-no-status.txt
@@ -1,4 +1,5 @@
 * LIST (\HasNoChildren \Subscribed) "/" "INBOX"
+* LIST (\HasNoChildren \Subscribed) "/" +Folder
 * LIST (\HasChildren \NonExistent \Subscribed) "/" "[Gmail]"
 * LIST (\HasNoChildren \Subscribed) "/" "[Gmail]/All Mail"
 * LIST (\HasNoChildren \Subscribed) "/" "[Gmail]/Drafts"
diff --git a/UnitTests/Net/Imap/Resources/gmail/list-all.txt b/UnitTests/Net/Imap/Resources/gmail/list-all.txt
@@ -1,5 +1,7 @@
 * LIST (\HasNoChildren \Subscribed) "/" "INBOX"
 * STATUS "INBOX" (HIGHESTMODSEQ 41234 MESSAGES 60 RECENT 0 UIDNEXT 410 UIDVALIDITY 1 UNSEEN 0 SIZE 1024 MAILBOXID (d0f3b017-d3ec-40aa-9bb9-66c1aeccbb24))
+* LIST (\HasNoChildren \Subscribed) "/" +Folder
+* STATUS +Folder (HIGHESTMODSEQ 41234 MESSAGES 6 RECENT 0 UIDNEXT 7 UIDVALIDITY 1 UNSEEN 0 SIZE 1024 MAILBOXID (f001Ed6c-ebee-41a5-a65e-9498d3e0aec0))
 * LIST (\HasChildren \NonExistent \Subscribed) "/" "[Gmail]"
 * LIST (\HasNoChildren \Subscribed) "/" "[Gmail]/All Mail"
 * STATUS "[Gmail]/All Mail" (HIGHESTMODSEQ 41234 MESSAGES 67 RECENT 0 UIDNEXT 1210 UIDVALIDITY 11 UNSEEN 3 SIZE 1024 MAILBOXID (f668b57d-9f42-453b-b315-a18cd3eb0f85))
diff --git a/UnitTests/Net/Imap/Resources/gmail/lsub-all.txt b/UnitTests/Net/Imap/Resources/gmail/lsub-all.txt
@@ -1,4 +1,5 @@
 * LSUB (\HasNoChildren) "/" "INBOX"
+* LSUB (\HasNoChildren) "/" +Folder
 * LSUB (\HasChildren \NonExistent) "/" "[Gmail]"
 * LSUB (\HasNoChildren) "/" "[Gmail]/All Mail"
 * LSUB (\HasNoChildren) "/" "[Gmail]/Drafts"
diff --git a/UnitTests/Net/Imap/Resources/gmail/status-+folder.txt b/UnitTests/Net/Imap/Resources/gmail/status-+folder.txt
@@ -0,0 +1,2 @@
+* STATUS +Folder (HIGHESTMODSEQ 41234 MESSAGES 6 RECENT 0 UIDNEXT 7 UIDVALIDITY 1 UNSEEN 0 SIZE 1024 MAILBOXID (f001Ed6c-ebee-41a5-a65e-9498d3e0aec0))
+A######## OK Success

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ public static ImapToken Create (ImapTokenType type, ByteArrayBuilder builder)`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
	`158`	`+ if (builder.Equals ("+", false))`
	`159`	`+ return Plus;`
`158`	`160`	`if (builder.Equals ("OK", false))`
`159`	`161`	`return Ok;`
`160`	`162`	`if (builder.Equals ("FETCH", false))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`* LIST (\HasNoChildren \Subscribed) "/" "INBOX"`
	`2`	`+* LIST (\HasNoChildren \Subscribed) "/" +Folder`
`2`	`3`	`* LIST (\HasChildren \NonExistent \Subscribed) "/" "[Gmail]"`
`3`	`4`	`* LIST (\HasNoChildren \Subscribed) "/" "[Gmail]/All Mail"`
`4`	`5`	`* LIST (\HasNoChildren \Subscribed) "/" "[Gmail]/Drafts"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`* LSUB (\HasNoChildren) "/" "INBOX"`
	`2`	`+* LSUB (\HasNoChildren) "/" +Folder`
`2`	`3`	`* LSUB (\HasChildren \NonExistent) "/" "[Gmail]"`
`3`	`4`	`* LSUB (\HasNoChildren) "/" "[Gmail]/All Mail"`
`4`	`5`	`* LSUB (\HasNoChildren) "/" "[Gmail]/Drafts"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+* STATUS +Folder (HIGHESTMODSEQ 41234 MESSAGES 6 RECENT 0 UIDNEXT 7 UIDVALIDITY 1 UNSEEN 0 SIZE 1024 MAILBOXID (f001Ed6c-ebee-41a5-a65e-9498d3e0aec0))`
	`2`	`+A######## OK Success`