[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 161/282: smtp: Support the SMTPUTF8 extension in the RCPT TO com
From: |
gnunet |
Subject: |
[gnurl] 161/282: smtp: Support the SMTPUTF8 extension in the RCPT TO command |
Date: |
Wed, 01 Apr 2020 14:30:26 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 483edeb8dda80406f56480965d3c649bb3b2e77b
Author: Steve Holme <address@hidden>
AuthorDate: Thu Feb 13 22:39:28 2020 +0000
smtp: Support the SMTPUTF8 extension in the RCPT TO command
Note: The RCPT TO command isn't required to advertise to the server that
it contains UTF-8 characters, instead the server is told that a mail may
contain UTF-8 in any envelope command via the MAIL command.
---
lib/smtp.c | 19 ++++++++++++++-
tests/data/Makefile.inc | 2 +-
tests/data/test966 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/ftpserver.pl | 11 ++++++---
4 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/lib/smtp.c b/lib/smtp.c
index cdeeb7a26..ef51c829a 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -670,6 +670,23 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
}
}
+ /* If the mailboxes in the FROM and AUTH parameters don't include a UTF-8
+ based address then quickly scan through the recipient list and check if
+ any there do, as we need to correctly identify our support for SMTPUTF8
+ in the envelope, as per RFC-6531 sect. 3.4 */
+ if(conn->proto.smtpc.utf8_supported && !utf8) {
+ struct SMTP *smtp = data->req.protop;
+ struct curl_slist *rcpt = smtp->rcpt;
+
+ while(rcpt && !utf8) {
+ /* Does the host name contain non-ASCII characters? */
+ if(!Curl_is_ASCII_name(rcpt->data))
+ utf8 = TRUE;
+
+ rcpt = rcpt->next;
+ }
+ }
+
/* Send the MAIL command */
result = Curl_pp_sendf(&conn->proto.smtpc.pp,
"MAIL FROM:%s%s%s%s%s%s",
@@ -679,7 +696,7 @@ static CURLcode smtp_perform_mail(struct connectdata *conn)
size ? " SIZE=" : "", /* Optional on SIZE support */
size ? size : "", /* */
utf8 ? " SMTPUTF8" /* Internationalised mailbox */
- : ""); /* address included */
+ : ""); /* included in our envelope */
free(from);
free(auth);
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 4ddfeef36..2a75cffdb 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -109,7 +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 test964 test965 \
+test963 test964 test965 test966 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test966 b/tests/data/test966
new file mode 100644
index 000000000..6dc839aba
--- /dev/null
+++ b/tests/data/test966
@@ -0,0 +1,65 @@
+<testcase>
+<info>
+<keywords>
+SMTP
+IDN
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<servercmd>
+CAPA SMTPUTF8
+</servercmd>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+<features>
+idn
+</features>
+<setenv>
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+</setenv>
+<precheck>
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if
(lc(langinfo(CODESET())) ne "utf-8");'
+</precheck>
+ <name>
+SMTP with SMTPUTF8 support - UTF-8 based recipient
+ </name>
+<stdin>
+From: different
+To: another
+
+body
+</stdin>
+<command>
+smtp://%HOSTIP:%SMTPPORT/966 --mail-rcpt Stödmottagaren@åäö.se --mail-from
address@hidden -T -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO 966
+MAIL FROM:<address@hidden> SMTPUTF8
+RCPT TO:<Stöaddress@hidden>
+DATA
+QUIT
+</protocol>
+<upload>
+From: different
+To: another
+
+body
+.
+</upload>
+</verify>
+</testcase>
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index fe74f8b07..9c4b88aef 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -871,16 +871,19 @@ sub RCPT_smtp {
sendcontrol "501 Unrecognized parameter\r\n";
}
else {
+ my $smtputf8 = grep /^SMTPUTF8$/, @capabilities;
my $to = $1;
# Validate the to address (only a valid email address inside <> is
# allowed, such as <address@hidden>)
- if ($to !~
- /^<([a-zA-Z0-9._%+-]+)\@(([a-zA-Z0-9-]+)\.)+([a-zA-Z]{2,4})>$/) {
- sendcontrol "501 Invalid address\r\n";
+ if ((!$smtputf8 && $to =~
+ /^<([a-zA-Z0-9._%+-]+)\@(([a-zA-Z0-9-]+)\.)+([a-zA-Z]{2,4})>$/)
||
+ ($smtputf8 && $to =~
+
/^<([a-zA-Z0-9\x{80}-\x{ff}._%+-]+)\@(([a-zA-Z0-9\x{80}-\x{ff}-]+)\.)+([a-zA-Z]{2,4})>$/))
{
+ sendcontrol "250 Recipient OK\r\n";
}
else {
- sendcontrol "250 Recipient OK\r\n";
+ sendcontrol "501 Invalid address\r\n";
}
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 152/282: ftpserver: Corrected the e-mail address regex in MAIL_smtp() and RCTP_smtp(), (continued)
- [gnurl] 152/282: ftpserver: Corrected the e-mail address regex in MAIL_smtp() and RCTP_smtp(), gnunet, 2020/04/01
- [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 <=
- [gnurl] 157/282: smtp: Support UTF-8 based host names in the RCPT TO command, gnunet, 2020/04/01
- [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