--- loncom/lontrans.pm	2022/01/02 20:43:50	1.14.10.2.2.1
+++ loncom/lontrans.pm	2022/06/18 02:10:19	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.14.10.2.2.1 2022/01/02 20:43:50 raeburn Exp $
+# $Id: lontrans.pm,v 1.39 2022/06/18 02:10:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,18 +30,31 @@ package Apache::lontrans;
 
 use strict;
 use Apache::Constants qw(:common :remotehost);
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon;
 use Apache::File();
 use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
-    # FIXME line remove when mod_perl fixes BUG#4948 
+    # FIXME line remove when mod_perl fixes BUG#4948
     $r->notes->set('error-notes' => '');
+    my $hdrhost = $r->headers_in->get('Host');
+    if ($r->uri=~m{^/raw/}) {
+        if ($hdrhost) {
+            unless ($hdrhost =~ /^internal\-/) {
+                my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1);
+                my $lonhost = $r->dir_config('lonHostID');
+                if (&redirect_raw($remote_ip,$lonhost)) {
+                    my $location = 'https://internal-'.$hdrhost.$r->uri;
+                    $r->headers_out->set(Location => $location);
+                    return REDIRECT;
+                }
+            }
+        }
+    }
     my $alias = &Apache::lonnet::get_proxy_alias();
     if ($alias) {
-        my $hdrhost = $r->headers_in->get('Host');
         my $lonhost = $r->dir_config('lonHostID');
         my $hostname = &Apache::lonnet::hostname($lonhost);
         my $ssourl = '/adm/sso';
@@ -161,6 +174,55 @@ sub handler {
     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 = 0;
+                                } else {
+                                    $redirect = 1;
+                                }
+                            }
+                            if (ref($replication->{'nocertreq'}) eq 'ARRAY') {
+                                if (grep(/^\Q$remintdom\E$/,@{$replication->{'nocertreq'}})) {
+                                    $redirect = 1;
+                                } else {
+                                    $redirect = 0;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            last;
+        }
+    }
+    return $redirect;
+}
+
 sub set_token {
     my ($r,$dest,$remote_ip,$userref) = @_;
     my (%info,%user);
@@ -214,8 +276,11 @@ sub set_token {
             my %link_info = &Apache::lonnet::tmpget($info{'ltoken'});
             if ($link_info{'linkprot'}) {
                 $info{'linkprot'} = $link_info{'linkprot'};
+                if ($link_info{'linkprotuser'} ne '') {
+                    $info{'linkprotuser'} = $link_info{'linkprotuser'};
+                }
             }
-            &Apache::lonnet::tmpdel($info{'ltoken'});;
+            &Apache::lonnet::tmpdel($info{'ltoken'});
             delete($info{'ltoken'});
         }
         unless ($info{'role'}) {