exmdb: make message creation RPCs support EML midstrs with subdirs

References: GXL-411

Author: jengelh

exch/exmdb/common_util.cpp

@@ -4694,6 +4694,11 @@ static errno_t copy_eml_ext(const char *old_midstr, std::string &new_midstr) try
 	new_midstr = fmt::format("{}.x{}.{}", time(nullptr), common_util_sequence_ID(), get_host_ID());
 	auto old_eml = fmt::format("{}/eml/{}", basedir, old_midstr);
 	auto new_eml = fmt::format("{}/eml/{}", basedir, new_midstr);
+	auto ret = gx_mkbasedir(new_eml.c_str(), FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+	if (ret < 0) {
+		mlog(LV_ERR, "E-1493: mkbasedir for %s: %s", new_eml.c_str(), strerror(-ret));
+		return -ret;
+	}
 	/*
 	 * Partial mailboxes (without cid/-like directories) are
 	 * normal for debugging, don't warn in that case.
@@ -4707,6 +4712,11 @@ static errno_t copy_eml_ext(const char *old_midstr, std::string &new_midstr) try
 	}
 	auto old_ext = fmt::format("{}/ext/{}", basedir, old_midstr);
 	auto new_ext = fmt::format("{}/ext/{}", basedir, new_midstr);
+	ret = gx_mkbasedir(new_ext.c_str(), FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+	if (ret < 0) {
+		mlog(LV_ERR, "E-1495: mkbasedir for %s: %s", new_ext.c_str(), strerror(-ret));
+		return -ret;
+	}
 	if (link(old_ext.c_str(), new_ext.c_str()) < 0) {
 		int se = errno;
 		if (errno != ENOENT || g_dbg_synth_content == 0)

exch/exmdb/message.cpp

@@ -3104,7 +3104,12 @@ static ec_error_t op_delegate(const rulexec_in &rp, seen_list &seen,
 		auto mid_string = fmt::format("{}.x{}.{}", time(nullptr),
 		                  common_util_sequence_ID(), get_host_ID());
 		auto eml_path = maildir + "/eml/"s + mid_string;
-		auto ret = HX_copy_file(tmp_path1, eml_path.c_str(), 0);
+		auto ret = gx_mkbasedir(eml_path.c_str(), FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+		if (ret < 0) {
+			mlog(LV_ERR, "E-1492: mkbasedir for %s: %s", eml_path.c_str(), strerror(-ret));
+			continue;
+		}
+		ret = HX_copy_file(tmp_path1, eml_path.c_str(), 0);
 		if (ret < 0) {
 			mlog(LV_ERR, "E-1606: HX_copy_file %s -> %s: %s",
 			        tmp_path1, eml_path.c_str(), strerror(-ret));
@@ -3410,7 +3415,12 @@ static ec_error_t opx_delegate(const rulexec_in &rp, const rule_node &rule,
 		auto mid_string = fmt::format("{}.x{}.{}", time(nullptr),
 		                  common_util_sequence_ID(), get_host_ID());
 		auto eml_path = maildir + "/eml/"s + mid_string;
-		auto ret = HX_copy_file(tmp_path1, eml_path.c_str(), 0);
+		auto ret = gx_mkbasedir(eml_path.c_str(), FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+		if (ret < 0) {
+			mlog(LV_ERR, "E-1493: mkbasedir for %s: %s", eml_path.c_str(), strerror(-ret));
+			continue;
+		}
+		ret = HX_copy_file(tmp_path1, eml_path.c_str(), 0);
 		if (ret < 0) {
 			mlog(LV_ERR, "E-1607: HX_copy_file %s -> %s: %s",
 			        tmp_path1, eml_path.c_str(), strerror(-ret));
@@ -3766,6 +3776,11 @@ BOOL exmdb_server::deliver_message(const char *dir, const char *from_address,
 		snprintf(tmp_path, std::size(tmp_path), "%s/ext/%s",
 		         exmdb_server::get_dir(), mid_string);
 		auto djson = json_to_str(std::move(newdigest));
+		auto ret = gx_mkbasedir(tmp_path, FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+		if (ret < 0) {
+			mlog(LV_ERR, "E-1942: mkbasedir for %s: %s", tmp_path, strerror(-ret));
+			return false;
+		}
 		wrapfd fd = open(tmp_path, O_CREAT | O_TRUNC | O_WRONLY, FMODE_PRIVATE);
 		if (fd.get() >= 0) {
 			if (HXio_fullwrite(fd.get(), djson.c_str(), djson.size()) < 0 ||
@@ -3900,6 +3915,11 @@ BOOL exmdb_server::write_message(const char *dir, cpid_t cpid,
 		if (json_from_str(digest_stream, digest) &&
 		    digest["file"].asString().size() > 0) {
 			std::string ext_file = exmdb_server::get_dir() + "/ext/"s + digest["file"].asString();
+			auto ret = gx_mkbasedir(ext_file.c_str(), FMODE_PRIVATE);
+			if (ret < 0) {
+				mlog(LV_ERR, "E-1944: mkbasedir for %s: %s", ext_file.c_str(), strerror(-ret));
+				return false;
+			}
 			wrapfd fd = open(ext_file.c_str(), O_CREAT | O_TRUNC | O_WRONLY, FMODE_PRIVATE);
 			if (fd.get() >= 0) {
 				if (HXio_fullwrite(fd.get(), digest_stream.c_str(), digest_stream.size()) < 0 ||

exch/exmdb/store2.cpp

@@ -652,7 +652,14 @@ BOOL exmdb_server::imapfile_write(const char *dir, const std::string &type,
 	auto wrret = HXio_fullwrite(fd, data.data(), data.size());
 	if (wrret < 0 || static_cast<size_t>(wrret) != data.size())
 		return false;
+
 	auto tgt = fmt::format("{}/{}/{}", dir, type, mid);
+	auto ret = gx_mkbasedir(mid.c_str(), FMODE_PRIVATE);
+	if (ret < 0) {
+		mlog(LV_ERR, "E-1941: mkdir %s: %s", mid.c_str(), strerror(-ret));
+		return false;
+	}
+
 	auto err = tf.link_to(tgt.c_str());
 	if (err != 0) {
 		mlog(LV_ERR, "E-1752: link_to %s: %s", tgt.c_str(), strerror(errno));

mda/exmdb_local/exmdb_local.cpp

@@ -288,6 +288,12 @@ delivery_status exmdb_local_deliverquota(MESSAGE_CONTEXT *pcontext,
 	}
 	auto mid_string = fmt::format("{}.l{}.{}", time(nullptr), sequence_ID, hostname);
 	auto eml_path = mres.maildir + "/eml/" + mid_string;
+
+	auto iret = gx_mkbasedir(eml_path.c_str(), FMODE_PRIVATE | S_IXUSR | S_IXGRP);
+	if (iret < 0) {
+		mlog(LV_ERR, "E-1493: mkbasedir for %s: %s", eml_path.c_str(), strerror(-iret));
+		return delivery_status::temp_fail;
+	}
 	wrapfd fd = open(eml_path.c_str(), O_CREAT | O_RDWR | O_TRUNC, FMODE_PRIVATE);
 	if (fd.get() < 0) {
 		auto se = errno;