version 1.27, 2020/12/18 15:23:04
|
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 $actualhost = $r->headers_in->get('Host'); |
my $hdrhost = $r->headers_in->get('Host'); |
if ($r->uri=~m{^/raw/}) { |
if ($r->uri=~m{^/raw/}) { |
if ($actualhost) { |
if ($hdrhost) { |
unless ($host =~ /^internal\-/) { |
unless ($hdrhost =~ /^internal\-/) { |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); |
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; |
} |
} |
Line 55 sub handler {
|
Line 55 sub handler {
|
my $alias = &Apache::lonnet::get_proxy_alias(); |
my $alias = &Apache::lonnet::get_proxy_alias(); |
if ($alias) { |
if ($alias) { |
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
my $expected_host = &Apache::lonnet::hostname($lonhost); |
my $hostname = &Apache::lonnet::hostname($lonhost); |
if (($actualhost eq $expected_host) && ($actualhost ne $alias)) { |
if (($hdrhost eq $alias) || ($hdrhost eq $hostname)) { |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); |
my $proxyinfo = &Apache::lonnet::get_proxy_settings($r->dir_config('lonDefDomain')); |
unless ($remote_ip eq '127.0.0.1') { |
my ($vpnpriv,$vpnnat); |
my $hostip = &Apache::lonnet::get_host_ip($lonhost); |
if (ref($proxyinfo) eq 'HASH') { |
unless ($remote_ip eq $hostip) { |
$vpnpriv = $proxyinfo->{'exempt'}; |
my $do_redirect = 1; |
$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/}){ |
if ($r->uri=~m{^/raw/}){ |
my %iphost = &Apache::lonnet::get_iphost(); |
my %iphost = &Apache::lonnet::get_iphost(); |
if (exists($iphost{$remote_ip})) { |
if (exists($iphost{$remote_ip})) { |
undef($do_redirect); |
undef($redirect); |
} |
} |
} |
} |
if ($do_redirect) { |
|
my $uri = $r->uri; |
|
my $protocol = 'http'; |
|
my $port = $r->get_server_port(); |
|
if ($port eq '443') { |
|
$protocol = 'https'; |
|
} |
|
$r->header_out(Location => $protocol.'://'.$alias.$uri); |
|
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; |
|
} |
} |
} |
} |
} |
if ($r->uri=~m|^(/raw)?/uploaded/|) { |
if ($r->uri=~m|^(/raw)?/uploaded/|) { |