version 1.25, 2019/01/20 02:42:35
|
version 1.28, 2020/12/23 22:03:42
|
Line 38 sub handler {
|
Line 38 sub handler {
|
my $r = shift; |
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' => ''); |
$r->notes->set('error-notes' => ''); |
|
my $hdrhost = $r->headers_in->get('Host'); |
if ($r->uri=~m{^/raw/}) { |
if ($r->uri=~m{^/raw/}) { |
my $host = $r->headers_in->get('Host'); |
if ($hdrhost) { |
if ($host) { |
unless ($hdrhost =~ /^internal\-/) { |
unless ($host =~ /^internal\-/) { |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); |
my $remote_ip = $r->get_remote_host(); |
|
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
if (&redirect_raw($remote_ip,$lonhost)) { |
if (&redirect_raw($remote_ip,$lonhost)) { |
my $location = 'https://internal-'.$host.$r->uri; |
my $location = 'https://internal-'.$hdrhost.$r->uri; |
$r->headers_out->set(Location => $location); |
$r->headers_out->set(Location => $location); |
return REDIRECT; |
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); |
|
} |
|
} |
|
} |
|
} |
|
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; |
|
} |
|
} |
|
} |
if ($r->uri=~m|^(/raw)?/uploaded/|) { |
if ($r->uri=~m|^(/raw)?/uploaded/|) { |
my $fn = $r->uri(); |
my $fn = $r->uri(); |
$fn=~s/^\/raw//; |
$fn=~s/^\/raw//; |
Line 66 sub handler {
|
Line 114 sub handler {
|
'/userfiles/'.(join('/',@ufile))); |
'/userfiles/'.(join('/',@ufile))); |
} |
} |
return OK; |
return OK; |
} else { |
} elsif ($r->uri =~ m{^\Q/adm/wrapper/ext/https:/\E[^/]}) { |
return DECLINED; |
my $uri = $r->uri; |
|
$uri =~ s{^(\Q/adm/wrapper/ext/https:/\E)}{$1/}; |
|
$r->uri($uri); |
} |
} |
|
return DECLINED; |
} |
} |
|
|
sub redirect_raw { |
sub redirect_raw { |