--- loncom/lontrans.pm	2018/04/17 14:02:56	1.21
+++ loncom/lontrans.pm	2020/12/23 22:03:42	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.21 2018/04/17 14:02:56 raeburn Exp $
+# $Id: lontrans.pm,v 1.28 2020/12/23 22:03:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,151 +29,74 @@
 package Apache::lontrans;
 
 use strict;
-use Apache::Constants qw(:common :remotehost REDIRECT :http);
+use Apache::Constants qw(:common :remotehost REDIRECT);
 use Apache::lonnet;
 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' => '');
-    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+___.+$}) {
-                if ($user{'ltiuri'} ne $realuri) {
-                    &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
-                }
-                my ($map,$resid,$url) = split(/___/,$realuri);
-                $realuri = &Apache::lonnet::clutter($url).'?symb='.$realuri;
-            } elsif ($realuri =~ m{^res/$match_domain/$match_username/.+\.(?:sequence|page)___\d+___.+$}) {
-                if ($user{'ltiuri'} ne $realuri) {
-                    &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
-                }
-                my ($map,$resid,$url) = split(/___/,$realuri);
-                $realuri = &Apache::lonnet::clutter($url).'?symb='.$realuri;
-            } elsif ($realuri =~ m{^tiny/$match_domain/\w+$}) {
-                $realuri = '/'.$realuri;
-                if ($user{'ltiuri'} ne $realuri) {
-                    &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
-                }
-            } elsif ($realuri =~ m{($match_domain)/($match_courseid)$}) {
-                $realuri = '/adm/navmaps';
-                if ($user{'ltiuri'} ne '') {
-                    &Apache::lonnet::delenv('request.lti.uri');
-                }
-            } else {
-                $realuri = '/'.$realuri;
-                if ($realuri =~ m{/default_\d+\.sequence$}) {
-                    if ($user{'ltiuri'} ne $realuri) {
-                        &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
-                    }
-                    $realuri .= (($realuri =~/\?/)?'&':'?').'navmap=1';
-                } elsif ($realuri =~ m{^/res/.+\.sequence$}) {
-                    if ($user{'ltiuri'} ne $realuri) {
-                        &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
-                    }
-                    $realuri .= (($realuri =~/\?/)?'&':'?').'navmap=1';
-                } elsif ($realuri =~ m{\.page$}) {
-                    if ($user{'ltiuri'} ne $realuri) {
-                        &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
-                    }
-                }
-            }
-            my $host = $r->headers_in->get('Host');
-            if ($host) {
-                my $protocol = 'http';
-                if ($r->get_server_port == 443) {
-                    $protocol = 'https';
+    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 $location = $protocol.'://'.$host.$realuri;
-                $r->headers_out->set(Location => $location);
-                return REDIRECT;
             }
         }
