--- loncom/auth/lonracc.pm	2004/04/26 00:07:29	1.12
+++ 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.12 2004/04/26 00:07:29 www Exp $
+# $Id: lonracc.pm,v 1.22 2007/03/02 23:43:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,16 +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) = @_;
+
+    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='^'.quotemeta($id).':'.quotemeta($ip).':';
+
     my $found=0;
-    my $expr='^'.$id.':'.$Apache::lonnet::hostip{$id}.':';
-    $expr =~ s/\./\\\./g;
-    my $sh;
-    if ($sh=Apache::File->new("$filename.subscription")) {
+    if (my $sh=Apache::File->new("$filename.subscription")) {
 	while (my $subline=<$sh>) { if ($subline =~ /$expr/) { $found=1; } }
 	$sh->close();
     }
@@ -48,47 +58,40 @@ sub subscribed {
 
 sub handler {
     my $r = shift;
-    my $reqhost = $r->get_remote_host(REMOTE_DOUBLE_REV);
-    if (!$reqhost && $r->get_remote_host(REMOTE_NOLOOKUP) eq $r->get_server_name()) { 
-        $reqhost = $r->get_server_name();
-    } 
-    unless ($reqhost) {
-       $r->log_reason("Spoof request from ".$ENV{'REMOTE_ADDR'});
-       return FORBIDDEN;
-    }
-    if ($reqhost eq 'localhost.localdomain') {
-       return OK;
-    }
-    my $readline;
-    my $lontabdir=$r->dir_config('lonTabDir');
-    {
-       my $fh;
-       unless ($fh=Apache::File->new("$lontabdir/hosts.tab")) {
-          $r->log_reason("Could not find host tab file");
-          return FORBIDDEN;
-       }
-       my $return;
-       my @ids=();
-       while ($readline=<$fh>) {
-          my ($id,$domain,$role,$name,$ip)=split(/:/,$readline);
-          if ($name =~ /$reqhost/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);
-              }
-          }
-       }
-       if ($return == FORBIDDEN) {
-	   $r->log_reason(join(':',@ids)." not subscribed", $r->filename);
-	   return FORBIDDEN;
-       }
+
+    my $filename=$r->filename;
+    if (!-e $filename) {
+	return NOT_FOUND;
+    }
+
+    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;
+
+    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) {
+	$r->log_reason(join(':',@ids)." not subscribed", $r->filename);
+	return FORBIDDEN;
     }
     $r->log_reason("Invalid request for file transfer from $reqhost", 
                    $r->filename);