Allow SPACEs at end of response line (Apple iCloud IMAP server).

3 files changed, 96 insertions, 1 deletions

diff --git a/SConstruct b/SConstruct
index 4986af77..11deb6bd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -397,6 +397,7 @@ libvmimetest_sources = [
 	'tests/net/pop3/POP3ResponseTest.cpp',
 	'tests/net/pop3/POP3UtilsTest.cpp',
 	'tests/net/imap/IMAPTagTest.cpp',
+	'tests/net/imap/IMAPParserTest.cpp',
 	'tests/net/smtp/SMTPTransportTest.cpp',
 	'tests/net/smtp/SMTPCommandTest.cpp',
 	'tests/net/smtp/SMTPCommandSetTest.cpp',
diff --git a/tests/net/imap/IMAPParserTest.cpp b/tests/net/imap/IMAPParserTest.cpp
new file mode 100644
index 00000000..93f6e6fd
--- /dev/null
+++ b/tests/net/imap/IMAPParserTest.cpp
@@ -0,0 +1,66 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "vmime/net/imap/IMAPTag.hpp"
+#include "vmime/net/imap/IMAPParser.hpp"
+
+
+VMIME_TEST_SUITE_BEGIN(IMAPParserTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testExtraSpaceInCapaResponse)
+	VMIME_TEST_LIST_END
+
+
+	// For Apple iCloud IMAP server
+	void testExtraSpaceInCapaResponse()
+	{
+		vmime::ref <testSocket> socket = vmime::create <testSocket>();
+		vmime::ref <vmime::net::timeoutHandler> toh = vmime::create <testTimeoutHandler>();
+
+		vmime::ref <vmime::net::imap::IMAPTag> tag =
+			vmime::create <vmime::net::imap::IMAPTag>();
+
+		socket->localSend(
+			"* CAPABILITY IMAP4rev1 AUTH=ATOKEN AUTH=PLAIN \r\n"  // extra space at end
+			"a001 OK Capability completed.\r\n");
+
+		vmime::ref <vmime::net::imap::IMAPParser> parser =
+			vmime::create <vmime::net::imap::IMAPParser>(tag, socket.dynamicCast <vmime::net::socket>(), toh);
+
+		parser->setStrict(false);
+		VASSERT_NO_THROW("non-strict mode", parser->readResponse(/* literalHandler */ NULL));
+
+		++(*tag);
+
+		socket->localSend(
+			"* CAPABILITY IMAP4rev1 AUTH=ATOKEN AUTH=PLAIN \r\n"  // extra space at end
+			"a002 OK Capability completed.\r\n");
+
+		parser->setStrict(true);
+		VASSERT_THROW("strict mode", parser->readResponse(/* literalHandler */ NULL), vmime::exceptions::invalid_response);
+	}
+
+VMIME_TEST_SUITE_END
diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp
index c8300122..fe05cd62 100644
--- a/vmime/net/imap/IMAPParser.hpp
+++ b/vmime/net/imap/IMAPParser.hpp
@@ -2111,7 +2111,13 @@ public:
 
 			while (parser.check <SPACE>(line, &pos, true))
 			{
-				capability* cap = parser.get <capability>(line, &pos);
+				capability* cap;
+
+				if (parser.isStrict() || m_capabilities.empty())
+					cap = parser.get <capability>(line, &pos);
+				else
+					cap = parser.get <capability>(line, &pos, /* noThrow */ true);  // allow SPACE at end of line (Apple iCloud IMAP server)
+
 				if (cap == NULL) break;
 
 				m_capabilities.push_back(cap);
@@ -4574,6 +4580,13 @@ public:
 						if (!(m_message_data = parser.get <IMAPParser::message_data>(line, &pos, true)))
 							m_capability_data = parser.get <IMAPParser::capability_data>(line, &pos);
 
+			if (!parser.isStrict())
+			{
+				// Allow SPACEs at end of line
+				while (parser.check <SPACE>(line, &pos, /* noThrow */ true))
+					;
+			}
+
 			parser.check <CRLF>(line, &pos);
 
 			*currentPos = pos;
@@ -4666,6 +4679,13 @@ public:
 
 			m_resp_cond_bye = parser.get <IMAPParser::resp_cond_bye>(line, &pos);
 
+			if (!parser.isStrict())
+			{
+				// Allow SPACEs at end of line
+				while (parser.check <SPACE>(line, &pos, /* noThrow */ true))
+					;
+			}
+
 			parser.check <CRLF>(line, &pos);
 
 			*currentPos = pos;
@@ -4708,6 +4728,14 @@ public:
 			parser.check <IMAPParser::xtag>(line, &pos);
 			parser.check <SPACE>(line, &pos);
 			m_resp_cond_state = parser.get <IMAPParser::resp_cond_state>(line, &pos);
+
+			if (!parser.isStrict())
+			{
+				// Allow SPACEs at end of line
+				while (parser.check <SPACE>(line, &pos, /* noThrow */ true))
+					;
+			}
+
 			parser.check <CRLF>(line, &pos);
 
 			*currentPos = pos;