From 62cf2d180ed77bb977acf5d8b348d4431256638f Mon Sep 17 00:00:00 2001 From: Patrick Monnerat <patrick@monnerat.net> Date: Mon, 12 Feb 2018 16:43:15 +0100 Subject: smtp: fix processing of initial dot in data RFC 5321 4.1.1.4 specifies the CRLF terminating the DATA command should be taken into account when chasing the <CRLF>.<CRLF> end marker. Thus a leading dot character in data is also subject to escaping. Tests 911 and test server are adapted to this situation. New tests 951 and 952 check proper handling of initial dot in data. Closes #2304 --- tests/data/test952 | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tests/data/test952 (limited to 'tests/data/test952') diff --git a/tests/data/test952 b/tests/data/test952 new file mode 100644 index 000000000..54334b21e --- /dev/null +++ b/tests/data/test952 @@ -0,0 +1,45 @@ +<testcase> +<info> +<keywords> +SMTP +</keywords> +</info> + +# +# Server-side +<reply> +</reply> + +# +# Client-side +<client> +<server> +smtp +</server> + <name> +SMTP data with single dot-only line + </name> +<stdin> +. +</stdin> +<command> +smtp://%HOSTIP:%SMTPPORT/952 --mail-rcpt recipient@example.com --mail-from sender@example.com -T - +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +EHLO 952 +MAIL FROM:<sender@example.com> +RCPT TO:<recipient@example.com> +DATA +QUIT +</protocol> +<upload> +.. +. +</upload> +</verify> +</testcase> -- cgit v1.2.3