romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-06 17:56:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

52
tests/data/test980 Normal file
View file

@ -0,0 +1,52 @@
<testcase>
<info>
<keywords>
SMTP
STARTTLS
</keywords>
</info>
#
# Server-side
<reply>
<servercmd>
CAPA STARTTLS
AUTH PLAIN
REPLY STARTTLS 454 currently unavailable\r\n235 Authenticated\r\n250 2.1.0 Sender ok\r\n250 2.1.5 Recipient ok\r\n354 Enter mail\r\n250 2.0.0 Accepted
REPLY AUTH 535 5.7.8 Authentication credentials invalid
</servercmd>
</reply>
#
# Client-side
<client>
<features>
SSL
</features>
<server>
smtp
</server>
<name>
SMTP STARTTLS pipelined server response
</name>
<stdin>
mail body
</stdin>
<command>
smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --ssl --sasl-ir -T -
</command>
</client>
#
# Verify data after the test has been "shot"
<verify>
# 8 is CURLE_WEIRD_SERVER_REPLY
<errorcode>
8
</errorcode>
<protocol>
EHLO %TESTNUMBER
STARTTLS
</protocol>
</verify>
</testcase>