--- loncom/lontrans.pm	2002/08/08 13:45:21	1.2
+++ loncom/lontrans.pm	2016/07/25 19:49:45	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.2 2002/08/08 13:45:21 www Exp $
+# $Id: lontrans.pm,v 1.15 2016/07/25 19:49:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,27 +29,98 @@
 package Apache::lontrans;
 
 use strict;
-use Apache::Constants qw(:common :remotehost);
+use Apache::Constants qw(:common :remotehost REDIRECT);
 use Apache::lonnet();
 use Apache::File();
-
-sub propath {
-    my ($udom,$uname)=@_;
-    $udom=~s/\W//g;
-    $uname=~s/\W//g;
-    my $subdir=$uname.'__';
-    $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
-    my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
-    return $proname;
-} 
-
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
-    unless ($r->uri=~/^\/uploaded\//) { return DECLINED; }
-    my ($dum1,$dum2,$udom,$uname,$ufile)=split(/\//,$r->uri);
-    $ufile=~s/^[\~\.]+//;
-    $r->filename(&propath($udom,$uname).'/userfiles/'.$ufile);
+    # FIXME line remove when mod_perl fixes BUG#4948 
+    $r->notes->set('error-notes' => '');
+    if ($r->uri=~m{^/raw/}) {
+        my $host = $r->headers_in->get('Host');
+        if ($host) {
+            unless ($host =~ /^internal\-/) {
+                my $c = $r->connection;
+                if (ref($c)) {
+                    my $remote_ip = $c->remote_ip;
+                    my $lonhost = $r->dir_config('lonHostID');
+                    if (&redirect_raw($remote_ip,$lonhost)) {
+                        my $location = 'https://internal-'.$host.$r->uri;
+                        $r->headers_out->set(Location => $location);
+                        return REDIRECT;
+                    }
+                }
+            }
+        }
+    }
+    if ($r->uri=~m|^(/raw)?/uploaded/|) {
+        my $fn = $r->uri();
+        $fn=~s/^\/raw//;
+        my (undef,undef,$udom,$uname,@ufile)=split(/\//,$fn);
+	if (@ufile) { $ufile[-1]=~s/^[\~\.]+//; }
+        my $chome=&Apache::lonnet::homeserver($uname,$udom);
+	my $allowed=0;
+	my @ids=&Apache::lonnet::current_machine_ids();
+	foreach my $id (@ids) { if ($id eq $chome) { $allowed=1; } }
+	if ($allowed) {
+	    $r->filename(&propath($udom,$uname).
+			 '/userfiles/'.(join('/',@ufile)));
+        }
+        return OK;
+    } else { 
+        return DECLINED;
+    }
+}
+
+sub redirect_raw {
+    my ($remote_ip,$lonhost) = @_;
+    my @remhostids = &Apache::lonnet::get_hosts_from_ip($remote_ip);
+    my $redirect;
+    while (@remhostids) {
+        my $try_server = pop(@remhostids);
+        my $remhostname = &Apache::lonnet::hostname($try_server);
+        if ($remhostname) {
+            my $remoterev = &Apache::lonnet::get_server_loncaparev(undef,$try_server);
+            my ($remmajor,$remminor) = ($remoterev =~ /^(\d+)\.(\d+)/);
+            if (($remmajor > 2) || (($remmajor == 2) && $remminor >= 12)) {
+                my $internet_names = &Apache::lonnet::get_internet_names($try_server);
+                if (ref($internet_names) eq 'ARRAY') {
+                    my $intdom = &Apache::lonnet::internet_dom($lonhost);
+                    unless (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+                        my $lonhostname = &Apache::lonnet::hostname($lonhost);
+                        my $serverhomeID = &Apache::lonnet::get_server_homeID($lonhostname);
+                        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
+                        my %domdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
+                        my $replication = $domdefaults{'replication'};
+                        if (ref($replication) eq 'HASH') {
+                            my $remhomeID = &Apache::lonnet::get_server_homeID($remhostname);
+                            my $remhomedom = &Apache::lonnet::host_domain($remhomeID);
+                            my $remprimary = &Apache::lonnet::domain($remhomedom,'primary');
+                            my $remintdom = &Apache::lonnet::internet_dom($remprimary);
+                            if (ref($replication->{'certreq'}) eq 'ARRAY') {
+                                if (grep(/^\Q$remintdom\E$/,@{$replication->{'certreq'}})) {
+                                    $redirect = 1;
+                                } else {
+                                    $redirect = 0;
+                                }
+                            }
+                            if (ref($replication->{'nocertreq'}) eq 'ARRAY') {
+                                if (grep(/^\Q$remintdom\E$/,@{$replication->{'nocertreq'}})) {
+                                    $redirect = 0;
+                                } else {
+                                    $redirect = 1;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            last;
+        }
+    }
+    return $redirect;  
 }
 
 1;