generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Added empty response support to custom replies

Browse Source 
...and fixed up test869 as DIGEST-MD transcript is as follows:

S: Challenge
C: Authentication String
S: Continue Response
C: Empty String
This commit is contained in:
Steve Holme 2013-10-23 22:05:22 +01:00
parent 9bd37a6d27
commit ca5c5be3e4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/data/test869
View File

@ -15,7 +15,8 @@ RFC5034
<servercmd> <servercmd>
AUTH DIGEST-MD5 AUTH DIGEST-MD5
REPLY AUTH + cmVhbG09ImN1cmwiLG5vbmNlPSI1MzAwZDE3YTFkNjk1YmQ0MTFlNGNkZjk2Zjk1NDhjMjNjZWQ2MTc1IixhbGdvcml0aG09bWQ1LXNlc3MscW9wPSJhdXRoIg== REPLY AUTH + cmVhbG09ImN1cmwiLG5vbmNlPSI1MzAwZDE3YTFkNjk1YmQ0MTFlNGNkZjk2Zjk1NDhjMjNjZWQ2MTc1IixhbGdvcml0aG09bWQ1LXNlc3MscW9wPSJhdXRoIg==
REPLY dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM= +OK Login successful REPLY dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM= +
REPLY +OK Login successful
</servercmd> </servercmd>
<data> <data>
From: me@somewhere From: me@somewhere
@ -53,6 +54,7 @@ pop3://%HOSTIP:%POP3PORT/869 -u user:secret
CAPA CAPA
AUTH DIGEST-MD5 AUTH DIGEST-MD5
dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM= dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM=
RETR 869 RETR 869
QUIT QUIT
</protocol> </protocol>

7
tests/ftpserver.pl
View File

@ -2729,10 +2729,15 @@ sub customize {
logmsg "FTPD: Getting commands from log/ftpserver.cmd\n"; logmsg "FTPD: Getting commands from log/ftpserver.cmd\n";
while(<CUSTOM>) { while(<CUSTOM>) {
if($_ =~ /REPLY ([A-Za-z0-9+\/=]+) (.*)/) { if($_ =~ /REPLY ([A-Za-z0-9+\/=]*) (.*)/) {
$customreply{$1}=eval "qq{$2}"; $customreply{$1}=eval "qq{$2}";
if($1 eq "") {
logmsg "FTPD: set custom reply for empty response\n";
}
else {
logmsg "FTPD: set custom reply for $1\n"; logmsg "FTPD: set custom reply for $1\n";
} }
}
elsif($_ =~ /COUNT ([A-Z]+) (.*)/) { elsif($_ =~ /COUNT ([A-Z]+) (.*)/) {
# we blank the customreply for this command when having # we blank the customreply for this command when having
# been used this number of times # been used this number of times