version 1.5, 2017/02/23 21:32:08
|
version 1.6, 2017/02/24 17:34:55
|
Line 50 sub handler {
|
Line 50 sub handler {
|
&Apache::loncommon::no_cache($request); |
&Apache::loncommon::no_cache($request); |
if ($uri =~ /\/$/) { |
if ($uri =~ /\/$/) { |
return directory_listing($uri, $request); |
return directory_listing($uri, $request); |
} elsif ($uri =~ /\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$/) { |
} elsif ($uri =~ /^\/priv\/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$/) { |
return convert_problem($uri, $request); |
return convert_problem($uri, $request); |
} else { |
} else { |
# Apache should send other files directly |
# Apache should send other files directly |
Line 62 sub handler {
|
Line 62 sub handler {
|
sub convert_problem { |
sub convert_problem { |
my ($uri, $request) = @_; |
my ($uri, $request) = @_; |
|
|
|
if ($uri =~ /^\/priv\/([^\/]+)\/([^\/]+)\//) { |
|
my ($domain, $user) = ($1, $2); |
|
my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'}); |
|
if (!defined $uname || !defined $udom || $domain ne $udom || $user ne $uname) { |
|
$request->content_type('text/plain'); |
|
$request->print("Forbidden URI: $uri"); |
|
$request->status(403); |
|
return OK; |
|
} |
|
} |
my $file = &Apache::lonnet::filelocation('', $uri); |
my $file = &Apache::lonnet::filelocation('', $uri); |
&Apache::lonnet::repcopy($file); |
&Apache::lonnet::repcopy($file); |
if (! -e $file) { |
if (! -e $file) { |
Line 96 sub directory_listing {
|
Line 106 sub directory_listing {
|
if ($uri eq '/') { |
if ($uri eq '/') { |
# root: let users browse /res |
# root: let users browse /res |
$res .= "<directory name=\"/\">\n"; |
$res .= "<directory name=\"/\">\n"; |
|
$res .= "<directory name=\"priv\"/>\n"; |
$res .= "<directory name=\"res\"/>\n"; |
$res .= "<directory name=\"res\"/>\n"; |
} elsif ($uri !~ /^\/(priv|res)\//) { |
} elsif ($uri !~ /^\/(priv|res)\//) { |
|
$request->content_type('text/plain'); |
|
$request->print("Not found: $uri"); |
$request->status(404); |
$request->status(404); |
return OK; |
return OK; |
} elsif ($uri =~ /^\/res\//) { |
} elsif ($uri =~ /^\/res\//) { |
|
# NOTE: dirlist does not return an error for /res/idontexist/ |
(my $listref, $listerror) = &Apache::lonnet::dirlist($uri); |
(my $listref, $listerror) = &Apache::lonnet::dirlist($uri); |
if ($listerror) { |
if ($listerror) { |
$request->content_type('text/plain'); |
$request->content_type('text/plain'); |
$request->print("listing error: $listerror"); |
$request->print("listing error: $listerror"); |
$request->status(406); |
$request->status(406); |
return OK; |
return OK; |
|
} elsif ($uri =~ /^\/res\/[^\/]+\/$/ && scalar(@{$listref}) == 0) { |
|
$request->content_type('text/plain'); |
|
$request->print("Not found: $uri"); |
|
$request->status(404); |
|
return OK; |
} |
} |
my $dirname = $uri; |
my $dirname = $uri; |
$dirname =~ s/^.*\/([^\/]*)$/$1/; |
$dirname =~ s/^.*\/([^\/]*)$/$1/; |
Line 114 sub directory_listing {
|
Line 133 sub directory_listing {
|
if (ref($listref) eq 'ARRAY') { |
if (ref($listref) eq 'ARRAY') { |
my @lines = @{$listref}; |
my @lines = @{$listref}; |
foreach my $line (@lines) { |
foreach my $line (@lines) { |
my ($path, $dom, undef, $testdir, undef, undef, undef, undef, undef, undef, undef, undef, undef, undef, $obs, undef) = split(/\&/, $line, 16); |
my ($path, $dom, undef, $testdir, undef, undef, undef, undef, $size, undef, $mtime, undef, undef, undef, $obs, undef) = split(/\&/, $line, 16); |
my $isdir = ($testdir & 16384) || $dom =~ /^(user|domain)$/; |
my $isdir = ($testdir & 16384) || $dom =~ /^(user|domain)$/; |
$path =~ s/^\/home\/httpd\/html\/res\///; |
$path =~ s/^\/home\/httpd\/html\/res\///; |
next if $path eq '.' || $path eq '..'; |
next if $path eq '.' || $path eq '..'; |
Line 137 sub directory_listing {
|
Line 156 sub directory_listing {
|
if ($isdir) { |
if ($isdir) { |
$res .= "<directory name=\"$name\"/>\n"; |
$res .= "<directory name=\"$name\"/>\n"; |
} else { |
} else { |
$res .= "<file name=\"$name\"/>\n"; |
my $dt = DateTime->from_epoch(epoch => $mtime); |
|
my $modified = $dt->iso8601().'Z'; |
|
$res .= "<file name=\"$name\" size=\"$size\" modified=\"$modified\"/>\n"; |
} |
} |
} |
} |
} |
} |
} else { |
} elsif ($uri eq '/priv/') { |
|
my $udom = $env{'user.domain'}; |
|
if (!defined $udom) { |
|
$request->content_type('text/plain'); |
|
$request->print("Forbidden URI: $uri"); |
|
$request->status(403); |
|
return OK; |
|
} |
|
$res .= "<directory name=\"priv\">\n"; |
|
$res .= "<directory name=\"$udom\"/>\n"; |
|
} elsif ($uri =~ /^\/priv\/([^\/]+)\/$/) { |
|
my $domain = $1; |
|
my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'}); |
|
if (!defined $uname || !defined $udom || $domain ne $udom) { |
|
$request->content_type('text/plain'); |
|
$request->print("Forbidden URI: $uri"); |
|
$request->status(403); |
|
return OK; |
|
} |
|
$res .= "<directory name=\"$domain\">\n"; |
|
$res .= "<directory name=\"$uname\"/>\n"; |
|
} elsif ($uri =~ /^\/priv\/([^\/]+)\/([^\/]+)\//) { |
|
my ($domain, $user) = ($1, $2); |
|
my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'}); |
|
if (!defined $uname || !defined $udom || $domain ne $udom || $user ne $uname) { |
|
$request->content_type('text/plain'); |
|
$request->print("Forbidden URI: $uri"); |
|
$request->status(403); |
|
return OK; |
|
} |
my $dirpath = &Apache::lonnet::filelocation('', $uri); |
my $dirpath = &Apache::lonnet::filelocation('', $uri); |
if (! -e $dirpath) { |
if (! -e $dirpath) { |
|
$request->content_type('text/plain'); |
|
$request->print("Not found: $uri"); |
$request->status(404); |
$request->status(404); |
return OK; |
return OK; |
} |
} |
Line 176 sub directory_listing {
|
Line 228 sub directory_listing {
|
$res .= "/>\n"; |
$res .= "/>\n"; |
} |
} |
} |
} |
|
} else { |
|
$request->content_type('text/plain'); |
|
$request->print("Not found: $uri"); |
|
$request->status(404); |
|
return OK; |
} |
} |
$res .= "</directory>\n"; |
$res .= "</directory>\n"; |
&Apache::loncommon::content_type($request, 'text/xml', 'utf-8'); |
&Apache::loncommon::content_type($request, 'text/xml', 'utf-8'); |