--- loncom/lontrans.pm 2021/12/14 20:59:19 1.14.10.2 +++ loncom/lontrans.pm 2021/12/06 03:31:54 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network # URL translation for User Files # -# $Id: lontrans.pm,v 1.14.10.2 2021/12/14 20:59:19 raeburn Exp $ +# $Id: lontrans.pm,v 1.38 2021/12/06 03:31:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,19 +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; - +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'; @@ -59,7 +71,8 @@ sub handler { my ($redirect,$remote_ip); if ($hdrhost eq $alias) { $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); - if (($vpnext && &Apache::lonnet::ip_match($remote_ip,$vpnext))) { + if (($vpnext && &Apache::lonnet::ip_match($remote_ip,$vpnext)) && + ($r->uri !~ m{^/adm/(lti|launch)/})) { $redirect = $hostname; } if ($r->uri eq $ssourl) { @@ -76,6 +89,7 @@ sub handler { $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); unless (($remote_ip eq '127.0.0.1') || ($remote_ip eq '::1') || ($remote_ip eq &Apache::lonnet::get_host_ip($lonhost)) || + ($r->uri=~m{^/adm/(lti|launch)/}) || ($vpnint && &Apache::lonnet::ip_match($remote_ip,$vpnint))) { $redirect = $alias; if (($r->uri=~m{^/raw/}) || ($r->uri=~m{^/adm/dns/})) { @@ -119,7 +133,12 @@ sub handler { $uri = $1.&escape($2).$3; } my $location = $protocol.'://'.$redirect.$uri; - if ($r->args) { + if ($r->uri =~ m{^/tiny/$match_domain/\w+$}) { + my $token = &set_token($r,$r->uri); + unless ($token eq '') { + $location .= '?ttoken='.$token; + } + } elsif ($r->args) { $location .= '?'.$r->args; } $r->header_out(Location => $location); @@ -127,6 +146,12 @@ sub handler { } } } + if ($r->uri =~ m{^/tiny/$match_domain/\w+$}) { + my $token = &set_token($r,$r->uri); + unless ($token eq '') { + $r->args('ttoken='.$token); + } + } if ($r->uri=~m|^(/raw)?/uploaded/|) { my $fn = $r->uri(); $fn=~s/^\/raw//; @@ -149,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); @@ -165,13 +239,47 @@ sub set_token { foreach my $pair (split(/&/,$r->args)) { my ($name,$value) = split(/=/,$pair); $name = &LONCAPA::unescape($name); - next unless (($name eq 'role') || ($name eq 'symb')); + next unless (($name eq 'role') || ($name eq 'symb') || + ($name eq 'ltoken') || ($name eq 'linkkey') || + ($name eq 'ttoken')); $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; $info{$name} = $value; } + if ($info{'ttoken'}) { + my %current = &Apache::lonnet::tmpget($info{'ttoken'}); + delete($info{'ttoken'}); + if ($current{'origurl'} eq $r->uri) { + return if (keys(%current)); + } + } + } +# +# To be able to support deep-linking for a shortened URL, i.e., +# /tiny/$dom/$id with (a) linkkey included in POSTed data and +# data and (b) non-Shibboleth SSO in use, ltoken (or linkprot +# if sending to /adm/migrateuser), or linkkey are written to a +# .tmp file in /home/httpd/perl/tmp and the query string is +# replaced with ttoken=tokenid. This does mean other POSTed +# data will be discarded. +# + if ($r->uri =~ m{^/tiny/$match_domain/\w+$}) { + unless (($info{'ltoken'}) || ($info{'linkkey'} ne '')) { + &Apache::lonacc::get_posted_cgi($r,['linkkey']); + if ($env{'form.linkkey'} ne '') { + $info{'linkkey'} = $env{'form.linkkey'}; + } + } } if ($dest eq '/adm/migrateuser') { + if ($info{'ltoken'}) { + my %link_info = &Apache::lonnet::tmpget($info{'ltoken'}); + if ($link_info{'linkprot'}) { + $info{'linkprot'} = $link_info{'linkprot'}; + } + &Apache::lonnet::tmpdel($info{'ltoken'});; + delete($info{'ltoken'}); + } unless ($info{'role'}) { if ($user{'role'} ne '') { $info{'role'} = $user{'role'}; @@ -199,9 +307,3 @@ sub set_token { 1; __END__ - - - - - -