summaryrefslogtreecommitdiff
path: root/tests/FTPServer.pm
diff options
context:
space:
mode:
Diffstat (limited to 'tests/FTPServer.pm')
-rw-r--r--tests/FTPServer.pm610
1 files changed, 367 insertions, 243 deletions
diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm
index 2ac72e3..3d7d8a5 100644
--- a/tests/FTPServer.pm
+++ b/tests/FTPServer.pm
@@ -19,43 +19,40 @@ my $GOT_SIGURG = 0;
# connection states
my %_connection_states = (
- 'NEWCONN' => 0x01,
- 'WAIT4PWD' => 0x02,
- 'LOGGEDIN' => 0x04,
- 'TWOSOCKS' => 0x08,
-);
+ 'NEWCONN' => 0x01,
+ 'WAIT4PWD' => 0x02,
+ 'LOGGEDIN' => 0x04,
+ 'TWOSOCKS' => 0x08,
+ );
# subset of FTP commands supported by these server and the respective
# connection states in which they are allowed
my %_commands = (
+
# Standard commands from RFC 959.
- 'CWD' => $_connection_states{LOGGEDIN} |
- $_connection_states{TWOSOCKS},
-# 'EPRT' => $_connection_states{LOGGEDIN},
-# 'EPSV' => $_connection_states{LOGGEDIN},
+ 'CWD' => $_connection_states{LOGGEDIN} | $_connection_states{TWOSOCKS},
+
+ # 'EPRT' => $_connection_states{LOGGEDIN},
+ # 'EPSV' => $_connection_states{LOGGEDIN},
'LIST' => $_connection_states{TWOSOCKS},
-# 'LPRT' => $_connection_states{LOGGEDIN},
-# 'LPSV' => $_connection_states{LOGGEDIN},
+
+ # 'LPRT' => $_connection_states{LOGGEDIN},
+ # 'LPSV' => $_connection_states{LOGGEDIN},
'PASS' => $_connection_states{WAIT4PWD},
'PASV' => $_connection_states{LOGGEDIN},
'PORT' => $_connection_states{LOGGEDIN},
- 'PWD' => $_connection_states{LOGGEDIN} |
- $_connection_states{TWOSOCKS},
- 'QUIT' => $_connection_states{LOGGEDIN} |
- $_connection_states{TWOSOCKS},
+ 'PWD' => $_connection_states{LOGGEDIN} | $_connection_states{TWOSOCKS},
+ 'QUIT' => $_connection_states{LOGGEDIN} | $_connection_states{TWOSOCKS},
'REST' => $_connection_states{TWOSOCKS},
'RETR' => $_connection_states{TWOSOCKS},
'SYST' => $_connection_states{LOGGEDIN},
- 'TYPE' => $_connection_states{LOGGEDIN} |
- $_connection_states{TWOSOCKS},
+ 'TYPE' => $_connection_states{LOGGEDIN} | $_connection_states{TWOSOCKS},
'USER' => $_connection_states{NEWCONN},
+
# From ftpexts Internet Draft.
- 'SIZE' => $_connection_states{LOGGEDIN} |
- $_connection_states{TWOSOCKS},
+ 'SIZE' => $_connection_states{LOGGEDIN} | $_connection_states{TWOSOCKS},
);
-
-
# COMMAND-HANDLING ROUTINES
sub _CWD_command
@@ -67,7 +64,8 @@ sub _CWD_command
my $new_path = FTPPaths::path_merge($conn->{'dir'}, $path);
# Split the path into its component parts and process each separately.
- if (! $paths->dir_exists($new_path)) {
+ if (!$paths->dir_exists($new_path))
+ {
print {$conn->{socket}} "550 Directory not found.\r\n";
return;
}
@@ -81,25 +79,24 @@ sub _LIST_command
my ($conn, $cmd, $path) = @_;
my $paths = $conn->{'paths'};
- my $ReturnEmptyList = ( $paths->GetBehavior('list_empty_if_list_a') &&
- $path eq '-a');
- my $SkipHiddenFiles = ( $paths->GetBehavior('list_no_hidden_if_list') &&
- ( ! $path ) );
+ my $ReturnEmptyList =
+ ($paths->GetBehavior('list_empty_if_list_a') && $path eq '-a');
+ my $SkipHiddenFiles =
+ ($paths->GetBehavior('list_no_hidden_if_list') && (!$path));
if ($paths->GetBehavior('list_fails_if_list_a') && $path eq '-a')
- {
- print {$conn->{socket}} "500 Unknown command\r\n";
- return;
- }
-
+ {
+ print {$conn->{socket}} "500 Unknown command\r\n";
+ return;
+ }
if (!$paths->GetBehavior('list_dont_clean_path'))
- {
+ {
# This is something of a hack. Some clients expect a Unix server
# to respond to flags on the 'ls command line'. Remove these flags
# and ignore them. This is particularly an issue with ncftp 2.4.3.
$path =~ s/^-[a-zA-Z0-9]+\s?//;
- }
+ }
my $dir = $conn->{'dir'};
@@ -111,39 +108,44 @@ sub _LIST_command
my $listing;
if (!$ReturnEmptyList)
- {
+ {
$dir = FTPPaths::path_merge($dir, $path);
- $listing = $paths->get_list($dir,$SkipHiddenFiles);
- unless ($listing) {
+ $listing = $paths->get_list($dir, $SkipHiddenFiles);
+ unless ($listing)
+ {
print {$conn->{socket}} "550 File or directory not found.\r\n";
return;
}
- }
+ }
print STDERR "_LIST_command - dir is: $dir\n" if $log;
print {$conn->{socket}} "150 Opening data connection for file listing.\r\n";
# Open a path back to the client.
- my $sock = __open_data_connection ($conn);
- unless ($sock) {
+ my $sock = __open_data_connection($conn);
+ unless ($sock)
+ {
print {$conn->{socket}} "425 Can't open data connection.\r\n";
return;
}
if (!$ReturnEmptyList)
- {
- for my $item (@$listing) {
+ {
+ for my $item (@$listing)
+ {
print $sock "$item\r\n";
}
- }
+ }
- unless ($sock->close) {
+ unless ($sock->close)
+ {
print {$conn->{socket}} "550 Error closing data connection: $!\r\n";
return;
}
- print {$conn->{socket}} "226 Listing complete. Data connection has been closed.\r\n";
+ print {$conn->{socket}}
+ "226 Listing complete. Data connection has been closed.\r\n";
}
sub _PASS_command
@@ -155,10 +157,15 @@ sub _PASS_command
print STDERR "switching to LOGGEDIN state\n" if $log;
$conn->{state} = $_connection_states{LOGGEDIN};
- if ($conn->{username} eq "anonymous") {
- print {$conn->{socket}} "202 Anonymous user access is always granted.\r\n";
- } else {
- print {$conn->{socket}} "230 Authentication not implemented yet, access is always granted.\r\n";
+ if ($conn->{username} eq "anonymous")
+ {
+ print {$conn->{socket}}
+ "202 Anonymous user access is always granted.\r\n";
+ }
+ else
+ {
+ print {$conn->{socket}}
+ "230 Authentication not implemented yet, access is always granted.\r\n";
}
}
@@ -167,28 +174,31 @@ sub _PASV_command
my ($conn, $cmd, $rest) = @_;
# Open a listening socket - but don't actually accept on it yet.
- "0" =~ /(0)/; # Perl 5.7 / IO::Socket::INET bug workaround.
- my $sock = IO::Socket::INET->new (LocalHost => '127.0.0.1',
- LocalPort => '0',
- Listen => 1,
- Reuse => 1,
- Proto => 'tcp',
- Type => SOCK_STREAM);
-
- unless ($sock) {
+ "0" =~ /(0)/; # Perl 5.7 / IO::Socket::INET bug workaround.
+ my $sock = IO::Socket::INET->new(
+ LocalHost => '127.0.0.1',
+ LocalPort => '0',
+ Listen => 1,
+ Reuse => 1,
+ Proto => 'tcp',
+ Type => SOCK_STREAM
+ );
+
+ unless ($sock)
+ {
# Return a code 550 here, even though this is not in the RFC. XXX
print {$conn->{socket}} "550 Can't open a listening socket.\r\n";
return;
}
- $conn->{passive} = 1;
+ $conn->{passive} = 1;
$conn->{passive_socket} = $sock;
# Get our port number.
my $sockport = $sock->sockport;
# Split the port number into high and low components.
- my $p1 = int ($sockport / 256);
+ my $p1 = int($sockport / 256);
my $p2 = $sockport % 256;
$conn->{state} = $_connection_states{TWOSOCKS};
@@ -204,33 +214,42 @@ sub _PORT_command
# The arguments to PORT are a1,a2,a3,a4,p1,p2 where a1 is the
# most significant part of the address (eg. 127,0,0,1) and
# p1 is the most significant part of the port.
- unless ($rest =~ /^\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})/) {
+ unless ($rest =~
+ /^\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})/
+ )
+ {
print {$conn->{socket}} "501 Syntax error in PORT command.\r\n";
return;
}
# Check host address.
- unless ($1 > 0 && $1 < 224 &&
- $2 >= 0 && $2 < 256 &&
- $3 >= 0 && $3 < 256 &&
- $4 >= 0 && $4 < 256) {
+ unless ( $1 > 0
+ && $1 < 224
+ && $2 >= 0
+ && $2 < 256
+ && $3 >= 0
+ && $3 < 256
+ && $4 >= 0
+ && $4 < 256)
+ {
print {$conn->{socket}} "501 Invalid host address.\r\n";
return;
}
# Construct host address and port number.
my $peeraddrstring = "$1.$2.$3.$4";
- my $peerport = $5 * 256 + $6;
+ my $peerport = $5 * 256 + $6;
# Check port number.
- unless ($peerport > 0 && $peerport < 65536) {
+ unless ($peerport > 0 && $peerport < 65536)
+ {
print {$conn->{socket}} "501 Invalid port number.\r\n";
}
$conn->{peeraddrstring} = $peeraddrstring;
- $conn->{peeraddr} = inet_aton ($peeraddrstring);
- $conn->{peerport} = $peerport;
- $conn->{passive} = 0;
+ $conn->{peeraddr} = inet_aton($peeraddrstring);
+ $conn->{peerport} = $peerport;
+ $conn->{passive} = 0;
$conn->{state} = $_connection_states{TWOSOCKS};
@@ -253,8 +272,10 @@ sub _REST_command
{
my ($conn, $cmd, $restart_from) = @_;
- unless ($restart_from =~ /^([1-9][0-9]*|0)$/) {
- print {$conn->{socket}} "501 REST command needs a numeric argument.\r\n";
+ unless ($restart_from =~ /^([1-9][0-9]*|0)$/)
+ {
+ print {$conn->{socket}}
+ "501 REST command needs a numeric argument.\r\n";
return;
}
@@ -270,19 +291,21 @@ sub _RETR_command
$path = FTPPaths::path_merge($conn->{dir}, $path);
my $info = $conn->{'paths'}->get_info($path);
- unless ($info->{'_type'} eq 'f') {
+ unless ($info->{'_type'} eq 'f')
+ {
print {$conn->{socket}} "550 File not found.\r\n";
return;
}
- print {$conn->{socket}} "150 Opening " .
- ($conn->{type} eq 'A' ? "ASCII mode" : "BINARY mode") .
- " data connection.\r\n";
+ print {$conn->{socket}} "150 Opening "
+ . ($conn->{type} eq 'A' ? "ASCII mode" : "BINARY mode")
+ . " data connection.\r\n";
# Open a path back to the client.
- my $sock = __open_data_connection ($conn);
+ my $sock = __open_data_connection($conn);
- unless ($sock) {
+ unless ($sock)
+ {
print {$conn->{socket}} "425 Can't open data connection.\r\n";
return;
}
@@ -290,33 +313,37 @@ sub _RETR_command
my $content = $info->{'content'};
# Restart the connection from previous point?
- if ($conn->{restart}) {
+ if ($conn->{restart})
+ {
$content = substr($content, $conn->{restart});
$conn->{restart} = 0;
}
# What mode are we sending this file in?
- unless ($conn->{type} eq 'A') # Binary type.
+ unless ($conn->{type} eq 'A') # Binary type.
{
- my ($r, $buffer, $n, $w);
-
+ my ($r, $buffer, $n, $w, $sent);
# Copy data.
- while ($buffer = substr($content, 0, 65536))
+ $sent = 0;
+ while ($sent < length($content))
{
+ $buffer = substr($content, $sent, 65536);
$r = length $buffer;
# Restart alarm clock timer.
alarm $conn->{idle_timeout};
- for ($n = 0; $n < $r; )
+ for ($n = 0 ; $n < $r ;)
{
- $w = syswrite ($sock, $buffer, $r - $n, $n);
+ $w = syswrite($sock, $buffer, $r - $n, $n);
# Cleanup and exit if there was an error.
- unless (defined $w) {
+ unless (defined $w)
+ {
close $sock;
- print {$conn->{socket}} "426 File retrieval error: $!. Data connection has been closed.\r\n";
+ print {$conn->{socket}}
+ "426 File retrieval error: $!. Data connection has been closed.\r\n";
return;
}
@@ -324,24 +351,32 @@ sub _RETR_command
}
# Transfer aborted by client?
- if ($GOT_SIGURG) {
+ if ($GOT_SIGURG)
+ {
$GOT_SIGURG = 0;
close $sock;
- print {$conn->{socket}} "426 Transfer aborted. Data connection closed.\r\n";
+ print {$conn->{socket}}
+ "426 Transfer aborted. Data connection closed.\r\n";
return;
}
+ $sent += $r;
}
# Cleanup and exit if there was an error.
- unless (defined $r) {
+ unless (defined $r)
+ {
close $sock;
- print {$conn->{socket}} "426 File retrieval error: $!. Data connection has been closed.\r\n";
+ print {$conn->{socket}}
+ "426 File retrieval error: $!. Data connection has been closed.\r\n";
return;
}
- } else { # ASCII type.
- # Copy data.
+ }
+ else
+ { # ASCII type.
+ # Copy data.
my @lines = split /\r\n?|\n/, $content;
- for (@lines) {
+ for (@lines)
+ {
# Remove any native line endings.
s/[\n\r]+$//;
@@ -352,21 +387,25 @@ sub _RETR_command
print $sock "$_\r\n";
# Transfer aborted by client?
- if ($GOT_SIGURG) {
+ if ($GOT_SIGURG)
+ {
$GOT_SIGURG = 0;
close $sock;
- print {$conn->{socket}} "426 Transfer aborted. Data connection closed.\r\n";
+ print {$conn->{socket}}
+ "426 Transfer aborted. Data connection closed.\r\n";
return;
}
}
}
- unless (close ($sock)) {
+ unless (close($sock))
+ {
print {$conn->{socket}} "550 File retrieval error: $!.\r\n";
return;
}
- print {$conn->{socket}} "226 File retrieval complete. Data connection has been closed.\r\n";
+ print {$conn->{socket}}
+ "226 File retrieval complete. Data connection has been closed.\r\n";
}
sub _SIZE_command
@@ -375,13 +414,16 @@ sub _SIZE_command
$path = FTPPaths::path_merge($conn->{dir}, $path);
my $info = $conn->{'paths'}->get_info($path);
- unless ($info) {
+ unless ($info)
+ {
print {$conn->{socket}} "550 File or directory not found.\r\n";
return;
}
- if ($info->{'_type'} eq 'd') {
- print {$conn->{socket}} "550 SIZE command is not supported on directories.\r\n";
+ if ($info->{'_type'} eq 'd')
+ {
+ print {$conn->{socket}}
+ "550 SIZE command is not supported on directories.\r\n";
return;
}
@@ -395,13 +437,14 @@ sub _SYST_command
my ($conn, $cmd, $dummy) = @_;
if ($conn->{'paths'}->GetBehavior('syst_response'))
- {
- print {$conn->{socket}} $conn->{'paths'}->GetBehavior('syst_response') . "\r\n";
- }
+ {
+ print {$conn->{socket}} $conn->{'paths'}->GetBehavior('syst_response')
+ . "\r\n";
+ }
else
- {
+ {
print {$conn->{socket}} "215 UNIX Type: L8\r\n";
- }
+ }
}
sub _TYPE_command
@@ -409,14 +452,22 @@ sub _TYPE_command
my ($conn, $cmd, $type) = @_;
# See RFC 959 section 5.3.2.
- if ($type =~ /^([AI])$/i) {
- $conn->{type} = 'A';
- } elsif ($type =~ /^([AI])\sN$/i) {
- $conn->{type} = 'A';
- } elsif ($type =~ /^L\s8$/i) {
+ if ($type =~ /^([AI])$/i)
+ {
+ $conn->{type} = $1;
+ }
+ elsif ($type =~ /^([AI])\sN$/i)
+ {
+ $conn->{type} = $1;
+ }
+ elsif ($type =~ /^L\s8$/i)
+ {
$conn->{type} = 'L8';
- } else {
- print {$conn->{socket}} "504 This server does not support TYPE $type.\r\n";
+ }
+ else
+ {
+ print {$conn->{socket}}
+ "504 This server does not support TYPE $type.\r\n";
return;
}
@@ -433,14 +484,16 @@ sub _USER_command
print STDERR "switching to WAIT4PWD state\n" if $log;
$conn->{state} = $_connection_states{WAIT4PWD};
- if ($conn->{username} eq "anonymous") {
+ if ($conn->{username} eq "anonymous")
+ {
print {$conn->{socket}} "230 Anonymous user access granted.\r\n";
- } else {
+ }
+ else
+ {
print {$conn->{socket}} "331 Password required.\r\n";
}
}
-
# HELPER ROUTINES
sub __open_data_connection
@@ -449,36 +502,41 @@ sub __open_data_connection
my $sock;
- if ($conn->{passive}) {
+ if ($conn->{passive})
+ {
# Passive mode - wait for a connection from the client.
- accept ($sock, $conn->{passive_socket}) or return undef;
- } else {
+ accept($sock, $conn->{passive_socket}) or return undef;
+ }
+ else
+ {
# Active mode - connect back to the client.
- "0" =~ /(0)/; # Perl 5.7 / IO::Socket::INET bug workaround.
- $sock = IO::Socket::INET->new (LocalAddr => '127.0.0.1',
- PeerAddr => $conn->{peeraddrstring},
- PeerPort => $conn->{peerport},
- Proto => 'tcp',
- Type => SOCK_STREAM) or return undef;
+ "0" =~ /(0)/; # Perl 5.7 / IO::Socket::INET bug workaround.
+ $sock = IO::Socket::INET->new(
+ LocalAddr => '127.0.0.1',
+ PeerAddr => $conn->{peeraddrstring},
+ PeerPort => $conn->{peerport},
+ Proto => 'tcp',
+ Type => SOCK_STREAM
+ )
+ or return undef;
}
return $sock;
}
-
###########################################################################
# FTPSERVER CLASS
###########################################################################
{
- my %_attr_data = ( # DEFAULT
- _input => undef,
- _localAddr => 'localhost',
- _localPort => undef,
- _reuseAddr => 1,
- _rootDir => Cwd::getcwd(),
- _server_behavior => {},
- );
+ my %_attr_data = ( # DEFAULT
+ _input => undef,
+ _localAddr => 'localhost',
+ _localPort => undef,
+ _reuseAddr => 1,
+ _rootDir => Cwd::getcwd(),
+ _server_behavior => {},
+ );
sub _default_for
{
@@ -492,34 +550,44 @@ sub __open_data_connection
}
}
-
-sub new {
+sub new
+{
my ($caller, %args) = @_;
my $caller_is_obj = ref($caller);
- my $class = $caller_is_obj || $caller;
- my $self = bless {}, $class;
- foreach my $attrname ($self->_standard_keys()) {
+ my $class = $caller_is_obj || $caller;
+ my $self = bless {}, $class;
+ foreach my $attrname ($self->_standard_keys())
+ {
my ($argname) = ($attrname =~ /^_(.*)/);
- if (exists $args{$argname}) {
+ if (exists $args{$argname})
+ {
$self->{$attrname} = $args{$argname};
- } elsif ($caller_is_obj) {
+ }
+ elsif ($caller_is_obj)
+ {
$self->{$attrname} = $caller->{$attrname};
- } else {
+ }
+ else
+ {
$self->{$attrname} = $self->_default_for($attrname);
}
}
+
# create server socket
- "0" =~ /(0)/; # Perl 5.7 / IO::Socket::INET bug workaround.
- $self->{_server_sock}
- = IO::Socket::INET->new (LocalHost => $self->{_localAddr},
- LocalPort => $self->{_localPort},
- Listen => 1,
- Reuse => $self->{_reuseAddr},
- Proto => 'tcp',
- Type => SOCK_STREAM)
- or die "bind: $!";
-
- foreach my $file (keys %{$self->{_input}}) {
+ "0" =~ /(0)/; # Perl 5.7 / IO::Socket::INET bug workaround.
+ $self->{_server_sock} =
+ IO::Socket::INET->new(
+ LocalHost => $self->{_localAddr},
+ LocalPort => $self->{_localPort},
+ Listen => 1,
+ Reuse => $self->{_reuseAddr},
+ Proto => 'tcp',
+ Type => SOCK_STREAM
+ )
+ or die "bind: $!";
+
+ foreach my $file (keys %{$self->{_input}})
+ {
my $ref = \$self->{_input}{$file}{content};
$$ref =~ s/{{port}}/$self->sockport/eg;
}
@@ -527,18 +595,18 @@ sub new {
return $self;
}
-
sub run
{
my ($self, $synch_callback) = @_;
my $initialized = 0;
# turn buffering off on STDERR
- select((select(STDERR), $|=1)[0]);
+ select((select(STDERR), $| = 1)[0]);
# initialize command table
my $command_table = {};
- foreach (keys %_commands) {
+ foreach (keys %_commands)
+ {
my $subname = "_${_}_command";
$command_table->{$_} = \&$subname;
}
@@ -546,7 +614,8 @@ sub run
my $old_ils = $/;
$/ = "\r\n";
- if (!$initialized) {
+ if (!$initialized)
+ {
$synch_callback->();
$initialized = 1;
}
@@ -555,14 +624,14 @@ sub run
my $server_sock = $self->{_server_sock};
# the accept loop
- while (my $client_addr = accept (my $socket, $server_sock))
+ while (my $client_addr = accept(my $socket, $server_sock))
{
# turn buffering off on $socket
- select((select($socket), $|=1)[0]);
+ select((select($socket), $| = 1)[0]);
# find out who connected
- my ($client_port, $client_ip) = sockaddr_in ($client_addr);
- my $client_ipnum = inet_ntoa ($client_ip);
+ my ($client_port, $client_ip) = sockaddr_in($client_addr);
+ my $client_ipnum = inet_ntoa($client_ip);
# print who connected
print STDERR "got a connection from: $client_ipnum\n" if $log;
@@ -575,11 +644,12 @@ sub run
# next;
# }
- if (1) { # Child process.
+ if (1)
+ { # Child process.
# install signals
- $SIG{URG} = sub {
- $GOT_SIGURG = 1;
+ $SIG{URG} = sub {
+ $GOT_SIGURG = 1;
};
$SIG{PIPE} = sub {
@@ -588,33 +658,35 @@ sub run
};
$SIG{ALRM} = sub {
- print STDERR "Connection idle timeout expired. Closing server.\n";
+ print STDERR
+ "Connection idle timeout expired. Closing server.\n";
exit;
};
#$SIG{CHLD} = 'IGNORE';
-
print STDERR "in child\n" if $log;
my $conn = {
- 'paths' => FTPPaths->new($self->{'_input'},
- $self->{'_server_behavior'}),
- 'socket' => $socket,
- 'state' => $_connection_states{NEWCONN},
- 'dir' => '/',
- 'restart' => 0,
- 'idle_timeout' => 60, # 1 minute timeout
- 'rootdir' => $self->{_rootDir},
- };
-
- print {$conn->{socket}} "220 GNU Wget Testing FTP Server ready.\r\n";
+ 'paths' =>
+ FTPPaths->new($self->{'_input'}, $self->{'_server_behavior'}),
+ 'socket' => $socket,
+ 'state' => $_connection_states{NEWCONN},
+ 'dir' => '/',
+ 'restart' => 0,
+ 'idle_timeout' => 60, # 1 minute timeout
+ 'rootdir' => $self->{_rootDir},
+ };
+
+ print {$conn->{socket}}
+ "220 GNU Wget Testing FTP Server ready.\r\n";
# command handling loop
- for (;;) {
+ for (; ;)
+ {
print STDERR "waiting for request\n" if $log;
- last unless defined (my $req = <$socket>);
+ last unless defined(my $req = <$socket>);
# Remove trailing CRLF.
$req =~ s/[\n\r]+$//;
@@ -623,7 +695,8 @@ sub run
# Get the command.
# See also RFC 2640 section 3.1.
- unless ($req =~ m/^([A-Z]{3,4})\s?(.*)/i) {
+ unless ($req =~ m/^([A-Z]{3,4})\s?(.*)/i)
+ {
# badly formed command
exit 0;
}
@@ -638,34 +711,41 @@ sub run
my ($cmd, $rest) = (uc $1, $2);
# Got a command which matches in the table?
- unless (exists $command_table->{$cmd}) {
+ unless (exists $command_table->{$cmd})
+ {
print {$conn->{socket}} "500 Unrecognized command.\r\n";
next;
}
# Command requires user to be authenticated?
- unless ($_commands{$cmd} | $conn->{state}) {
+ unless ($_commands{$cmd} | $conn->{state})
+ {
print {$conn->{socket}} "530 Not logged in.\r\n";
next;
}
# Handle the QUIT command specially.
- if ($cmd eq "QUIT") {
- print {$conn->{socket}} "221 Goodbye. Service closing connection.\r\n";
+ if ($cmd eq "QUIT")
+ {
+ print {$conn->{socket}}
+ "221 Goodbye. Service closing connection.\r\n";
last;
}
- if (defined ($self->{_server_behavior}{fail_on_pasv})
- && $cmd eq 'PASV') {
+ if (defined($self->{_server_behavior}{fail_on_pasv})
+ && $cmd eq 'PASV')
+ {
undef $self->{_server_behavior}{fail_on_pasv};
close $socket;
last;
}
# Run the command.
- &{$command_table->{$cmd}} ($conn, $cmd, $rest);
+ &{$command_table->{$cmd}}($conn, $cmd, $rest);
}
- } else { # Father
+ }
+ else
+ { # Father
close $socket;
}
}
@@ -673,18 +753,19 @@ sub run
$/ = $old_ils;
}
-sub sockport {
+sub sockport
+{
my $self = shift;
return $self->{_server_sock}->sockport;
}
-
package FTPPaths;
use POSIX qw(strftime);
# not a method
-sub final_component {
+sub final_component
+{
my $path = shift;
$path =~ s|.*/||;
@@ -692,34 +773,49 @@ sub final_component {
}
# not a method
-sub path_merge {
- my ($a, $b) = @_;
+sub path_merge
+{
+ my ($path_a, $path_b) = @_;
- return $a unless $b;
+ if (!$path_b)
+ {
+ return $path_a;
+ }
- if ($b =~ m.^/.) {
- $a = '';
- $b =~ s.^/..;
+ if ($path_b =~ m.^/.)
+ {
+ $path_a = '';
+ $path_b =~ s.^/..;
}
- $a =~ s./$..;
+ $path_a =~ s./$..;
- my @components = split('/', $b);
+ my @components = split m{/}msx, $path_b;
- foreach my $c (@components) {
- if ($c =~ /^\.?$/) {
+ foreach my $c (@components)
+ {
+ if ($c =~ /^\.?$/)
+ {
next;
- } elsif ($c eq '..') {
- next if $a eq '';
- $a =~ s|/[^/]*$||;
- } else {
- $a .= "/$c";
+ }
+ elsif ($c eq '..')
+ {
+ if (!$path_a)
+ {
+ next;
+ }
+ $path_a =~ s|/[^/]*$||;
+ }
+ else
+ {
+ $path_a .= "/$c";
}
}
- return $a;
+ return $path_a;
}
-sub new {
+sub new
+{
my ($this, @args) = @_;
my $class = ref($this) || $this;
my $self = {};
@@ -728,19 +824,23 @@ sub new {
return $self;
}
-sub initialize {
+sub initialize
+{
my ($self, $urls, $behavior) = @_;
my $paths = {_type => 'd'};
# From a path like '/foo/bar/baz.txt', construct $paths such that
# $paths->{'foo'}->{'bar'}->{'baz.txt'} is
# $urls->{'/foo/bar/baz.txt'}.
- for my $path (keys %$urls) {
- my @components = split('/', $path);
+ for my $path (keys %$urls)
+ {
+ my @components = split m{/}msx, $path;
shift @components;
my $x = $paths;
- for my $c (@components) {
- unless (exists $x->{$c}) {
+ for my $c (@components)
+ {
+ if (!exists $x->{$c})
+ {
$x->{$c} = {_type => 'd'};
}
$x = $x->{$c};
@@ -749,32 +849,40 @@ sub initialize {
$x->{_type} = 'f';
}
- $self->{'_paths'} = $paths;
+ $self->{'_paths'} = $paths;
$self->{'_behavior'} = $behavior;
+ return 1;
}
-sub get_info {
+sub get_info
+{
my ($self, $path, $node) = @_;
$node = $self->{'_paths'} unless $node;
my @components = split('/', $path);
shift @components if @components && $components[0] eq '';
- for my $c (@components) {
- if ($node->{'_type'} eq 'd') {
+ for my $c (@components)
+ {
+ if ($node->{'_type'} eq 'd')
+ {
$node = $node->{$c};
- } else {
- return undef;
+ }
+ else
+ {
+ return;
}
}
return $node;
}
-sub dir_exists {
+sub dir_exists
+{
my ($self, $path) = @_;
- return $self->exists($path, 'd');
+ return $self->path_exists($path, 'd');
}
-sub exists {
+sub path_exists
+{
# type is optional, in which case we don't check it.
my ($self, $path, $type) = @_;
my $paths = $self->{'_paths'};
@@ -786,52 +894,67 @@ sub exists {
return 1;
}
-sub _format_for_list {
+sub _format_for_list
+{
my ($self, $name, $info) = @_;
# XXX: mode should be specifyable as part of the node info.
my $mode_str;
- if ($info->{'_type'} eq 'd') {
+ if ($info->{'_type'} eq 'd')
+ {
$mode_str = 'dr-xr-xr-x';
- } else {
+ }
+ else
+ {
$mode_str = '-r--r--r--';
}
my $size = 0;
- if ($info->{'_type'} eq 'f') {
- $size = length $info->{'content'};
- if ($self->{'_behavior'}{'bad_list'}) {
+ if ($info->{'_type'} eq 'f')
+ {
+ $size = length $info->{'content'};
+ if ($self->{'_behavior'}{'bad_list'})
+ {
$size = 0;
}
}
- my $date = strftime ("%b %e %H:%M", localtime);
+ my $date = strftime("%b %e %H:%M", localtime);
return "$mode_str 1 0 0 $size $date $name";
}
-sub get_list {
+sub get_list
+{
my ($self, $path, $no_hidden) = @_;
my $info = $self->get_info($path);
- return undef unless defined $info;
+ if (!defined $info)
+ {
+ return;
+ }
my $list = [];
- if ($info->{'_type'} eq 'd') {
- for my $item (keys %$info) {
+ if ($info->{'_type'} eq 'd')
+ {
+ for my $item (keys %$info)
+ {
next if $item =~ /^_/;
+
# 2013-10-17 Andrea Urbani (matfanjol)
# I skip the hidden files if requested
- if (($no_hidden) &&
- (defined($info->{$item}->{'attr'})) &&
- (index($info->{$item}->{'attr'}, "H")>=0))
- {
+ if ( ($no_hidden)
+ && (defined($info->{$item}->{'attr'}))
+ && (index($info->{$item}->{'attr'}, "H") >= 0))
+ {
# This is an hidden file and I don't want to see it!
print STDERR "get_list: Skipped hidden file [$item]\n";
- }
+ }
else
- {
+ {
push @$list, $self->_format_for_list($item, $info->{$item});
- }
+ }
}
- } else {
+ }
+ else
+ {
push @$list, $self->_format_for_list(final_component($path), $info);
}
@@ -856,9 +979,10 @@ sub get_list {
# to the url files
# syst_response : if defined, its content is printed
# out as SYST response
-sub GetBehavior {
- my ($self, $name) = @_;
- return $self->{'_behavior'}{$name};
+sub GetBehavior
+{
+ my ($self, $name) = @_;
+ return $self->{'_behavior'}{$name};
}
1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:23:26 +0000