Commit ca5c5be3 authored by Steve Holme's avatar Steve Holme
Browse files

tests: Added empty response support to custom replies 

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

S: Challenge
C: Authentication String
S: Continue Response
C: Empty String
parent 9bd37a6d

tests/data/test869

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ RFC5034 
<servercmd>

AUTH DIGEST-MD5

REPLY AUTH + cmVhbG09ImN1cmwiLG5vbmNlPSI1MzAwZDE3YTFkNjk1YmQ0MTFlNGNkZjk2Zjk1NDhjMjNjZWQ2MTc1IixhbGdvcml0aG09bWQ1LXNlc3MscW9wPSJhdXRoIg==

REPLY dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM= +OK Login successful

REPLY dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM= +

REPLY  +OK Login successful

</servercmd>

<data>

From: me@somewhere
@@ -53,6 +54,7 @@ pop3://%HOSTIP:%POP3PORT/869 -u user:secret 
CAPA

AUTH DIGEST-MD5

dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIxMjM0NTY3OCIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvY3VybCIscmVzcG9uc2U9YTA2OTE1YTA1ODA3ZDc0MTg0YTkxYjM2NjE2ZTZiOGM=



RETR 869

QUIT

</protocol>

tests/ftpserver.pl

+7 −2
Original line number Diff line number Diff line
@@ -2729,10 +2729,15 @@ sub customize { 
    logmsg "FTPD: Getting commands from log/ftpserver.cmd\n";



    while(<CUSTOM>) {

        if($_ =~ /REPLY ([A-Za-z0-9+\/=]+) (.*)/) {

        if($_ =~ /REPLY ([A-Za-z0-9+\/=]*) (.*)/) {

            $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";

            }

        }

        elsif($_ =~ /COUNT ([A-Z]+) (.*)/) {

            # we blank the customreply for this command when having

            # been used this number of times