eleksir/myapi
1
Fork 0
Code Activity

upload.pm: add diagnostics

Browse Source
This commit is contained in:
eleksir
2019-10-20 17:11:52 +03:00
parent 5fe0ca517d
commit 9dd5f1a208
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/upload.pm
View File

@@ -15,14 +15,20 @@ use conf;
my $c = loadConf(); my $c = loadConf();
sub upload { sub upload {
my $input = shift; my $input = shift; # file descriptor with data being uploaded
my $len = shift; my $len = shift; # expected data length (from client)
my $name = shift; my $name = shift; # upload "dir" and filename
my ($status, $content, $msg) = ('400', 'text/plain', "Bad Request?\n"); my ($status, $content, $msg) = ('400', 'text/plain', "Bad Request?\n");
return ($status, $content, "No Content-Length supplied.\n") unless (defined($len));
return ($status, $content, "No name supplied.\n") unless (defined($name));
my $d; my $d;
($d, $name) = split(/\//, $name, 2); ($d, $name) = split(/\//, $name, 2);
return ($status, $content, "Name does not match pattern.\n") unless ($name =~ /^[A-Z|a-z|0-9|_|\-|\+]+$/);
my $match; my $match;
return ($status, $content, $msg) unless ($name =~ /^[A-Z|a-z|0-9|_|\-|\+]+$/);
foreach (keys(%{$c->{upload}->{dir}})) { foreach (keys(%{$c->{upload}->{dir}})) {
if ($d eq $_) { if ($d eq $_) {
@@ -31,7 +37,8 @@ sub upload {
} }
} }
return ($status, $content, $msg) unless($match); # incorrect destination in url return ($status, $content, "Incorrect destination dir.\n") unless($match); # incorrect destination in url
$name = sprintf("%s/%s", $c->{upload}->{dir}->{$d}, $name); $name = sprintf("%s/%s", $c->{upload}->{dir}->{$d}, $name);
if ($len > 0) { if ($len > 0) {
@@ -64,7 +71,11 @@ sub upload {
} else { } else {
($status, $content, $msg) = ('201', $content, "Uploaded.\n"); ($status, $content, $msg) = ('201', $content, "Uploaded.\n");
} }
} else {
($status, $content, $msg) = ('500', $content, "Unable to write: $!\n");
} }
} else {
$msg = "Incorrect Content-Length\n";
} }
return ($status, $content, $msg); return ($status, $content, $msg);