imap: pass \Deleted to midb when used in conjunction with long-literal APPEND

Fixes: gromox-0~666

Author: jengelh

mra/imap/cmd.cpp

@@ -2064,16 +2064,16 @@ int icp_append(int argc, char **argv, imap_context &ctx) try
 	return 1918;
 }
 
-static inline bool is_flag_name(const char *flag)
+static inline bool append_allowed_flag_name(const char *flag)
 {
-	static constexpr const char *names[] = {"\\Answered", "\\Flagged", "\\Seen", "\\Draft"};
+	static constexpr const char *names[] = {"\\Answered", "\\Flagged", "\\Seen", "\\Draft", "\\Deleted"};
 	for (auto s : names)
 		if (strcasecmp(flag, s) == 0)
 			return true;
 	return false;
 }
 
-static int icp_append_begin2(int argc, char **argv, imap_context &ctx) try
+static int icp_long_append_begin2(int argc, char **argv, imap_context &ctx) try
 {
 	if (!ctx.is_authed())
 		return 1804 | DISPATCH_BREAK;
@@ -2105,7 +2105,7 @@ static int icp_append_begin2(int argc, char **argv, imap_context &ctx) try
 		if (temp_argc == -1)
 			return 1800 | DISPATCH_BREAK;
 		for (int i = 0; i < temp_argc; ++i)
-			if (!is_flag_name(temp_argv[i]))
+			if (!append_allowed_flag_name(temp_argv[i]))
 				return 1800 | DISPATCH_BREAK;
 	}
 	auto pcontext = &ctx;
@@ -2130,12 +2130,12 @@ static int icp_append_begin2(int argc, char **argv, imap_context &ctx) try
 	return 1918 | DISPATCH_BREAK;
 }
 
-int icp_append_begin(int argc, char **argv, imap_context &ctx)
+int icp_long_append_begin(int argc, char **argv, imap_context &ctx)
 {
-	return icp_dval(argc, argv, ctx, icp_append_begin2(argc, argv, ctx));
+	return icp_dval(argc, argv, ctx, icp_long_append_begin2(argc, argv, ctx));
 }
 
-static int icp_append_end2(int argc, char **argv, imap_context &ctx) try
+static int icp_long_append_end2(int argc, char **argv, imap_context &ctx) try
 {
 	auto pcontext = &ctx;
 	std::string content;
@@ -2199,9 +2199,9 @@ static int icp_append_end2(int argc, char **argv, imap_context &ctx) try
 	return 1918;
 }
 
-int icp_append_end(int argc, char **argv, imap_context &ctx)
+int icp_long_append_end(int argc, char **argv, imap_context &ctx)
 {
-	return icp_dval(argc, argv, ctx, icp_append_end2(argc, argv, ctx));
+	return icp_dval(argc, argv, ctx, icp_long_append_end2(argc, argv, ctx));
 }
 
 int icp_check(int argc, char **argv, imap_context &ctx)

mra/imap/imap.hpp

@@ -172,8 +172,8 @@ extern int icp_xlist(int argc, char **argv, imap_context &);
 extern int icp_lsub(int argc, char **argv, imap_context &);
 extern int icp_status(int argc, char **argv, imap_context &);
 extern int icp_append(int argc, char **argv, imap_context &);
-extern int icp_append_begin(int argc, char **argv, imap_context &);
-extern int icp_append_end(int argc, char **argv, imap_context &);
+extern int icp_long_append_begin(int argc, char **argv, imap_context &);
+extern int icp_long_append_end(int argc, char **argv, imap_context &);
 extern int icp_check(int argc, char **argv, imap_context &);
 extern int icp_close(int argc, char **argv, imap_context &);
 extern int icp_expunge(int argc, char **argv, imap_context &);

mra/imap/parser.cpp

@@ -506,7 +506,7 @@ static tproc_status ps_literal_processing(imap_context &ctx)
 			    argv, std::size(argv));
 		if (argc >= 3 && 0 == strcasecmp(argv[1], "APPEND")) {
 			/* Special handling for APPEND with potentially huge literals */
-			switch (icp_append_begin(argc, argv, ctx)) {
+			switch (icp_long_append_begin(argc, argv, ctx)) {
 			case DISPATCH_CONTINUE: {
 				ctx.current_len = &ctx.read_buffer[ctx.read_offset] - &ctx.literal_ptr[nl_len];
 				if (pcontext->current_len < 0) {
@@ -629,7 +629,7 @@ static tproc_status ps_cmd_processing(imap_context &ctx)
 				pcontext->connection.write(" ", 1);
 				pcontext->connection.write(imap_reply_str, string_length);
 			} else {
-				icp_append_end(argc, argv, ctx);
+				icp_long_append_end(argc, argv, ctx);
 			}
 			pcontext->sched_stat = isched_stat::rdcmd;
 			pcontext->literal_ptr = nullptr;