details: https://hg.nginx.org/nginx/rev/3974f4e56a4e
branches:
changeset: 7839:3974f4e56a4e
user: Maxim Dounin <mdounin@mdounin.ru>
date: Wed May 19 03:13:20 2021 +0300
description:
Mail: fixed s->arg_start clearing on invalid IMAP commands.

Previously, s->arg_start was left intact after invalid IMAP commands,
and this might result in an argument incorrectly added to the following
command. Similarly, s->backslash was left intact as well, leading
to unneeded backslash removal.

For example (LFs from the client are explicitly shown as "<LF>"):

S: * OK IMAP4 ready
C: a01 login "\<LF>
S: a01 BAD invalid command
C: a0000000000\2 authenticate <LF>
S: a00000000002 aBAD invalid command

The backslash followed by LF generates invalid command with s->arg_start
and s->backslash set, the following command incorrectly treats anything
from the old s->arg_start to the space after the command as an argument,
and removes the backslash from the tag. If there is no space, s->arg_end
will be NULL.

Both things seem to be harmless though. In particular:

- This can be used to provide an incorrect argument to a command without
arguments. The only command which seems to look at the single argument
is AUTHENTICATE, and it checks the argument length before trying to
access it.

- Backslash removal uses the "end" pointer, and stops due to "src < end"
condition instead of scanning all the process memory if s->arg_end is
NULL (and arg[0].len is huge).

- There should be no backslashes in unquoted strings.

An obvious fix is to clear s->arg_start and s->backslash on invalid commands,
similarly to how it is done in POP3 parsing (added in 810:e3aa8f305d21) and
SMTP parsing.

This, however, makes it clear that s->arg_start handling in the "done"
label is wrong: s->arg_start cannot be legitimately set there, as it
is expected to be cleared in all possible cases when the "done" label is
reached. The relevant code is dead and will be removed by the following
change.

diffstat:

src/mail/ngx_mail_parse.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 815c63581be4 -r 3974f4e56a4e src/mail/ngx_mail_parse.c
--- a/src/mail/ngx_mail_parse.c Wed May 19 03:13:18 2021 +0300
+++ b/src/mail/ngx_mail_parse.c Wed May 19 03:13:20 2021 +0300
@@ -637,7 +637,9 @@ done:
invalid:

s->state = sw_start;
+ s->arg_start = NULL;
s->quoted = 0;
+ s->backslash = 0;
s->no_sync_literal = 0;
s->literal_len = 0;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel