--- loncom/homework/daxeopen.pm 2015/12/03 20:40:27 1.1
+++ loncom/homework/daxeopen.pm 2023/08/23 22:34:48 1.11
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Opening converted problems and directory listings for Daxe
#
-# $Id: daxeopen.pm,v 1.1 2015/12/03 20:40:27 damieng Exp $
+# $Id: daxeopen.pm,v 1.11 2023/08/23 22:34:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -28,96 +28,218 @@
###
package Apache::daxeopen;
+use strict;
-use Apache::Constants;
+use Apache::Constants qw(:common);
use DateTime;
use Try::Tiny;
use File::stat;
use Fcntl ':mode';
+use LONCAPA qw(:match);
use Apache::loncommon;
use Apache::lonnet;
use Apache::pre_xml;
use Apache::html_to_xml;
use Apache::post_xml;
-
+use Apache::lonlocal;
sub handler {
my $request = shift;
my $uri = $request->uri;
- $uri =~ s/^\/daxeopen//;
+ $uri =~ s{^/daxeopen}{};
&Apache::loncommon::no_cache($request);
- if ($uri =~ /\/$/) {
+ if ($uri =~ m{/$}) {
return directory_listing($uri, $request);
- } elsif ($uri =~ /\.(task|problem|exam|quiz|assess|survey|library)$/) {
+ } elsif ($uri =~ m{^/priv/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$}) {
return convert_problem($uri, $request);
} else {
# Apache should send other files directly
- return HTTP_NOT_ACCEPTABLE;
+ $request->status(406);
+ return OK;
}
}
sub convert_problem {
my ($uri, $request) = @_;
-
+ if ($uri =~ m{^/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(&mt('Forbidden URI: [_1]',$uri));
+ $request->status(403);
+ return OK;
+ }
+ }
my $file = &Apache::lonnet::filelocation('', $uri);
&Apache::lonnet::repcopy($file);
if (! -e $file) {
- return HTTP_NOT_FOUND;
+ $request->status(404);
+ return OK;
}
try {
my $warnings = 0; # no warning printed
my $textref = &Apache::pre_xml::pre_xml($file, $warnings);
- $textref = &Apache::html_to_xml::html_to_xml($textref, $warnings);
- my $text = &Apache::post_xml::post_xml($textref, $file, $warnings);
+ my $case_sensitive;
+ if ($uri =~ /\.(task)$/) {
+ $case_sensitive = 1;
+ } else {
+ $case_sensitive = 0;
+ }
+ $textref = &Apache::html_to_xml::html_to_xml($textref, $warnings, $case_sensitive);
+ my $text = &Apache::post_xml::post_xml($textref, $file, $Apache::lonnet::perlvar{'lonDocRoot'}, $warnings);
&Apache::loncommon::content_type($request, 'text/xml', 'utf-8');
$request->print($text);
return OK;
} catch {
- die "convert failed for $file: $_";
- #$request->print('<?xml version="1.0" encoding="UTF-8"?>'."\n");
- #$request->print("<problem>\n");
- #$request->print("convert failed for $file: $_");
- #$request->print("</problem>\n");
- #return OK;
+ $request->content_type('text/plain');
+ $request->print(&mt('convert failed for [_1]:',$file)." $_");
+ $request->status(406);
+ return OK;
};
}
sub directory_listing {
my ($uri, $request) = @_;
- my $dirpath = &Apache::lonnet::filelocation('', $uri);
- if (! -e $dirpath) {
- return HTTP_NOT_FOUND;
- }
- $dirpath =~ s/\/$//;
- opendir my $dir, $dirpath or die "Cannot open directory: $dirpath";
- my @files = readdir $dir;
- closedir $dir;
my $res = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
- my $dirname = $dirpath;
- $dirname =~ s/^.*\/([^\/]*)$/$1/;
- $res .= "<directory name=\"$dirname\">\n";
- foreach my $name (@files) {
- if ($name eq '.' || $name eq '..') {
- next;
- }
- if ($name =~ /\.(bak|log|meta|save)$/) {
- next;
- }
- $sb = stat($dirpath.'/'.$name);
- my $mode = $sb->mode;
- if (S_ISDIR($mode)) {
- $res .= "<directory name=\"$name\"/>\n";
+ if ($uri eq '/') {
+ # root: let users browse /res
+ $res .= "<directory name=\"/\">\n";
+ $res .= "<directory name=\"priv\"/>\n";
+ $res .= "<directory name=\"res\"/>\n";
+ } elsif ($uri !~ m{^/(priv|res)/}) {
+ $request->content_type('text/plain');
+ $request->print(&mt('Not found: [_1]',$uri));
+ $request->status(404);
+ return OK;
+ } elsif ($uri =~ m{^/res/}) {
+ # NOTE: dirlist does not return an error for /res/idontexist/
+ my ($listref, $listerror) = &Apache::lonnet::dirlist($uri);
+ if ($listerror) {
+ $request->content_type('text/plain');
+ $request->print(&mt('listing error: [_1]',$listerror));
+ $request->status(406);
+ return OK;
+ } elsif ($uri =~ m{^/res/[^/]+/$} && scalar(@{$listref}) == 0) {
+ $request->content_type('text/plain');
+ $request->print(&mt('Not found: [_1]',$uri));
+ $request->status(404);
+ return OK;
+ }
+ my $dirname = $uri;
+ $dirname =~ s{^.*/([^/]*)$}{$1};
+ $res .= "<directory name=\"$dirname/\">\n";
+ if (ref($listref) eq 'ARRAY') {
+ my @lines = @{$listref};
+ foreach my $line (@lines) {
+ 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)$/;
+ $path =~ s{^/home/httpd/html/res/}{};
+ next if $path eq '.' || $path eq '..';
+ next if $path =~ /\.meta$/ || $obs || $path =~ /\.\d+\.[^.]+$/;
+ if ($dom ne 'domain') {
+ my ($udom,$uname);
+ if ($dom eq 'user') {
+ ($udom) = ($uri =~ m{^/res/($match_domain)});
+ $uname = $path;
+ } else {
+ ($udom, $uname) = ($uri =~ m{^/res/($match_domain)/($match_courseid)});
+ }
+ if ($udom ne '' && $uname ne '') {
+ # remove courses from the list
+ next if (&Apache::lonnet::is_course($udom, $uname));
+ }
+ }
+ $path =~ s{/$}{};
+ my $name = $path;
+ if ($isdir) {
+ $res .= "<directory name=\"$name\"/>\n";
+ } else {
+ my $dt = DateTime->from_epoch(epoch => $mtime);
+ my $modified = $dt->iso8601().'Z';
+ $res .= "<file name=\"$name\" size=\"$size\" modified=\"$modified\"/>\n";
+ }
+ }
+ }
+ } elsif ($uri eq '/priv/') {
+ my $udom = $env{'user.domain'};
+ if (!defined $udom) {
+ $request->content_type('text/plain');
+ $request->print(&mt('Forbidden URI: [_1]',$uri));
+ $request->status(403);
+ return OK;
+ }
+ $res .= "<directory name=\"priv\">\n";
+ $res .= "<directory name=\"$udom\"/>\n";
+ } elsif ($uri =~ m{^/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(&mt('Forbidden URI: [_1]',$uri));
+ $request->status(403);
+ return OK;
+ }
+ $res .= "<directory name=\"$domain\">\n";
+ $res .= "<directory name=\"$uname\"/>\n";
+ } elsif ($uri =~ m{^/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(&mt('Forbidden URI: [_1]',$uri));
+ $request->status(403);
+ return OK;
+ }
+ my $dirpath = &Apache::lonnet::filelocation('', $uri);
+ if (! -e $dirpath) {
+ $request->content_type('text/plain');
+ $request->print(&mt('Not found: [_1]',$uri));
+ $request->status(404);
+ return OK;
+ }
+ $dirpath =~ s{/$}{};
+ my @files;
+ if (opendir(my $dir, $dirpath)) {
+ @files = readdir($dir);
+ closedir($dir);
} else {
- $res .= "<file name=\"$name\"";
- my $size = $sb->size; # total size of file, in bytes
- $res .= " size=\"$size\"";
- my $mtime = $sb->mtime; # last modify time in seconds since the epoch
- my $dt = DateTime->from_epoch(epoch => $mtime);
- my $modified = $dt->iso8601().'Z';
- $res .= " modified=\"$modified\"";
- $res .= "/>\n";
+ $request->content_type('text/plain');
+ $request->print(&mt('Error opening directory: [_1]',$dirpath));
+ $request->status(403);
+ return OK;
}
+ my $dirname = $dirpath;
+ $dirname =~ s{^.*/([^/]*)$}{$1};
+ $res .= "<directory name=\"$dirname\">\n";
+ foreach my $name (@files) {
+ if ($name eq '.' || $name eq '..') {
+ next;
+ }
+ if ($name =~ /\.(bak|log|meta|save)$/) {
+ next;
+ }
+ my $sb = stat($dirpath.'/'.$name);
+ my $mode = $sb->mode;
+ if (S_ISDIR($mode)) {
+ $res .= "<directory name=\"$name\"/>\n";
+ } else {
+ $res .= "<file name=\"$name\"";
+ my $size = $sb->size; # total size of file, in bytes
+ $res .= " size=\"$size\"";
+ my $mtime = $sb->mtime; # last modify time in seconds since the epoch
+ my $dt = DateTime->from_epoch(epoch => $mtime);
+ my $modified = $dt->iso8601().'Z';
+ $res .= " modified=\"$modified\"";
+ $res .= "/>\n";
+ }
+ }
+ } else {
+ $request->content_type('text/plain');
+ $request->print(&mt('Not found: [_1]',$uri));
+ $request->status(404);
+ return OK;
}
$res .= "</directory>\n";
&Apache::loncommon::content_type($request, 'text/xml', 'utf-8');
@@ -125,26 +247,5 @@ sub directory_listing {
return OK;
}
-# NOTE: binaries should be sent directly be Apache
-# sub send_binary {
-# my ($request, $filepath) = @_;
-#
-# $buffer = '';
-# if (!open(FILE, "<", $filepath)) {
-# return HTTP_NOT_FOUND;
-# }
-# binmode(FILE);
-#
-# # Read file in 32K blocks
-# while ((read(FILE, $buffer, 32768)) != 0) {
-# $request->print($buffer);
-# }
-#
-# if (!close(FILE)) {
-# &Apache::lonnet::logthis("Error closing the file $filepath");
-# }
-# return OK;
-# }
-
1;
__END__