diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-09-21 08:21:43 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-09-22 14:43:33 +0200 |
| commit | a4db3f70468c31c0d579e6b9dcd4e90cd9f0d1a8 (patch) | |
| tree | ef9b519926df71f72493ebca518ac8e232154755 | |
| parent | b8e0fe19ec3bd3b673a14043a4b5e656d9c26d06 (diff) | |
tests: make the imap server not verify user+password
... as the test cases themselves do that and it makes it easier to add
crazy test cases.
Test 800 updated to use user name + password that need quoting.
Test 856 updated to trigger an auth fail differently.
Ref: #1902
| -rw-r--r-- | tests/data/test800 | 4 | ||||
| -rw-r--r-- | tests/data/test856 | 3 | ||||
| -rwxr-xr-x | tests/ftpserver.pl | 15 |
3 files changed, 8 insertions, 14 deletions
diff --git a/tests/data/test800 b/tests/data/test800 index 6b29f7a2b..1ac1da59b 100644 --- a/tests/data/test800 +++ b/tests/data/test800 @@ -31,7 +31,7 @@ imap IMAP FETCH message </name> <command> -'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u user:secret +'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u "user*:secret{" </command> </client> @@ -40,7 +40,7 @@ IMAP FETCH message <verify> <protocol> A001 CAPABILITY
-A002 LOGIN user secret
+A002 LOGIN "user*" "secret{"
A003 SELECT 800
A004 FETCH 1 BODY[]
A005 LOGOUT
diff --git a/tests/data/test856 b/tests/data/test856 index 4d8d7ed61..dcb07c5a9 100644 --- a/tests/data/test856 +++ b/tests/data/test856 @@ -10,6 +10,9 @@ FAILURE # # Server-side <reply> +<servercmd> +REPLY PASS -ERR Login failure +</servercmd> </reply> # diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index 081298f1b..2aba4263a 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2014, 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -174,7 +174,6 @@ my $exit_signal; # first signal handled in exit_signal_handler #********************************************************************** # Mail related definitions # -my $TEXT_USERNAME = "user"; my $TEXT_PASSWORD = "secret"; my $POP3_TIMESTAMP = "<1972.987654321\@curl>"; @@ -1121,9 +1120,6 @@ sub LOGIN_imap { if ($user eq "") { sendcontrol "$cmdid BAD Command Argument\r\n"; } - elsif (($user ne $TEXT_USERNAME) || ($password ne $TEXT_PASSWORD)) { - sendcontrol "$cmdid NO LOGIN failed\r\n"; - } else { sendcontrol "$cmdid OK LOGIN completed\r\n"; } @@ -1681,7 +1677,7 @@ sub APOP_pop3 { else { my $digest = Digest::MD5::md5_hex($POP3_TIMESTAMP, $TEXT_PASSWORD); - if (($user ne $TEXT_USERNAME) || ($secret ne $digest)) { + if ($secret ne $digest) { sendcontrol "-ERR Login failure\r\n"; } else { @@ -1740,12 +1736,7 @@ sub PASS_pop3 { logmsg "PASS_pop3 got $password\n"; - if (($username ne $TEXT_USERNAME) || ($password ne $TEXT_PASSWORD)) { - sendcontrol "-ERR Login failure\r\n"; - } - else { - sendcontrol "+OK Login successful\r\n"; - } + sendcontrol "+OK Login successful\r\n"; return 0; } |