version 1.28, 2020/12/23 22:03:42
|
version 1.29, 2021/01/05 04:23:45
|
Line 58 sub handler {
|
Line 58 sub handler {
|
my $hostname = &Apache::lonnet::hostname($lonhost); |
my $hostname = &Apache::lonnet::hostname($lonhost); |
if (($hdrhost eq $alias) || ($hdrhost eq $hostname)) { |
if (($hdrhost eq $alias) || ($hdrhost eq $hostname)) { |
my $proxyinfo = &Apache::lonnet::get_proxy_settings($r->dir_config('lonDefDomain')); |
my $proxyinfo = &Apache::lonnet::get_proxy_settings($r->dir_config('lonDefDomain')); |
my ($vpnpriv,$vpnnat); |
my ($vpnint,$vpnext); |
if (ref($proxyinfo) eq 'HASH') { |
if (ref($proxyinfo) eq 'HASH') { |
$vpnpriv = $proxyinfo->{'exempt'}; |
$vpnint = $proxyinfo->{'vpnint'}; |
$vpnnat = '35.12.16.96-35.12.16.111'; |
$vpnext = $proxyinfo->{'vpnext'}; |
} |
} |
my $redirect; |
my $redirect; |
if ($hdrhost eq $alias) { |
if ($hdrhost eq $alias) { |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP); |
if ($vpnnat && &Apache::lonnet::ip_match($remote_ip,$vpnnat)) { |
if ($vpnext && &Apache::lonnet::ip_match($remote_ip,$vpnext)) { |
$redirect = $hostname; |
$redirect = $hostname; |
if ($redirect eq $hdrhost) { |
if ($redirect eq $hdrhost) { |
undef($redirect); |
undef($redirect); |
Line 74 sub handler {
|
Line 74 sub handler {
|
} |
} |
} elsif ($hdrhost eq $hostname) { |
} elsif ($hdrhost eq $hostname) { |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); |
my $remote_ip = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1); |
unless (($remote_ip eq '127.0.0.1') || |
unless (($remote_ip eq '127.0.0.1') || ($remote_ip eq '::1') || |
($remote_ip eq &Apache::lonnet::get_host_ip($lonhost)) || |
($remote_ip eq &Apache::lonnet::get_host_ip($lonhost)) || |
($vpnpriv && &Apache::lonnet::ip_match($remote_ip,$vpnpriv))) { |
($vpnint && &Apache::lonnet::ip_match($remote_ip,$vpnint))) { |
$redirect = $alias; |
$redirect = $alias; |
if ($r->uri=~m{^/raw/}){ |
if ($r->uri=~m{^/raw/}){ |
my %iphost = &Apache::lonnet::get_iphost(); |
my %iphost = &Apache::lonnet::get_iphost(); |