--- loncom/auth/lonracc.pm	2005/02/05 22:20:56	1.14
+++ loncom/auth/lonracc.pm	2007/03/02 23:43:29	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for File Transfers
 #
-# $Id: lonracc.pm,v 1.14 2005/02/05 22:20:56 albertel Exp $
+# $Id: lonracc.pm,v 1.22 2007/03/02 23:43:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,20 +30,26 @@ package Apache::lonracc;
 
 use strict;
 use Apache::Constants qw(:common :remotehost);
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::File();
 use IO::Socket;
 
 sub subscribed {
     my ($filename,$id) = @_;
-    my $found=0;
-    my $hostname=$Apache::lonnet::hostname{$id};
+
+    return 0 if (!-e "$filename.subscription");
+
+    my $hostname=&Apache::lonnet::hostname($id);
     my (undef,undef,undef,undef,$ip) = gethostbyname($hostname);
+    
+    return 0 if (length($ip) != 4);
+
     $ip=inet_ntoa($ip);
-    my $expr='^'.$id.':'.$ip.':';
-    $expr =~ s/\./\\\./g;
-    my $sh;
-    if ($sh=Apache::File->new("$filename.subscription")) {
+
+    my $expr='^'.quotemeta($id).':'.quotemeta($ip).':';
+
+    my $found=0;
+    if (my $sh=Apache::File->new("$filename.subscription")) {
 	while (my $subline=<$sh>) { if ($subline =~ /$expr/) { $found=1; } }
 	$sh->close();
     }
@@ -52,29 +58,35 @@ sub subscribed {
 
 sub handler {
     my $r = shift;
-    my $reqhost = $r->get_remote_host(REMOTE_HOST);
-    if (!$reqhost) {
-	$r->log_reason("Unable to do hostname lookup for ".$ENV{'REMOTE_ADDR'});
+
+    my $filename=$r->filename;
+    if (!-e $filename) {
+	return NOT_FOUND;
     }
-    if ($reqhost eq 'localhost.localdomain') {
+
+    my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP);
+    my @hostids= &Apache::lonnet::get_hosts_from_ip($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 '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);
-	    }
+    my @ids;
+
+    foreach my $id (@hostids) {
+	my $uri =$r->uri;
+	if (($filename=~/\.meta$/) ||
+	    ($uri=~m|^/raw/uploaded|) ||
+	    (-e "$filename.$id") ||
+	    &subscribed($filename,$id) ) {
+	    return OK;
+	} else {
+	    $return=FORBIDDEN;
+	    push(@ids,$id);
 	}
     }
     if ($return == FORBIDDEN) {