56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 62061e8cf68f506c0ccaaba21fd4174764ca875f Mon Sep 17 00:00:00 2001
|
|
From: Timo Sirainen <timo.sirainen@open-xchange.com>
|
|
Date: Mon, 17 Aug 2020 18:15:35 +0300
|
|
Subject: [PATCH] imap-login: Split off client_invalid_command()
|
|
|
|
---
|
|
src/imap-login/imap-login-client.c | 27 +++++++++++++++++----------
|
|
1 file changed, 17 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c
|
|
index e2af176309..ce5049d567 100644
|
|
--- a/src/imap-login/imap-login-client.c
|
|
+++ b/src/imap-login/imap-login-client.c
|
|
@@ -194,6 +194,22 @@ static int client_command_execute(struct imap_client *client, const char *cmd,
|
|
return login_cmd->func(client, args);
|
|
}
|
|
|
|
+static bool client_invalid_command(struct imap_client *client)
|
|
+{
|
|
+ if (*client->cmd_tag == '\0')
|
|
+ client->cmd_tag = "*";
|
|
+ if (++client->common.bad_counter >= CLIENT_MAX_BAD_COMMANDS) {
|
|
+ client_send_reply(&client->common, IMAP_CMD_REPLY_BYE,
|
|
+ "Too many invalid IMAP commands.");
|
|
+ client_destroy(&client->common,
|
|
+ "Disconnected: Too many invalid commands");
|
|
+ return FALSE;
|
|
+ }
|
|
+ client_send_reply(&client->common, IMAP_CMD_REPLY_BAD,
|
|
+ "Error in IMAP command received by server.");
|
|
+ return TRUE;
|
|
+}
|
|
+
|
|
static bool imap_is_valid_tag(const char *tag)
|
|
{
|
|
for (; *tag != '\0'; tag++) {
|
|
@@ -326,17 +342,8 @@ static bool imap_client_input_next_cmd(struct client *_client)
|
|
"not the command name. Add that before the command, "
|
|
"like: a login user pass");
|
|
} else if (ret < 0) {
|
|
- if (*client->cmd_tag == '\0')
|
|
- client->cmd_tag = "*";
|
|
- if (++client->common.bad_counter >= CLIENT_MAX_BAD_COMMANDS) {
|
|
- client_send_reply(&client->common, IMAP_CMD_REPLY_BYE,
|
|
- "Too many invalid IMAP commands.");
|
|
- client_destroy(&client->common,
|
|
- "Disconnected: Too many invalid commands");
|
|
+ if (!client_invalid_command(client))
|
|
return FALSE;
|
|
- }
|
|
- client_send_reply(&client->common, IMAP_CMD_REPLY_BAD,
|
|
- "Error in IMAP command received by server.");
|
|
}
|
|
|
|
return ret != 0 && !client->common.destroyed;
|