lmtp: If user has rached lmtp_user_concurrency_limit, fail at RCPT TO stage.

Otherwise LMTP client would have to send the entire email body before
getting the failure.

diff --git a/src/lmtp/client.h b/src/lmtp/client.h
index c5b8b4413536c9a6a1d3d5ea5b476ed916ae3fec..9a2117df26a11caf0905159d246e975e9832dc5a 100644 (file)
--- a/src/lmtp/client.h
+++ b/src/lmtp/client.h
@@ -16,7 +16,6 @@ struct mail_recipient {
 
        struct anvil_query *anvil_query;
        struct mail_storage_service_user *service_user;
-       unsigned int parallel_count;
 };
 
 struct client_state {
@@ -26,9 +25,6 @@ struct client_state {
        ARRAY(struct mail_recipient *) rcpt_to;
        unsigned int rcpt_idx;
 
-       unsigned int anvil_queries;
-       bool anvil_pending_data_write;
-
        unsigned int data_end_idx;
 
        /* Initially we start writing to mail_data. If it grows too large,

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 5528de970a52673c2cd0eaf0ae4012d113450d74..737740e9942b0a3251d8aa27a1af04bbfbd3e85c 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -41,8 +41,6 @@
 
 #define LMTP_PROXY_DEFAULT_TIMEOUT_MSECS (1000*125)
 
-static void client_input_data_write(struct client *client);
-
 int cmd_lhlo(struct client *client, const char *args)
 {
        struct rfc822_parser_context parser;
@@ -600,21 +598,30 @@ lmtp_rcpt_to_is_over_quota(struct client *client,
 static void rcpt_anvil_lookup_callback(const char *reply, void *context)
 {
        struct mail_recipient *rcpt = context;
+       struct client *client = rcpt->client;
+       unsigned int parallel_count;
 
-       i_assert(rcpt->client->state.anvil_queries > 0);
+       i_assert(rcpt->anvil_query != NULL);
 
        rcpt->anvil_query = NULL;
        if (reply == NULL) {
                /* lookup failed */
-       } else if (str_to_uint(reply, &rcpt->parallel_count) < 0) {
+       } else if (str_to_uint(reply, &parallel_count) < 0) {
                i_error("Invalid reply from anvil: %s", reply);
        }
-       if (--rcpt->client->state.anvil_queries == 0 &&
-           rcpt->client->state.anvil_pending_data_write) {
-               /* DATA command was finished, but we were still waiting on
-                  anvil before handling any users */
-               client_input_data_write(rcpt->client);
+
+       if (parallel_count < client->lmtp_set->lmtp_user_concurrency_limit) {
+               client_send_line(client, "250 2.1.5 OK");
+               array_append(&client->state.rcpt_to, &rcpt, 1);
+       } else {
+               client_send_line(client, ERRSTR_TEMP_USERDB_FAIL_PREFIX
+                                "Too many concurrent deliveries for user",
+                                rcpt->address);
+               mail_storage_service_user_free(&rcpt->service_user);
        }
+
+       client_io_reset(client);
+       client_input_handle(client);
 }
 
 int cmd_rcpt(struct client *client, const char *args)
@@ -718,18 +725,22 @@ int cmd_rcpt(struct client *client, const char *args)
                mail_storage_service_user_free(&rcpt->service_user);
                return 0;
        }
-       array_append(&client->state.rcpt_to, &rcpt, 1);
-       client_send_line(client, "250 2.1.5 OK");
 
-       if (client->lmtp_set->lmtp_user_concurrency_limit > 0) {
+       if (client->lmtp_set->lmtp_user_concurrency_limit == 0) {
+               array_append(&client->state.rcpt_to, &rcpt, 1);
+               client_send_line(client, "250 2.1.5 OK");
+               return 0;
+       } else {
                const char *query = t_strconcat("LOOKUP\t",
                        master_service_get_name(master_service),
                        "/", str_tabescape(username), NULL);
-               client->state.anvil_queries++;
+               io_remove(&client->io);
                rcpt->anvil_query = anvil_client_query(anvil, query,
                                        rcpt_anvil_lookup_callback, rcpt);
+               /* stop processing further commands while anvil query is
+                  pending */
+               return rcpt->anvil_query != NULL ? 0 : -1;
        }
-       return 0;
 }
 
 int cmd_quit(struct client *client, const char *args ATTR_UNUSED)
@@ -788,19 +799,9 @@ client_deliver(struct client *client, const struct mail_recipient *rcpt,
        enum mail_error mail_error;
        int ret;
 
-       i_assert(client->state.anvil_queries == 0);
-
        input = mail_storage_service_user_get_input(rcpt->service_user);
        username = t_strdup(input->username);
 
-       if (client->lmtp_set->lmtp_user_concurrency_limit > 0 &&
-           rcpt->parallel_count >= client->lmtp_set->lmtp_user_concurrency_limit) {
-               client_send_line(client, ERRSTR_TEMP_USERDB_FAIL_PREFIX
-                                "Too many concurrent deliveries for user",
-                                rcpt->address);
-               return -1;
-       }
-
        mail_set = mail_storage_service_user_get_mail_set(rcpt->service_user);
        set_parser = mail_storage_service_user_get_settings_parser(rcpt->service_user);
        if (client->proxy_timeout_secs > 0 &&
@@ -1250,10 +1251,7 @@ static void client_input_data_handle(struct client *client)
                return;
        }
 
-       if (client->state.anvil_queries == 0)
-               client_input_data_write(client);
-       else
-               client->state.anvil_pending_data_write = TRUE;
+       client_input_data_write(client);
 }
 
 static void client_input_data(struct client *client)