-    } elsif ($r->uri =~ m{^/+tiny/+($match_domain)/+(\w+)$}) {
-        my ($cdom,$key) = ($1,$2);
-        if (&Apache::lonnet::domain($cdom) ne '') {
-            my %user;
-            my $handle = &Apache::lonnet::check_for_valid_session($r,undef,\%user);
-            if ($handle ne '') {
-                my $lonidsdir=$r->dir_config('lonIDsDir');
-                &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
-                if ($env{'request.course.id'}) {
-                    my $tinyurl;
-                    my ($result,$cached)=&Apache::lonnet::is_cached_new('tiny',$cdom."\0".$key);
-                    if (defined($cached)) {
-                        $tinyurl = $result;
-                    } else {
-                        my $configuname = &Apache::lonnet::get_domainconfiguser($cdom);
-                        my %currtiny = &Apache::lonnet::get('tiny',[$key],$cdom,$configuname);
-                        if ($currtiny{$key} ne '') {
-                            $tinyurl = $currtiny{$key};
-                            &Apache::lonnet::do_cache_new('tiny',$cdom."\0".$key,$currtiny{$key},600);
-                        }
-                    }
-                    if ($tinyurl ne '') {
-                        my ($cnum,$symb) = split(/\&/,$tinyurl);
-                        if (($cnum =~ /^$match_courseid$/) &&
-                            (&Apache::lonnet::homeserver($cnum,$cdom) ne 'no_host')) {
-                            if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
-                                my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb);
-                                if (&Apache::lonnet::is_on_map($url)) {
-                                    my $realuri;
-                                    if ((&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) &&
-                                        (!$env{'request.role.adv'})) {
-                                        $env{'user.error.msg'}=$r->uri.':bre:1:1:Access to resource denied';
-                                        return HTTP_NOT_ACCEPTABLE;
-                                    }
-                                    if ((&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) &&
-                                        (!$env{'request.role.adv'})) {
-                                        $realuri = &Apache::lonenc::encrypted(&Apache::lonnet::clutter($url));
-                                        if (($url =~ /\.sequence$/) &&
-                                            ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement')) {
-                                            $realuri .= '?navmap=1';
-                                        } else {
-                                            $realuri .= '?symb='.&Apache::lonenc::encrypted($symb);
-                                        }
-                                    } else {
-                                        $realuri = &Apache::lonnet::clutter($url);
-                                        if (($url =~ /\.sequence$/) &&
-                                            ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement')) {
-                                            $realuri .= '?navmap=1'; 
-                                        } else {
-                                            $realuri .= '?symb='.$symb;
-                                        }
-                                    }
-                                    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;
-                                    }
-                                }
-                            }
+    }
+    my $alias = &Apache::lonnet::get_proxy_alias();
+    if ($alias) {
+        my $lonhost = $r->dir_config('lonHostID');
+        my $hostname = &Apache::lonnet::hostname($lonhost);
+        if (($hdrhost eq $alias) || ($hdrhost eq $hostname)) {
+            my $proxyinfo = &Apache::lonnet::get_proxy_settings($r->dir_config('lonDefDomain'));
+            my ($vpnpriv,$vpnnat);
+            if (ref($proxyinfo) eq 'HASH') {
+                $vpnpriv = $proxyinfo->{'exempt'};
+                $vpnnat = '35.12.16.96-35.12.16.111';
+            }
+            my $redirect;
+            if ($hdrhost eq $alias) {
+                my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP);
+                if ($vpnnat && &Apache::lonnet::ip_match($remote_ip,$vpnnat)) {
+                    $redirect = $hostname;
+                    if ($redirect eq $hdrhost) {
+                        undef($redirect);
+                    }
+                }
+            } elsif ($hdrhost eq $hostname) {
+                my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1);
+                unless (($remote_ip eq '127.0.0.1') ||
+                        ($remote_ip eq &Apache::lonnet::get_host_ip($lonhost)) ||
+                        ($vpnpriv && &Apache::lonnet::ip_match($remote_ip,$vpnpriv))) {
+                    $redirect = $alias;
+                    if ($r->uri=~m{^/raw/}){
+                        my %iphost = &Apache::lonnet::get_iphost();
+                        if (exists($iphost{$remote_ip})) {
+                            undef($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 ($redirect) {
+                my $uri = $r->uri;
+                my $protocol = 'http';
+                my $port = $r->get_server_port();
+                if ($port eq '443') {
+                    $protocol = 'https';
                 }
+# FIXME should check if logged in, and if so use switchserver/migrateuser approach,
+# possibly moved to Access Handler?
+                $r->header_out(Location => $protocol.'://'.$redirect.$uri);
+                return REDIRECT;
             }
         }
     }
@@ -191,9 +114,12 @@ sub handler {
 			 '/userfiles/'.(join('/',@ufile)));
         }
         return OK;
-    } else {
-        return DECLINED;
+    } 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);
     }
+    return DECLINED;
 }
 
 sub redirect_raw {
@@ -223,16 +149,16 @@ sub redirect_raw {
                             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;
+                                } else {
+                                    $redirect = 1;
                                 }
                             }
                             if (ref($replication->{'nocertreq'}) eq 'ARRAY') {
                                 if (grep(/^\Q$remintdom\E$/,@{$replication->{'nocertreq'}})) {
-                                    $redirect = 0;
-                                } else {
                                     $redirect = 1;
+                                } else {
+                                    $redirect = 0;
                                 }
                             }
                         }
@@ -242,7 +168,7 @@ sub redirect_raw {
             last;
         }
     }
-    return $redirect;  
+    return $redirect;
 }
 
 1;