--- loncom/lontrans.pm	2020/03/05 22:02:32	1.14.10.1
+++ loncom/lontrans.pm	2017/11/30 15:14:58	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.14.10.1 2020/03/05 22:02:32 raeburn Exp $
+# $Id: lontrans.pm,v 1.17 2017/11/30 15:14:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,16 +29,56 @@
 package Apache::lontrans;
 
 use strict;
-use Apache::Constants qw(:common :remotehost);
+use Apache::Constants qw(:common :remotehost REDIRECT);
 use Apache::lonnet();
 use Apache::File();
-use LONCAPA;
-
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
     # FIXME line remove when mod_perl fixes BUG#4948 
     $r->notes->set('error-notes' => '');
+    if ($r->uri =~ m{^/adm/lti/(.+)$}) {
+        my $realuri = $1;
+        my %user;
+        my $handle = &Apache::lonnet::check_for_valid_session($r,undef,\%user);
+        if (($handle ne '') && ($user{'lti'})) {
+            if ($realuri =~ m{^uploaded/$match_domain/$match_courseid/(default|supplemental)(|_\d+)\.(?:sequence|page)___\d+___.+$}) {
+                my ($map,$resid,$url) = split(/___/,$realuri);
+                $realuri = &Apache::lonnet::clutter($url).'?symb='.$realuri;
+            } elsif ($realuri =~ m{($match_domain)/($match_courseid)$}) {
+                $realuri = '/adm/navmaps';
+            } else {
+                $realuri = '/'.$realuri;
+                if ($realuri =~ m{/default_\d+\.sequence$}) {
+                    $realuri .= (($realuri =~/\?/)?'&':'?').'navmap=1';
+                }
+            }
+            my $host = $r->headers_in->get('Host');
+            if ($host) {
+                my $protocol = 'http';
+                if ($r->get_server_port == 443) {
+                    $protocol = 'https';
+                }
+                my $location = $protocol.'://'.$host.$realuri;
+                $r->headers_out->set(Location => $location);
+                return REDIRECT;
+            }
+        }
+    } elsif ($r->uri=~m{^/raw/}) {
+        my $host = $r->headers_in->get('Host');
+        if ($host) {
+            unless ($host =~ /^internal\-/) {
+                my $remote_ip = $r->get_remote_host();
+                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//;
@@ -53,12 +93,58 @@ sub handler {
 			 '/userfiles/'.(join('/',@ufile)));
         }
         return OK;
-    } elsif ($r->uri =~ m{^\Q/adm/wrapper/ext/https:/\E[^/]}) {
-        my $uri = $r->uri;
-        $uri =~ s{^(\Q/adm/wrapper/ext/https:/\E)}{$1/};
-        $r->uri($uri);
+    } 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 DECLINED;
+    return $redirect;  
 }
 
 1;