--- loncom/auth/lonuploadedacc.pm	2008/11/12 20:01:09	1.14
+++ loncom/auth/lonuploadedacc.pm	2017/02/08 18:01:32	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User Files
 #
-# $Id: lonuploadedacc.pm,v 1.14 2008/11/12 20:01:09 jms Exp $
+# $Id: lonuploadedacc.pm,v 1.17 2017/02/08 18:01:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,31 +26,7 @@
 # http://www.lon-capa.org/
 #
 
-=head1 NAME
-
-Apache::lonuploadedacc
-
-=head1 SYNOPSIS
-
-The way this is supposed to work:
-
- User A has client machine C 
- User A is logged into LON-CAPA server S
- needs file from user B
- homeserver for user B is H
 
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-This handler runs on H
-To access a userfile:
-Server S generates a token and puts it into the query string of URL for H
-Client box C asks H for file with token issued by C
-H now must ask S if token is valid, uses S's lond-command tokenauthuserfile
-
-=cut
 
 package Apache::lonuploadedacc;
 
@@ -58,6 +34,7 @@ package Apache::lonuploadedacc;
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet;
+use LONCAPA qw(:match);
 
 sub handler {
     my $r = shift;
@@ -70,6 +47,21 @@ sub handler {
                  $udom.'/'.$uname.'/'.$ufile.':'.$env{'form.token'},
 				     $remoteserver);
     if ($reply eq 'ok') {
+       if (($r->user() eq '') && ($env{'form.token'} ne '')) {
+           my ($cuname,$cudom) = 
+               ($env{'form.token'} =~ /^($match_username)_\d+_($match_domain)_/); 
+           if ($cuname ne '') {
+               if ($cudom eq $r->dir_config('lonDefDomain')) {
+                   $r->user($cuname);
+               } else {
+                   $r->user($cuname.':'.$cudom);
+               }
+           } else {
+               $r->user('public');
+           }
+       } else {
+           $r->user('public');
+       }
        return OK;
    } elsif ($reply eq 'con_lost' || $reply eq 'no_such_host') {
        &Apache::lonnet::logthis("Server unavailable for userfile access $uname at $udom for $ufile with $remoteserver token $env{'form.token'}: $reply");
@@ -89,7 +81,31 @@ __END__
 
 
 
+=head1 NAME
+
+Apache::lonuploadedacc
+
+=head1 SYNOPSIS
+
+The way this is supposed to work:
+
+ User A has client machine C 
+ User A is logged into LON-CAPA server S
+ needs file from user B
+ homeserver for user B is H
 
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This handler runs on H
+To access a userfile:
+Server S generates a token and puts it into the query string of URL for H
+Client box C asks H for file with token issued by C
+H now must ask S if token is valid, uses S's lond-command tokenauthuserfile
+
+=cut