ftp,imap,pop3,smtp: reject STARTTLS server response pipelining

If a server pipelines future responses within the STARTTLS response, the
former are preserved in the pingpong cache across TLS negotiation and
used as responses to the encrypted commands.

This fix detects pipelined STARTTLS responses and rejects them with an
error.

CVE-2021-22947

Bug: https://curl.se/docs/CVE-2021-22947.html
This commit is contained in:
Patrick Monnerat 2021-09-07 13:26:42 +02:00 committed by Daniel Stenberg
parent 364f174724
commit 8ef147c436
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
9 changed files with 236 additions and 1 deletions

52
tests/data/test983 Normal file
View file

@ -0,0 +1,52 @@
<testcase>
<info>
<keywords>
FTP
STARTTLS
</keywords>
</info>
#
# Server-side
<reply>
<servercmd>
REPLY AUTH 500 unknown command\r\n500 unknown command\r\n331 give password\r\n230 Authenticated\r\n257 "/"\r\n200 OK\r\n200 OK\r\n200 OK\r\n226 Transfer complete
REPLY PASS 530 Login incorrect
</servercmd>
</reply>
# Client-side
<client>
<features>
SSL
</features>
<server>
ftp
</server>
<name>
FTP STARTTLS pipelined server response
</name>
<file name="log/test%TESTNUMBER.txt">
data
to
see
that FTPS
works
so does it?
</file>
<command>
--ssl --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -u user:secret -P %CLIENTIP
</command>
</client>
# Verify data after the test has been "shot"
<verify>
# 8 is CURLE_WEIRD_SERVER_REPLY
<errorcode>
8
</errorcode>
<protocol>
AUTH SSL
</protocol>
</verify>
</testcase>