--- loncom/homework/daxeopen.pm	2023/08/23 22:25:48	1.10
+++ loncom/homework/daxeopen.pm	2023/08/28 18:58:44	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Opening converted problems and directory listings for Daxe
 #
-# $Id: daxeopen.pm,v 1.10 2023/08/23 22:25:48 raeburn Exp $
+# $Id: daxeopen.pm,v 1.13 2023/08/28 18:58:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,8 @@ sub handler {
         return directory_listing($uri, $request);
     } elsif ($uri =~ m{^/priv/.*\.(task|problem|exam|quiz|assess|survey|library|xml|html|htm|xhtml|xhtm)$}) {
         return convert_problem($uri, $request);
+    } elsif ($uri =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/.*\.(html|htm|xhtml|xhtm)$}) {
+         return convert_problem($uri, $request);
     } else {
         # Apache should send other files directly
         $request->status(406);
@@ -62,10 +64,26 @@ sub handler {
 
 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) {
+    if ($uri =~ m{^/priv/$match_domain/$match_username/}) {
+        unless (&has_priv_access($uri)) {
+            $request->content_type('text/plain');
+            $request->print(&mt('Forbidden URI: [_1]',$uri));
+            $request->status(403);
+            return OK;
+        }
+    } elsif ($uri =~ m{^/uploaded/($match_domain)/($match_courseid)/}) {
+        my ($posscdom,$posscnum) = ($1,$2);
+        my $allowed;
+        if ($env{'request.course.id'}) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum =  $env{'course.'.$env{'request.course.id'}.'.num'};
+            if (($posscdom eq $cdom) && ($posscnum eq $cnum)) {
+                if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                    $allowed = 1;
+                }
+            }
+        }
+        unless ($allowed) {
             $request->content_type('text/plain');
             $request->print(&mt('Forbidden URI: [_1]',$uri));
             $request->status(403);
@@ -73,9 +91,15 @@ sub convert_problem {
         }
     }
     my $file = &Apache::lonnet::filelocation('', $uri);
-    &Apache::lonnet::repcopy($file);
-    if (! -e $file) {
-        $request->status(404);
+    if (&Apache::lonnet::repcopy($file) eq 'ok') {
+        if (! -e $file) {
+            $request->print(&mt('Not found: [_1]',$uri));
+            $request->status(404);
+            return OK;
+        }
+    } else {
+        $request->print(&mt('Forbidden URI: [_1]',$uri));
+        $request->status(403);
         return OK;
     }
     try {
@@ -103,12 +127,98 @@ sub convert_problem {
 sub directory_listing {
     my ($uri, $request) = @_;
     my $res = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
+    my $referrer = $request->headers_in->{'Referer'};
+    my ($cdom,$cnum);
+    if ($env{'request.course.id'}) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }    
     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)\//) {
+        if (($env{'request.course.id'}) &&
+            ($referrer =~ m{\Qfile=/daxeopen/uploaded/$cdom/$cnum/\E(docs|supplemental)/(default|\d+)/(\d+)/})) {
+            $res .= "<directory name=\"uploaded\"/>\n";
+        } else {
+            # root: let users browse /res
+            $res .= "<directory name=\"priv\"/>\n";
+            $res .= "<directory name=\"res\"/>\n";
+        }
+    } elsif ($uri =~ m{^/uploaded/(.*)$}) {
+        my $rem = $1;
+        $rem =~ s{/$}{};
+        if (($env{'request.course.id'}) &&
+            ($referrer =~ m{\Qfile=/daxeopen/uploaded/$cdom/$cnum/\E(docs|supplemental)/(default|\d+)/(\d+)/})) {
+            my ($type,$folder,$rid) = ($1,$2,$3);
+            if ($rem eq '') {
+                $res .= "<directory name=\"uploaded\">\n";
+                $res .= "<directory name=\"$cdom\"/>\n";
+            } else {
+                my @expected = ($cdom,$cnum,$type,$folder,$rid);
+                my @rest = split(/\//,$rem);
+                my $valid = 1;
+                for (my $i=0; $i<@rest; $i++) {
+                    unless ($rest[$i] eq $expected[$i]) {
+                        $valid = 0;
+                        last;
+                    }
+                }
+                if ($valid) {
+                    my $dirname = $rest[-1];
+                    $res .= "<directory name=\"$dirname\">\n";
+                    if (scalar(@rest) == scalar(@expected)) {
+                        my $subdir = "/userfiles/$type/$folder/$rid";
+                        my ($listref, $listerror) = &Apache::lonnet::dirlist($subdir,$cdom,$cnum,'',1);
+                        if ($listerror) {
+                            $request->content_type('text/plain');
+                            $request->print(&mt('listing error: [_1]',$listerror));
+                            $request->status(406);
+                            return OK;
+                        } elsif (scalar(@{$listref}) == 0) {
+                            $request->content_type('text/plain');
+                            $request->print(&mt('Not found: [_1]',$uri));
+                            $request->status(404);
+                            return OK;
+                        } else {
+                            my @lines = @{$listref};
+                            my $dirpath = &LONCAPA::propath($cdom,$cnum).'/userfiles';
+                            my $dirname = $uri;
+                            $dirname =~ s{^.*/([^/]*)$}{$1};
+                            foreach my $line (@lines) {
+                                my ($path,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime) = split(/\&/,$line,12);
+                                my $isdir = ($testdir & 16384);
+                                $path =~ s{^$dirpath}{};
+                                next if ($path eq '.' || $path eq '..');
+                                $path =~ s{/$}{};
+                                my $name = $path;
+                                if ($isdir) {
+                                    $res .= "<directory name=\"$name\"/>\n";
+                                } else {
+                                    next if ($name =~ /\.bak$/);
+                                    my $dt = DateTime->from_epoch(epoch => $mtime);
+                                    my $modified = $dt->iso8601().'Z';
+                                    $res .= "<file name=\"$name\" size=\"$size\" modified=\"$modified\"/>\n";
+                                }
+                            }
+                        }
+                    } else {
+                       my $nextidx = scalar(@rest);
+                       my $subdir = $expected[$nextidx];
+                       $res .= "<directory name=\"$subdir\"/>"."\n";    
+                    }
+                } else {
+                    $request->content_type('text/plain');
+                    $request->print(&mt('Forbidden URI: [_1]',$uri));
+                    $request->status(403);
+                    return OK;
+                }
+            }
+        } else {
+            $request->content_type('text/plain');
+            $request->print(&mt('Forbidden URI: [_1]',$uri));
+            $request->status(403);
+            return OK;
+        }
+    } elsif ($uri !~ m{^/(priv|res)/}) {
         $request->content_type('text/plain');
         $request->print(&mt('Not found: [_1]',$uri));
         $request->status(404);
@@ -130,6 +240,7 @@ sub directory_listing {
         my $dirname = $uri;
         $dirname =~ s{^.*/([^/]*)$}{$1};
         $res .= "<directory name=\"$dirname/\">\n";
+        my (%is_course,%is_courseauthor);
         if (ref($listref) eq 'ARRAY') {
             my @lines = @{$listref};
             foreach my $line (@lines) {
@@ -147,8 +258,29 @@ sub directory_listing {
                         ($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));
+                        my $key = $udom.':'.$uname;
+                        if (exists($is_course{$key})) {
+                            if ($is_course{$key}) {
+                                next unless ($is_courseauthor{$key});
+                            }
+                        } else {
+                            if (&Apache::lonnet::is_course($udom, $uname)) {
+                                $is_course{$key} = 1;
+                                if ($env{'request.course.id'}) {
+                                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                                    if (($cdom eq $udom) && ($cnum eq $uname)) {
+                                        if (&Apache::lonnet::allowed('mdc', $env{'request.course.id'})) {
+                                            $is_courseauthor{$key} = 1;
+                                        }
+                                    }
+                                }
+                                # remove courses from the list
+                                next unless ($is_courseauthor{$key});
+                            } else {
+                                $is_course{$key} = 0;
+                            }
+                        }
                     }
                 }
                 $path =~ s{/$}{};
@@ -163,30 +295,29 @@ sub directory_listing {
             }
         }
     } elsif ($uri eq '/priv/') {
-        my $udom = $env{'user.domain'};
-        if (!defined $udom) {
+        my $defdom = &get_defdom($referrer);
+        if (!defined $defdom) {
             $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/([^/]+)/$}) {
+        $res .= "<directory name=\"$defdom\"/>\n";
+    } elsif ($uri =~ m{^/priv/($match_domain)/$}) {
         my $domain = $1;
-        my ($uname, $udom) = ($env{'user.name'}, $env{'user.domain'});
-        if (!defined $uname || !defined $udom || $domain ne $udom) {
+        my $defdom = &get_defdom($referrer);
+        if ($domain ne $defdom) {
             $request->content_type('text/plain');
             $request->print(&mt('Forbidden URI: [_1]',$uri));
             $request->status(403);
             return OK;
         }
+        my $defname = &get_defname($domain,$referrer);
         $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) {
+        $res .= "<directory name=\"$defname\"/>\n";
+    } elsif ($uri =~ m{^/priv/($match_domain)\/($match_username)/}) {
+        unless (&has_priv_access($uri)) {
             $request->content_type('text/plain');
             $request->print(&mt('Forbidden URI: [_1]',$uri));
             $request->status(403);
@@ -247,5 +378,85 @@ sub directory_listing {
     return OK;
 }
 
+sub has_priv_access {
+    my ($uri) = @_; 
+    my ($ownername,$ownerdom,$ownerhome) =
+        &Apache::lonnet::constructaccess($uri);
+    my $allowed;
+    if (($ownername ne '') && ($ownerdom ne '') && ($ownerhome ne '')) {
+        unless ($ownerhome eq 'no_host') {
+            my @hosts = &Apache::lonnet::current_machine_ids();
+            if (grep(/^\Q$ownerhome\E$/,@hosts)) {
+                $allowed = 1;
+            }
+        }
+    }
+    return $allowed;
+}
+
+sub get_defdom {
+    my ($referrer) = @_;
+    my $defdom;
+    if ($env{'request.role'} =~ m{^au\./($match_domain)/$}) {
+        $defdom = $1;
+    } elsif ($env{'request.role'} =~ m{^(?:ca|aa)\.($match_domain)/($match_username)$}) {
+        $defdom = $1;
+    } elsif ($env{'request.course.id'}) {
+        if ($referrer =~ m{\Qfile=/daxeopen/priv/\E($match_domain)/($match_username)/}) {
+            my ($possdom,$possuname) = ($1,$2);
+            if (&Apache::lonnet::is_course($possdom,$possuname)) {
+                my $crsurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
+                if ($crsurl eq "/$possdom/$possuname") {
+                    $defdom = $possdom;
+                }
+            } else {
+                if (&Apache::lonnet::domain($possdom) ne '') {
+                    $defdom = $possdom;
+                }
+            }
+        }
+    }
+    if ($defdom eq '') {
+        my ($is_adv,$is_author) = &Apache::lonnet::is_advanced_user($env{'user.domain'},$env{'user.name'});
+        if ($is_author) {
+            $defdom = $env{'user.domain'};
+        }
+    }
+    return $defdom;
+}
+
+sub get_defname {
+    my ($domain,$referrer) = @_;
+    my $defname;
+    if ($env{'request.role'} eq "au./$domain/") {
+        $defname = $env{'user.name'};
+    } elsif ($env{'request.role'} =~ m{^(?:ca|aa)\./\Q$domain\E/($match_username)$}) {
+        $defname = $1;
+    } elsif ($env{'request.course.id'}) {
+        if ($referrer =~ m{\Qfile=/daxeopen/priv/\E($match_domain)/($match_username)/}) {
+            my ($possdom,$possuname) = ($1,$2);
+            if ($domain eq $possdom) {
+                if (&Apache::lonnet::is_course($possdom,$possuname)) {
+                     my $crsurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
+                     if ($crsurl eq "/$possdom/$possuname") {
+                        $defname = $possuname;
+                    }
+                } else {
+                    unless (&Apache::lonnet::homeserver($possuname,$possdom) eq 'no_host') {
+                        $defname = $possuname;
+                    }
+                }
+            }
+        }
+    }
+    if ($defname eq '') {
+        my ($is_adv,$is_author) = &Apache::lonnet::is_advanced_user($domain,$env{'user.name'});
+        if ($is_author) {
+            $defname = $env{'user.name'};
+        }
+    }
+    return $defname;
+}
+
 1;
 __END__