--- loncom/homework/daxeopen.pm	2017/02/23 21:32:08	1.5
+++ loncom/homework/daxeopen.pm	2017/02/24 17:34:55	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Opening converted problems and directory listings for Daxe
 #
-# $Id: daxeopen.pm,v 1.5 2017/02/23 21:32:08 damieng Exp $
+# $Id: daxeopen.pm,v 1.6 2017/02/24 17:34:55 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,7 @@ sub handler {
     &Apache::loncommon::no_cache($request);
     if ($uri =~ /\/$/) {
         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);
     } else {
         # Apache should send other files directly
@@ -62,6 +62,16 @@ sub handler {
 sub convert_problem {
     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);
     &Apache::lonnet::repcopy($file);
     if (! -e $file) {
@@ -96,17 +106,26 @@ sub directory_listing {
     if ($uri eq '/') {
         # root: let users browse /res
         $res .= "<directory name=\"/\">\n";
+        $res .= "<directory name=\"priv\"/>\n";
         $res .= "<directory name=\"res\"/>\n";
     } elsif ($uri !~ /^\/(priv|res)\//) {
+        $request->content_type('text/plain');
+        $request->print("Not found: $uri");
         $request->status(404);
         return OK;
     } elsif ($uri =~ /^\/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("listing error: $listerror");
             $request->status(406);
             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;
         $dirname =~ s/^.*\/([^\/]*)$/$1/;
@@ -114,7 +133,7 @@ sub directory_listing {
         if (ref($listref) eq 'ARRAY') {
             my @lines = @{$listref};
             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)$/;
                 $path =~ s/^\/home\/httpd\/html\/res\///;
                 next if $path eq '.' || $path eq '..';
@@ -137,13 +156,46 @@ sub directory_listing {
                 if ($isdir) {
                     $res .= "<directory name=\"$name\"/>\n";
                 } 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);
         if (! -e $dirpath) {
+            $request->content_type('text/plain');
+            $request->print("Not found: $uri");
             $request->status(404);
             return OK;
         }
@@ -176,6 +228,11 @@ sub directory_listing {
                 $res .= "/>\n";
             }
         }
+    } else {
+        $request->content_type('text/plain');
+        $request->print("Not found: $uri");
+        $request->status(404);
+        return OK;
     }
     $res .= "</directory>\n";
     &Apache::loncommon::content_type($request, 'text/xml', 'utf-8');