moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 16:48:49 -05:00
Code Issues Releases Wiki Activity

ftpserver.pl: Expanded the SMTP MAIL handler to validate messages

Browse Source 
MAIl_smtp() will now check for a correctly formatted FROM address as
well as the optional SIZE parameter comparing it against the server
capability when specified.
This commit is contained in:
Steve Holme 2013-09-18 07:16:53 +01:00
parent 4cfbb201c4
commit 98f7ca7e97
1 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/ftpserver.pl
View File

@ -739,7 +739,56 @@ sub EHLO_smtp {
}
sub MAIL_smtp {
sendcontrol "250 Sender OK\r\n";
my ($args) = @_;
logmsg "MAIL_smtp got $args\n";
if (!$args) {
sendcontrol "501 Unrecognized parameter\r\n";
}
else {
my $from;
my $size;
my @elements = split(/ /, $args);
# Get the FROM and SIZE parameters
for my $e (@elements) {
if($e =~ /^FROM:(.*)$/) {
$from = $1;
}
elsif($e =~ /^SIZE=(\d+)$/) {
$size = $1;
}
}
# Validate the from address (only <> and a valid email address inside
# <> are allowed, such as <user@example.com>)
if ((!$from) || (($from ne "<>") && ($from !~
/^<([a-zA-Z][\w_.]+)\@([a-zA-Z0-9.-]+).([a-zA-Z]{2,4})>$/))) {
sendcontrol "501 Invalid address\r\n";
}
else {
my @found;
my $valid = 1;
# Check the capabilities for SIZE and if the specified size is
# greater than the message size then reject it
if (@found = grep /^SIZE (\d+)$/, @capabilities) {
if ($found[0] =~ /^SIZE (\d+)$/) {
if ($size > $1) {
valid = 0;
}
}
}
if(!$valid) {
sendcontrol "552 Message size too large\r\n";
}
else {
sendcontrol "250 Sender OK\r\n";
}
}
}
return 0;
}