--- loncom/auth/lonracc.pm 2005/02/06 07:23:40 1.15 +++ loncom/auth/lonracc.pm 2005/04/07 06:56:21 1.17 @@ -1,7 +1,7 @@ # The LearningOnline Network # Access Handler for File Transfers # -# $Id: lonracc.pm,v 1.15 2005/02/06 07:23:40 albertel Exp $ +# $Id: lonracc.pm,v 1.17 2005/04/07 06:56:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,7 @@ package Apache::lonracc; use strict; use Apache::Constants qw(:common :remotehost); -use Apache::lonnet(); +use Apache::lonnet; use Apache::File(); use IO::Socket; @@ -53,31 +53,31 @@ sub subscribed { sub handler { my $r = shift; my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP); - my $netaddr=inet_aton($reqhost); - ($reqhost) = gethostbyaddr($netaddr,AF_INET); - if (!$reqhost) { - $r->log_reason("Unable to do hostname $reqhost lookup for ".$r->get_remote_host(REMOTE_NOLOOKUP)); + my %iphost=&Apache::lonnet::get_iphost(); + my $hostids=$iphost{$reqhost}; + if (!$hostids && $reqhost ne '127.0.0.1' ) { + $r->log_reason("Unable to find a host for ". + $r->get_remote_host(REMOTE_NOLOOKUP)); return FORBIDDEN; } - if ($reqhost eq 'localhost.localdomain') { + if ($reqhost eq '127.0.0.1') { return OK; } my $return; my @ids=(); my $id; - foreach $id (keys %Apache::lonnet::hostname) { - if ($Apache::lonnet::hostname{$id} =~ /^\Q$reqhost\E$/i) { - my $filename=$r->filename; - my $uri =$r->uri; - if ((-e "$filename.$id") || - &subscribed($filename,$id) || - ($filename=~/\.meta$/) || - ($uri=~m|^/raw/uploaded|)) { - return OK; - } else { - $return=FORBIDDEN; - push(@ids,$id); - } + + foreach $id (@{$hostids}) { + my $filename=$r->filename; + my $uri =$r->uri; + if ((-e "$filename.$id") || + &subscribed($filename,$id) || + ($filename=~/\.meta$/) || + ($uri=~m|^/raw/uploaded|)) { + return OK; + } else { + $return=FORBIDDEN; + push(@ids,$id); } } if ($return == FORBIDDEN) {