diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-07-02 16:42:55 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-07-02 16:42:55 +0200 |
| commit | ea96f86442d5ebb7fe9d5ceaf0fa95510da6976d (patch) | |
| tree | 86e9c453a9d008107b16324e55fda57f4f768060 | |
| parent | 01afe4e1af4de7f85d8ad7757bed6bd0c5b6b754 (diff) | |
| download | curl-ea96f86442d5ebb7fe9d5ceaf0fa95510da6976d.tar.gz | |
ftpserver: don't verify SMTP MAIL FROM names
Rely on tests asking the names to get refused instead. Edited test 914
and 955 accordingly.
| -rw-r--r-- | tests/data/test914 | 3 | ||||
| -rw-r--r-- | tests/data/test955 | 3 | ||||
| -rwxr-xr-x | tests/ftpserver.pl | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/tests/data/test914 b/tests/data/test914 index d1532c806..0124b7671 100644 --- a/tests/data/test914 +++ b/tests/data/test914 @@ -8,6 +8,9 @@ SMTP # # Server-side <reply> +<servercmd> +REPLY MAIL 501 not fine enough +</servercmd> </reply> # diff --git a/tests/data/test955 b/tests/data/test955 index 57d618c7d..97ef29561 100644 --- a/tests/data/test955 +++ b/tests/data/test955 @@ -8,6 +8,9 @@ SMTP # # Server-side <reply> +<servercmd> +REPLY MAIL 501 not fine enough +</servercmd> </reply> # diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 92420ea4b..a0b36e5de 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -835,13 +835,8 @@ sub MAIL_smtp { } } - # Validate the from address (only <> and a valid email address inside - # <> are allowed, such as <user@example.com>) - if (($from eq "<>") || - (!$smtputf8 && $from =~ - /^<([a-zA-Z0-9._%+-]+)\@(([a-zA-Z0-9-]+)\.)+([a-zA-Z]{2,4})>$/) || - ($smtputf8 && $from =~ - /^<([a-zA-Z0-9\x{80}-\x{ff}._%+-]+)\@(([a-zA-Z0-9\x{80}-\x{ff}-]+)\.)+([a-zA-Z]{2,4})>$/)) { + # this server doesn't "validate" MAIL FROM addresses + if (length($from)) { my @found; my $valid = 1; |