--- loncom/lontrans.pm 2021/12/14 20:59:19 1.14.10.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.14.10.2 2021/12/14 20:59:19 raeburn Exp $ +# $Id: lontrans.pm,v 1.15 2016/07/25 19:49:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,102 +29,30 @@ package Apache::lontrans; use strict; -use Apache::Constants qw(:common :remotehost); +use Apache::Constants qw(:common :remotehost REDIRECT); 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 $r->notes->set('error-notes' => ''); - 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'; - if ($r->dir_config('lonOtherAuthenUrl') ne '') { - $ssourl = $r->dir_config('lonOtherAuthenUrl'); - } - if (($hdrhost eq $alias) || ($hdrhost eq $hostname)) { - my $proxyinfo = &Apache::lonnet::get_proxy_settings($r->dir_config('lonDefDomain')); - my ($vpnint,$vpnext); - if (ref($proxyinfo) eq 'HASH') { - $vpnint = $proxyinfo->{'vpnint'}; - $vpnext = $proxyinfo->{'vpnext'}; - } - 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))) { - $redirect = $hostname; - } - if ($r->uri eq $ssourl) { - if (&Apache::lonnet::alias_sso($lonhost)) { - undef($redirect); - } else { - $redirect = $hostname; - } - } - if ($redirect eq $hdrhost) { - undef($redirect); - } - } elsif ($hdrhost eq $hostname) { - $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)) || - ($vpnint && &Apache::lonnet::ip_match($remote_ip,$vpnint))) { - $redirect = $alias; - if (($r->uri=~m{^/raw/}) || ($r->uri=~m{^/adm/dns/})) { - my %iphost = &Apache::lonnet::get_iphost(); - if (exists($iphost{$remote_ip})) { - undef($redirect); - } - } elsif ($r->uri eq $ssourl) { - unless (&Apache::lonnet::alias_sso($lonhost)) { - undef($redirect); - } + 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 ($redirect) { - my $uri = $r->uri; - if (($uri eq '/adm/switchserver') || ($uri =~ m{^/Shibboleth.sso/})) { - return DECLINED; - } - unless (($uri eq '/adm/migrateuser') || ($uri eq $ssourl)) { - my %user; - my $handle = &Apache::lonnet::check_for_valid_session($r,undef,\%user); - if (($handle) && ($user{'name'} ne '') && ($user{'domain'} ne '')) { - unless (($user{'name'} eq 'public') && ($user{'domain'} eq 'public')) { - my $dest = '/adm/migrateuser'; - my $token = &set_token($r,$dest,$remote_ip,\%user); - unless ($token eq '') { - $r->internal_redirect("$dest?token=$token"); - $r->set_handlers('PerlHandler'=> undef); - return DECLINED; - } - } - } - } - my $protocol = 'http'; - my $port = $r->get_server_port(); - if ($port eq '443') { - $protocol = 'https'; - } - if ($uri =~ m{^(/adm/css/)(.+)(.css)$}) { - $uri = $1.&escape($2).$3; - } - my $location = $protocol.'://'.$redirect.$uri; - if ($r->args) { - $location .= '?'.$r->args; - } - $r->header_out(Location => $location); - return REDIRECT; - } } } if ($r->uri=~m|^(/raw)?/uploaded/|) { @@ -141,59 +69,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; } - return DECLINED; } -sub set_token { - my ($r,$dest,$remote_ip,$userref) = @_; - my (%info,%user); - if ($dest eq '/adm/migrateuser') { - return unless (ref($userref) eq 'HASH'); - %user = %{$userref}; - %info = ('ip' => $remote_ip, - 'domain' => $user{'domain'}, - 'username' => $user{'name'}, - 'server' => $r->dir_config('lonHostID'), - ); - } - if ($r->args) { - foreach my $pair (split(/&/,$r->args)) { - my ($name,$value) = split(/=/,$pair); - $name = &LONCAPA::unescape($name); - next unless (($name eq 'role') || ($name eq 'symb')); - $value =~ tr/+/ /; - $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - $info{$name} = $value; - } - } - if ($dest eq '/adm/migrateuser') { - unless ($info{'role'}) { - if ($user{'role'} ne '') { - $info{'role'} = $user{'role'}; - } - } - unless ($info{'symb'}) { - unless ($r->uri eq '/adm/roles') { - $info{'origurl'} = $r->uri; +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; } } - if (($dest eq '/adm/migrateuser') || (keys(%info) > 0)) { - unless ($dest eq '/adm/migrateuser') { - $info{'origurl'} = $r->uri; - } - my $token = &Apache::lonnet::tmpput(\%info,$r->dir_config('lonHostID'),'link'); - unless (($token eq 'con_lost') || ($token eq 'refused') || - ($token eq 'unknown_cmd') || ($token eq 'no_such_host')) { - return $token; - } - } - return; + return $redirect; } 1;