[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 157/282: smtp: Support UTF-8 based host names in the RCPT TO com
From: |
gnunet |
Subject: |
[gnurl] 157/282: smtp: Support UTF-8 based host names in the RCPT TO command |
Date: |
Wed, 01 Apr 2020 14:30:22 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit e7959c280c0361d2e448776d9ea11305e2f026bc
Author: Steve Holme <address@hidden>
AuthorDate: Sat Feb 8 00:14:57 2020 +0000
smtp: Support UTF-8 based host names in the RCPT TO command
---
lib/smtp.c | 24 +++++++++++++++++++-----
tests/data/Makefile.inc | 1 +
tests/data/test960 | 3 +++
tests/data/{test960 => test963} | 24 ++++++++++++++++--------
4 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/lib/smtp.c b/lib/smtp.c
index 18c45afbe..1718cc2db 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -659,14 +659,28 @@ static CURLcode smtp_perform_rcpt_to(struct connectdata
*conn)
CURLcode result = CURLE_OK;
struct Curl_easy *data = conn->data;
struct SMTP *smtp = data->req.protop;
+ char *address = NULL;
+ struct hostname host = { NULL, NULL, NULL, NULL };
+
+ /* Parse the recipient mailbox into the local address and host name parts,
+ converting the host name to an IDN A-label if necessary */
+ result = smtp_parse_address(conn, smtp->rcpt->data,
+ &address, &host);
+ if(result)
+ return result;
/* Send the RCPT TO command */
- if(smtp->rcpt->data[0] == '<')
- result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:%s",
- smtp->rcpt->data);
+ if(host.name)
+ result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s@%s>", address,
+ host.name);
else
- result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>",
- smtp->rcpt->data);
+ /* An invalid mailbox was provided but we'll simply let the server worry
+ about that and reply with a 501 error */
+ result = Curl_pp_sendf(&conn->proto.smtpc.pp, "RCPT TO:<%s>", address);
+
+ Curl_free_idnconverted_hostname(&host);
+ free(address);
+
if(!result)
state(conn, SMTP_RCPT);
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 0f0192847..8d2ef14ce 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -109,6 +109,7 @@ test927 test928 test929 test930 test931 test932 test933
test934 test935 \
test936 test937 test938 test939 test940 test941 test942 test943 test944 \
test945 test946 test947 test948 test949 test950 test951 test952 test953 \
test954 test955 test956 test957 test958 test959 test960 test961 test962 \
+test963 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test960 b/tests/data/test960
index d164aa83c..ac7ee5f5f 100644
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -16,6 +16,9 @@ SMTP
<server>
smtp
</server>
+<features>
+!idn
+</features>
<setenv>
LC_ALL=en_US.UTF-8
LC_CTYPE=en_US.UTF-8
diff --git a/tests/data/test960 b/tests/data/test963
similarity index 66%
copy from tests/data/test960
copy to tests/data/test963
index d164aa83c..6328304c4 100644
--- a/tests/data/test960
+++ b/tests/data/test963
@@ -2,6 +2,7 @@
<info>
<keywords>
SMTP
+IDN
</keywords>
</info>
@@ -16,6 +17,9 @@ SMTP
<server>
smtp
</server>
+<features>
+idn
+</features>
<setenv>
LC_ALL=en_US.UTF-8
LC_CTYPE=en_US.UTF-8
@@ -24,7 +28,7 @@ LC_CTYPE=en_US.UTF-8
perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if
(lc(langinfo(CODESET())) ne "utf-8");'
</precheck>
<name>
-SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only)
+SMTP without SMTPUTF8 support (IDN Enabked) - UTF-8 based recipient (host part
only)
</name>
<stdin>
From: different
@@ -33,22 +37,26 @@ To: another
body
</stdin>
<command>
-smtp://%HOSTIP:%SMTPPORT/960 --mail-rcpt recipient@åäö.se --mail-from
address@hidden -T -
+smtp://%HOSTIP:%SMTPPORT/963 --mail-rcpt recipient@åäö.se --mail-from
address@hidden -T -
</command>
</client>
#
# Verify data after the test has been "shot"
<verify>
-# 55 - CURLE_SEND_ERROR
-<errorcode>
-55
-</errorcode>
<protocol>
-EHLO 960
+EHLO 963
MAIL FROM:<address@hidden>
-RCPT TO:<recipient@åäö.se>
+RCPT TO:<address@hidden>
+DATA
QUIT
</protocol>
+<upload>
+From: different
+To: another
+
+body
+.
+</upload>
</verify>
</testcase>
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 155/282: url: Make the IDN conversion functions available to others, (continued)
- [gnurl] 155/282: url: Make the IDN conversion functions available to others, gnunet, 2020/04/01
- [gnurl] 159/282: smtp: Detect server support for the UTF-8 extension as defined in RFC-6531, gnunet, 2020/04/01
- [gnurl] 158/282: smtp: Support UTF-8 based host names in the VRFY command, gnunet, 2020/04/01
- [gnurl] 151/282: hmac: Added a unit test for the HMAC hash generation, gnunet, 2020/04/01
- [gnurl] 149/282: tests: Added a unit test for MD4 digest generation, gnunet, 2020/04/01
- [gnurl] 163/282: smtp: Support the SMTPUTF8 extension for the EXPN command, gnunet, 2020/04/01
- [gnurl] 162/282: smtp: Support the SMTPUTF8 extension in the VRFY command, gnunet, 2020/04/01
- [gnurl] 164/282: smtp: Tidy up, following recent changes, to maintain the coding style, gnunet, 2020/04/01
- [gnurl] 156/282: smtp: Support UTF-8 based host names in the MAIL command, gnunet, 2020/04/01
- [gnurl] 161/282: smtp: Support the SMTPUTF8 extension in the RCPT TO command, gnunet, 2020/04/01
- [gnurl] 157/282: smtp: Support UTF-8 based host names in the RCPT TO command,
gnunet <=
- [gnurl] 165/282: http: added 417 response treatment, gnunet, 2020/04/01
- [gnurl] 166/282: cookie: remove unnecessary check for 'out != 0', gnunet, 2020/04/01
- [gnurl] 160/282: smtp: Support the SMTPUTF8 extension in the MAIL command, gnunet, 2020/04/01
- [gnurl] 172/282: Curl_is_ASCII_name: handle a NULL argument, gnunet, 2020/04/01
- [gnurl] 169/282: libssh: improve known hosts handling, gnunet, 2020/04/01
- [gnurl] 174/282: gtls: Fixed compilation when using GnuTLS < 3.5.0, gnunet, 2020/04/01
- [gnurl] 173/282: RELEASE-NOTES: Corrected the link to issue #4892, gnunet, 2020/04/01
- [gnurl] 176/282: runtests: restore the command log, gnunet, 2020/04/01
- [gnurl] 154/282: smtp: Added UTF-8 mailbox tests to verify existing behaviour, gnunet, 2020/04/01
- [gnurl] 167/282: test1323: Added the missing 'unit test' feature requirement in the test case, gnunet, 2020/04/01