From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 12 Jan 2023 20:34:49 +0000 (+0200)
Subject: lib-storage: Add mail_storage_service_input.no_free_init_failure
X-Git-Tag: 2.4.0~3118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb4aac5db66dfe8f526ebc54a8bf42dfce7c2de9;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Add mail_storage_service_input.no_free_init_failure

This allows using mail_storage_service_lookup_next() in a way that mail_user
won't be freed on init failures, which allows getting extra information
about why the initialization failed.
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 7f11e34d0b..b4b934e8c4 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -685,6 +685,7 @@ mail_storage_service_init_post(struct mail_storage_service_ctx *ctx,
 	   mail_user_dup() */
 	mail_user = mail_user_alloc_nodup_set(user->event, user->input.username,
 					      user->set_parser);
+	*mail_user_r = mail_user;
 	mail_user->_service_user = user;
 	mail_storage_service_user_ref(user);
 	mail_user_set_home(mail_user, *home == '\0' ? NULL : home);
@@ -769,18 +770,13 @@ mail_storage_service_init_post(struct mail_storage_service_ctx *ctx,
 	T_BEGIN {
 		ret = mail_user_init(mail_user, error_r);
 	} T_END_PASS_STR_IF(ret < 0, error_r);
-	if (ret < 0) {
-		mail_user_unref(&mail_user);
+	if (ret < 0)
 		return -1;
-	}
+
 	if ((user->flags & MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES) == 0) {
-		if (mail_namespaces_init(mail_user, error_r) < 0) {
-			mail_user_deinit(&mail_user);
+		if (mail_namespaces_init(mail_user, error_r) < 0)
 			return -1;
-		}
 	}
-
-	*mail_user_r = mail_user;
 	return 0;
 }
 
@@ -1502,6 +1498,8 @@ mail_storage_service_next_real(struct mail_storage_service_ctx *ctx,
 		(user->flags & MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP) != 0;
 	bool use_chroot;
 
+	*mail_user_r = NULL;
+
 	if (service_parse_privileges(ctx, user, &priv, error_r) < 0)
 		return -2;
 
@@ -1579,6 +1577,8 @@ mail_storage_service_next_real(struct mail_storage_service_ctx *ctx,
 					   session_id_suffix,
 					   mail_user_r, error_r) < 0) {
 		mail_storage_service_io_deactivate_user(user);
+		if (*mail_user_r != NULL && !user->input.no_free_init_failure)
+			mail_user_unref(mail_user_r);
 		return -2;
 	}
 	if (master_service_get_client_limit(master_service) == 1) {
@@ -1642,19 +1642,21 @@ int mail_storage_service_lookup_next(struct mail_storage_service_ctx *ctx,
 				     struct mail_user **mail_user_r,
 				     const char **error_r)
 {
-	struct mail_storage_service_user *user;
 	int ret;
 
-	ret = mail_storage_service_lookup(ctx, input, &user, error_r);
-	if (ret <= 0)
+	ret = mail_storage_service_lookup(ctx, input, user_r, error_r);
+	if (ret <= 0) {
+		*user_r = NULL;
+		*mail_user_r = NULL;
 		return ret;
+	}
 
-	ret = mail_storage_service_next(ctx, user, mail_user_r, error_r);
+	ret = mail_storage_service_next(ctx, *user_r, mail_user_r, error_r);
 	if (ret < 0) {
-		mail_storage_service_user_unref(&user);
+		if (*mail_user_r == NULL)
+			mail_storage_service_user_unref(user_r);
 		return ret;
 	}
-	*user_r = user;
 	return 1;
 }
 
diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 186546fafe..3a1e188596 100644
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -74,6 +74,9 @@ struct mail_storage_service_input {
 	/* The end client connection (not just the previous hop proxy
 	   connection) is using TLS. */
 	bool end_client_tls_secured:1;
+	/* Don't free the user if user initialization fails. The caller is
+	   expected to free the user. */
+	bool no_free_init_failure:1;
 };
 
 extern struct module *mail_storage_service_modules;