GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map '*' to '\*' in non-strict mode.

Browse Source
This commit is contained in:
vincent-richard 2020-04-06 18:12:41 +02:00
parent f23cc90a6d
commit 6d90a15bc5
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vmime/net/imap/IMAPParser.hpp
View File

@ -1645,8 +1645,12 @@ public:
} else {
type = KEYWORD_OR_EXTENSION;
VIMAP_PARSER_GET(atom, flag_keyword);
if (!parser.isStrict() && VIMAP_PARSER_TRY_CHECK(one_char <'*'> )) {
type = STAR; // map "*" to "\*"
} else {
type = KEYWORD_OR_EXTENSION;
VIMAP_PARSER_GET(atom, flag_keyword);
}
}
*currentPos = pos;

45
tests/net/imap/IMAPParserTest.cpp
View File

@ -37,6 +37,7 @@ VMIME_TEST_SUITE_BEGIN(IMAPParserTest)
VMIME_TEST(testFETCHBodyStructure_NIL_body_fld_param_value)
VMIME_TEST(testFETCHBodyStructure_empty_body_fld_param_instead_of_NIL)
VMIME_TEST(testPipelining)
VMIME_TEST(testStarFlagWithoutBackslash)
VMIME_TEST_LIST_END
@ -304,4 +305,48 @@ VMIME_TEST_SUITE_BEGIN(IMAPParserTest)
VASSERT_EQ("a003 resp_cond_state.status", vmime::net::imap::IMAPParser::resp_cond_state::NO, resp3->continue_req_or_response_data[0]->response_data->resp_cond_state->status);
}
// Some IMAP servers return "*" instead of "\*" in PERMANENTFLAGS
void testStarFlagWithoutBackslash() {
const char* resp =
"* OK [PERMANENTFLAGS (Answered Flagged Deleted Seen Draft *)] Flags permitted.\r\n"
"a001 OK Completed.\r\n";
// Strict mode
{
auto socket = vmime::make_shared <testSocket>();
auto toh = vmime::make_shared <testTimeoutHandler>();
auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>();
socket->localSend(resp);
auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>();
parser->setSocket(socket);
parser->setTimeoutHandler(toh);
parser->setStrict(true);
VASSERT_THROW("strict mode", parser->readResponse(*tag), vmime::exceptions::invalid_response);
}
// Non-strict mode
{
auto socket = vmime::make_shared <testSocket>();
auto toh = vmime::make_shared <testTimeoutHandler>();
auto tag = vmime::make_shared <vmime::net::imap::IMAPTag>();
socket->localSend(resp);
auto parser = vmime::make_shared <vmime::net::imap::IMAPParser>();
parser->setSocket(socket);
parser->setTimeoutHandler(toh);
parser->setStrict(false);
VASSERT_NO_THROW("non-strict mode", parser->readResponse(*tag));
}
}
VMIME_TEST_SUITE_END