--- loncom/lontrans.pm 2021/01/05 04:23:45 1.29 +++ loncom/lontrans.pm 2021/11/03 01:04:03 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network # URL translation for User Files # -# $Id: lontrans.pm,v 1.29 2021/01/05 04:23:45 raeburn Exp $ +# $Id: lontrans.pm,v 1.37 2021/11/03 01:04:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,8 +29,9 @@ package Apache::lontrans; use strict; -use Apache::Constants qw(:common :remotehost REDIRECT); +use Apache::Constants qw(:common :remotehost); use Apache::lonnet; +use Apache::loncommon; use Apache::File(); use LONCAPA qw(:DEFAULT :match); @@ -63,43 +64,90 @@ sub handler { $vpnint = $proxyinfo->{'vpnint'}; $vpnext = $proxyinfo->{'vpnext'}; } - my $redirect; + my ($redirect,$remote_ip); if ($hdrhost eq $alias) { - my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); - if ($vpnext && &Apache::lonnet::ip_match($remote_ip,$vpnext)) { + $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); + if (($vpnext && &Apache::lonnet::ip_match($remote_ip,$vpnext)) && + ($r->uri !~ m{^/adm/(lti|launch)/})) { $redirect = $hostname; - if ($redirect eq $hdrhost) { + } + if ($r->uri eq '/adm/sso') { + if (&Apache::lonnet::alias_shibboleth($lonhost)) { undef($redirect); + } else { + $redirect = $hostname; } } + if ($redirect eq $hdrhost) { + undef($redirect); + } } elsif ($hdrhost eq $hostname) { - my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); + $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/}){ + 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 '/adm/sso') { + unless (&Apache::lonnet::alias_shibboleth($lonhost)) { + undef($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 '/adm/sso')) { + 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'; } -# 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); + if ($uri =~ m{^(/adm/css/)(.+)(.css)$}) { + $uri = $1.&escape($2).$3; + } + my $location = $protocol.'://'.$redirect.$uri; + 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); return REDIRECT; } } } + 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//; @@ -171,6 +219,87 @@ sub redirect_raw { return $redirect; } +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') || + ($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'}; + } + } + unless ($info{'symb'}) { + unless ($r->uri eq '/adm/roles') { + $info{'origurl'} = $r->uri; + } + } + } + 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; +} + 1; __END__